merge upstream 🐱

This commit is contained in:
tchncs 2017-01-20 22:37:14 +01:00
commit e42de05b85
6 changed files with 11 additions and 3 deletions

6
.gitmodules vendored
View file

@ -134,3 +134,9 @@
[submodule "mods/boats"] [submodule "mods/boats"]
path = mods/boats path = mods/boats
url = https://git.tchncs.de/Illuna-Minetest/boats url = https://git.tchncs.de/Illuna-Minetest/boats
[submodule "mods/mods/craftguide"]
path = mods/mods/craftguide
url = https://github.com/minetest-mods/craftguide
[submodule "mods/mods/moreblocks"]
path = mods/mods/moreblocks
url = https://github.com/minetest-mods/moreblocks

@ -1 +1 @@
Subproject commit 32bae23a7cf57e37b73180b9999cddb82a2f9fb1 Subproject commit b15d200c502bdcd67d0ab0ca8191087fc4dfe119

@ -1 +1 @@
Subproject commit f38e902d1c050f4c8f39aeca816e5329e5cd0d5b Subproject commit 54a1917479e243c892244b15541a2da53dd650a5

1
mods/mods/craftguide Submodule

@ -0,0 +1 @@
Subproject commit d0b3cf2887238275894b067f929f6c00a5d221a1

1
mods/mods/moreblocks Submodule

@ -0,0 +1 @@
Subproject commit 01b411c753697049b1f37c0f49abc1d216b432e6

@ -1 +1 @@
Subproject commit 9c6da3477ce01c3c369c53507d36b1fa3d6a81b5 Subproject commit 0a9928c36633c9d0ff55044eec1884805258730e