Upgrade to work with minetest 0.4.17

- 3d_armor upgrade - playeranim reconfiguration - farming_redo upgrade - Add hazmat_suit mod - Fix double_chests issue - Upgrade maidroid - tweek maidroid_core_morefarming (work with last crops of farming_redo, robot jumping removed) - various mod upgrades
2018-07-24 13:26:51 +02:00 · 2018-07-24 13:26:51 +02:00 · 7b2d847430
parent d5be7a1b71
commit 7b2d847430
23 changed files with 46 additions and 43 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -55,9 +55,6 @@
 [submodule "mods/morefarming"]
 	path = mods/morefarming
 	url = https://github.com/sys4-fr/morefarming.git
-[submodule "mods/bakedclay"]
-	path = mods/bakedclay
-	url = https://github.com/tenplus1/bakedclay.git
 [submodule "mods/lightning"]
 	path = mods/lightning
 	url = https://github.com/minetest-mods/lightning.git
@ -126,9 +123,6 @@
 [submodule "mods/darkage"]
 	path = mods/darkage
 	url = https://github.com/adrido/darkage.git
-[submodule "mods/bonemeal"]
-	path = mods/bonemeal
-	url = https://github.com/tenplus1/bonemeal.git
 [submodule "mods/mob_horse"]
 	path = mods/mob_horse
 	url = https://github.com/sys4-fr/mob_horse.git
@ -139,10 +133,6 @@
 [submodule "mods/item_drop"]
 	path = mods/item_drop
 	url = https://github.com/tacotexmex/item_drop.git
-[submodule "minetest_game"]
-	path = minetest_game
-	url = https://github.com/minetest/minetest_game.git
-	branch = backport-0.4
 [submodule "mods/unifieddyes"]
 	path = mods/unifieddyes
 	url = https://github.com/minetest-mods/unifieddyes.git
@ -155,25 +145,15 @@
 [submodule "mods/homedecor_modpack"]
 	path = mods/homedecor_modpack
 	url = https://github.com/minetest-mods/homedecor_modpack.git
-[submodule "mods/stained_glass"]
-	path = mods/stained_glass
-	url = https://github.com/VanessaE/stained_glass.git
 [submodule "mods/unifiedwool"]
 	path = mods/unifiedwool
 	url = https://github.com/MT-Modder/unifiedwool.git
-[submodule "mods/sea"]
-	path = mods/sea
-	url = https://github.com/H4mlet/sea.git
 [submodule "mods/biome_lib"]
 	path = mods/biome_lib
 	url = https://github.com/minetest-mods/biome_lib.git
 [submodule "mods/moretrees"]
 	path = mods/moretrees
 	url = https://github.com/minetest-mods/moretrees.git
-[submodule "mods/farming"]
-	path = mods/farming
-	url = https://github.com/sys4-fr/farming.git
-	branch = nalc
 [submodule "mods/coloredwood"]
 	path = mods/coloredwood
 	url = https://github.com/sys4-fr/coloredwood.git
@ -207,3 +187,25 @@
 [submodule "mods/connected_chests"]
 	path = mods/connected_chests
 	url = https://github.com/HybridDog/connected_chests.git
+[submodule "minetest_game"]
+	path = minetest_game
+	url = https://github.com/minetest/minetest_game
+	branch = stable-0.4
+[submodule "mods/bakedclay"]
+	path = mods/bakedclay
+	url = https://notabug.org/TenPlus1/bakedclay.git
+[submodule "mods/bonemeal"]
+	path = mods/bonemeal
+	url = https://notabug.org/TenPlus1/bonemeal.git
+[submodule "mods/sea"]
+	path = mods/sea
+	url = https://sys4.fr/gogs/NotreAmiLeCube/sea.git
+[submodule "mods/stained_glass"]
+	path = mods/stained_glass
+	url = https://gitlab.com/VanessaE/stained_glass.git
+[submodule "mods/farming"]
+	path = mods/farming
+	url = https://notabug.org/TenPlus1/Farming.git
+[submodule "mods/hazmat_suit"]
+	path = mods/hazmat_suit
+	url = https://github.com/stujones11/hazmat_suit.git
--- a/minetest.conf
+++ b/minetest.conf
@ -14,7 +14,7 @@ enable_damage = true
 disallow_empty_password = true
 server_dedicated = true
 # 1 day-night cycle lasts 24 minutes instead of 20.
-time_speed = 60
+time_speed = 36
 # Slightly higher player limit by default.
 max_users = 10
 # Give basics privileges to new players.
@ -198,7 +198,7 @@ armor_heal_multiplier = 1
 armor_water_protect = true

 # Enable fire protection (defaults true if using ethereal mod)
-armor_fire_protect = false
+armor_fire_protect = true

 # Enable punch damage effects.
 armor_punch_damage = true
@ -256,7 +256,7 @@ player_model_version = default_character_v2
 # item_drop
 enable_item_drop = false
 enable_item_pickup_key = false
