resolve mergeconflicts

.gitmodules

 [submodule "mods/illuna"]
 	path = mods/illuna
 	url = https://git.tchncs.de/Illuna-Minetest/illuna.git
+[submodule "mods/wine"]
+	path = mods/wine
+	url = https://notabug.org/TenPlus1/wine
 [submodule "mods/death_messages"]
 	path = mods/death_messages
 	url = https://git.tchncs.de/Illuna-Minetest/death_messages.git
@@ -53,6 +56,9 @@
 [submodule "mods/halloween_mobs"]
 	path = mods/halloween_mobs
 	url = https://git.tchncs.de/Illuna-Minetest/halloween_mobs
+[submodule "mods/protector"]
+	path = mods/protector
+	url = https://notabug.org/TenPlus1/protector
 [submodule "mods/ethereal"]
 	path = mods/ethereal
 	url = https://git.tchncs.de/Illuna-Minetest/ethereal
@@ -215,12 +221,6 @@
 [submodule "mods/playereffects"]
 	path = mods/playereffects
 	url = https://git.tchncs.de/Illuna-Minetest/playereffects
-[submodule "mods/wine"]
-	path = mods/wine
-	url = https://notabug.org/TenPlus1/wine
-[submodule "mods/protector"]
-	path = mods/protector
-	url = https://notabug.org/TenPlus1/protector
-[submodule "mods/matrix_chat"]
-	path = mods/matrix_chat
-	url = https://github.com/diggers-mt/matrix_chat
+[submodule "mods/chat3"]
+	path = mods/chat3
+	url = https://git.tchncs.de/Illuna-Minetest/chat3

chat3 @ dd2d8023

+Subproject commit dd2d80239496f791d88b2f15b46f73d197d38525