merge upstream

.gitmodules

@@ -19,12 +19,6 @@
 [submodule "mods/3d_armor"]
 	path = mods/3d_armor
 	url = https://github.com/stujones11/minetest-3d_armor
-[submodule "mods/plantlife_modpack"]
-	path = mods/plantlife_modpack
-	url = https://git.tchncs.de/Illuna-Minetest/plantlife_modpack.git
-[submodule "mods/darkage"]
-	path = mods/darkage
-	url = https://git.tchncs.de/Illuna-Minetest/darkage.git
 [submodule "mods/hudbars"]
 	path = mods/hudbars
 	url = https://git.tchncs.de/Illuna-Minetest/hudbars.git
@@ -105,3 +99,9 @@
 [submodule "mods/technic"]
 	path = mods/technic
 	url = https://github.com/minetest-technic/technic
+[submodule "mods/irc"]
+	path = mods/irc
+	url = https://github.com/minetest-mods/irc
+[submodule "mods/ethereal"]
+	path = mods/ethereal
+	url = https://github.com/tenplus1/ethereal/

darkage @ 4a3f6ff7

-Subproject commit 4a3f6ff796c0bbabe9858efc0ca942f018d75bf5

ethereal @ 653d4c93

+Subproject commit 653d4c93d3ac44949030aa6d8f0be75267660f23

halloween_mobs @ a78da495

-Subproject commit c094ff7538812c1e9a7e9c584f541dbead6e1237
+Subproject commit a78da495d0d2882516e6a56cce7ba2e2b7f5b6f3

irc @ 0c47e10a

+Subproject commit 0c47e10a908c189dd0bf2b0d058a3b7163e60e28

plantlife_modpack @ e882ed34

-Subproject commit e882ed349125a7e6072d158a9b457510fddaa2ac