merge upstream

e42de05b · tchncs · f9026ab4 · 00635695 · e42de05b · b15d200c
Commit e42de05b authored 8 years ago by tchncs
--- a/.gitmodules
+++ b/.gitmodules
@@ -134,3 +134,9 @@
 [submodule "mods/boats"]
 	path = mods/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
--- a/ethereal @ b15d200c
+++ b/ethereal @ b15d200c
-Subproject commit 32bae23a7cf57e37b73180b9999cddb82a2f9fb1
+Subproject commit b15d200c502bdcd67d0ab0ca8191087fc4dfe119
--- a/illuna_ethereal @ 54a19174
+++ b/illuna_ethereal @ 54a19174
-Subproject commit f38e902d1c050f4c8f39aeca816e5329e5cd0d5b
+Subproject commit 54a1917479e243c892244b15541a2da53dd650a5
--- a/craftguide @ d0b3cf28
+++ b/craftguide @ d0b3cf28
+Subproject commit d0b3cf2887238275894b067f929f6c00a5d221a1
--- a/moreblocks @ 01b411c7
+++ b/moreblocks @ 01b411c7
+Subproject commit 01b411c753697049b1f37c0f49abc1d216b432e6
--- a/xdecor @ 0a9928c3
+++ b/xdecor @ 0a9928c3
-Subproject commit 9c6da3477ce01c3c369c53507d36b1fa3d6a81b5
+Subproject commit 0a9928c36633c9d0ff55044eec1884805258730e