Merge branch 'master' of https://git.tchncs.de/Illuna-Minetest/minetest_game

2016-10-17 22:10:17 +02:00 · 2016-10-17 22:10:17 +02:00 · 321a6f68a0
parent 428bfbdfe0 28229343d1
commit 321a6f68a0
5 changed files with 7 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -96,3 +96,6 @@
 [submodule "mods/dragons"]
 	path = mods/dragons
 	url = https://git.tchncs.de/Illuna-Minetest/dragons
+[submodule "mods/teleport_potion"]
+	path = mods/teleport_potion
+	url = https://git.tchncs.de/Illuna-Minetest/teleport_potion
--- a/mods/darkage
+++ b/mods/darkage
@ -1 +1 @@
-Subproject commit f87f7ad00d458a1dcb4755d73bd6d4b52b2233db
+Subproject commit bc70e87480cf5568694d95c202a3e4011d28e485
--- a/mods/dragons
+++ b/mods/dragons
@ -1 +1 @@
-Subproject commit fba75e74bd20b0b14dfce1649c82c4a26ccfb244
+Subproject commit 778778dbe21e908a44bf1a3713fc57885908e754
--- a/mods/illuna
+++ b/mods/illuna
@ -1 +1 @@
-Subproject commit b3f383ba90c2bb8dc50485ee0e75e68315b782f0
+Subproject commit 283c9f6b143d44c3ed46f7aafc5c8e560417dc0a
--- a/mods/teleport_potion
+++ b/mods/teleport_potion
@ -0,0 +1 @@
+Subproject commit 8c54c845a6e4f54f8e2271caa2abfd5dcb1f578c
				`@ -0,0 +1 @@`
				`Subproject commit 8c54c845a6e4f54f8e2271caa2abfd5dcb1f578c`