-#enable_item_pickup = true
+enable_item_pickup = true
 item_pickup_radius = 0.75
 #item_pickup_keytype = Sneak

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7a4b1e0ce13750904e56938d3414ef60093a2b6e
+Subproject commit d6a66860af6fc39957d8e947824b9c56c3686b8e
--- a/mods/3d_armor
+++ b/mods/3d_armor
@ -1 +1 @@
-Subproject commit 579d245a00fcf5bc4fef438d6d1efe84873339b7
+Subproject commit 838867a6bcb51cb187c58fc9504a0afa435c6112
--- a/mods/bakedclay
+++ b/mods/bakedclay
@ -1 +1 @@
-Subproject commit 268946971aab3c4299672a22e43781cd189b94bc
+Subproject commit 67d0f2a8d6bdf88a788421110479057e025bfb85
--- a/mods/bonemeal
+++ b/mods/bonemeal
@ -1 +1 @@
-Subproject commit a3cf3fd5550948e53d8e37b4a0b90256b4b08c75
+Subproject commit a0cb8657df797c36011ab61311ef2e15960d530b
--- a/mods/darkage
+++ b/mods/darkage
@ -1 +1 @@
-Subproject commit 686d5316afa650602c85cc4c197a3cb866a82b9c
+Subproject commit 19f2fa743590c4b7bea2329015dd68e7071d40ee
--- a/mods/farming
+++ b/mods/farming
@ -1 +1 @@
-Subproject commit c18c184b8662c46e6b0febc2df10fd3e74076834
+Subproject commit 8606b41c95b36973f0e8901cd0868290aedc018f
--- a/mods/hazmat_suit
+++ b/mods/hazmat_suit
@ -0,0 +1 @@
+Subproject commit 977c734073179435b6c00eff491d7f4adc72c09c
--- a/mods/homedecor_modpack
+++ b/mods/homedecor_modpack
@ -1 +1 @@
-Subproject commit bfda7c49fdde4ef9f48fc73976ef2193541173d0
+Subproject commit 9e69a6db739622d4eccb103dfd8403898301041e
--- a/mods/maidroid
+++ b/mods/maidroid
@ -1 +1 @@
-Subproject commit d2899c867210723629416c3bfb675c3d000d9348
+Subproject commit 3b414ef40aa0f3a1ce8655867b54b8fdfe2feb04
--- a/mods/mesecons
+++ b/mods/mesecons
@ -1 +1 @@
-Subproject commit f70a308bb0bddefe963a6b82016f67d3be122069
+Subproject commit a2340065925a2b622bba45661b8a5f96a888101a
--- a/mods/moreblocks
+++ b/mods/moreblocks
@ -1 +1 @@
-Subproject commit 8ff1cb598f79d5b34957b40b4c9ad6afcf7376a7
+Subproject commit 846214993ff6502632808806d68263c16f98105c
--- a/mods/morefarming
+++ b/mods/morefarming
@ -1 +1 @@
-Subproject commit e50862606ed359ce132bfefa2f7e7752961b0aae
+Subproject commit 1eac844554a5aa086b86613dd1886c77f530a88f
--- a/mods/moreores
+++ b/mods/moreores
@ -1 +1 @@
-Subproject commit 238e92a6bf39c8a48841442206eba7828eab94f6
+Subproject commit 2316595ab9331c20abe5c7cd4dffef22f4671227
--- a/mods/moretrees
+++ b/mods/moretrees
@ -1 +1 @@
-Subproject commit 324155f80519259fdf58f43604cecbf47bfb035e
+Subproject commit 61d1c54faf1187afe2e3b9c142afd559ec159fd0
--- a/mods/pipeworks
+++ b/mods/pipeworks
@ -1 +1 @@
-Subproject commit cb5530c6c82a4e3409780d93d513dd32c68c4dec
+Subproject commit 8186f003beae42c9815b3c9c131e919f5b099035
--- a/mods/playeranim
+++ b/mods/playeranim
@ -1 +1 @@
-Subproject commit 0cccb537a28c6596a538b5ec221efa8ed9481965
+Subproject commit 560af7eae58f9a12a95f3d2ff31c893cb106d633
--- a/mods/sea
+++ b/mods/sea
@ -1 +1 @@
-Subproject commit 58e245a94fedfdaf41b09552408b8533fe32d4ab
+Subproject commit c912cf078b2726004d16eaf025d7df65fd0398e6
--- a/mods/technic
+++ b/mods/technic
@ -1 +1 @@
-Subproject commit 689766f15aad5186b35d21942ff853a7c2fc65bf
+Subproject commit d1b54a573c6287ea1d63b9c3f979c39058b1331a
--- a/mods/toolranks
+++ b/mods/toolranks
@ -1 +1 @@
-Subproject commit 84467b0f7433db7370877e11d40181b236ff6db8
+Subproject commit d1be7c1e944225a26c61c8f3acd75e6b3f4aa945
--- a/mods/unifiedbricks
+++ b/mods/unifiedbricks
@ -1 +1 @@
-Subproject commit d77d445edfd574ab85299d4421accbc16aa7cda6
+Subproject commit 49ded639653d6c5caeb50cc5284c0ac5acd3ff1b
--- a/mods/unifieddyes
+++ b/mods/unifieddyes
@ -1 +1 @@
-Subproject commit 0d654eafecd07f4adcf5ec38893591e116fb007a
+Subproject commit cd130cf8de393e2f890a31a1b93a2158d4933a11
				`@ -0,0 +1 @@`
				`Subproject commit 977c734073179435b6c00eff491d7f4adc72c09c`