merge upstream

.gitmodules

@@ -47,9 +47,6 @@
 [submodule "mods/hemp"]
 	path = mods/hemp
 	url = https://github.com/pithydon/hemp.git
-[submodule "mods/coloured_nametag"]
-	path = mods/coloured_nametag
-	url = https://github.com/Amaz1/coloured_nametag
 [submodule "mods/bags"]
 	path = mods/bags
 	url = https://git.tchncs.de/Illuna-Minetest/bags

3d_armor @ 0454d72c

-Subproject commit 5517be8ff2a99ef104c795ce6b726133dd7cc8a1
+Subproject commit 0454d72c727b1642490e30826029146bbfe4aaa5

coloured_nametag @ c50a4ca8

-Subproject commit c50a4ca893e5383d75ff274533327a5faf20b1b7

hopper @ eb26adcb

-Subproject commit ca9abb76136ebad532fe9fdad7b647147399eb39
+Subproject commit eb26adcbfe131e50f9374596f323673691cd6830

mg_villages @ aeadb8ca

-Subproject commit 3e504c356e5c76173e058f762f3fcd0a62064350
+Subproject commit aeadb8ca8e1e2eddbbb1a09e7112152c1780e33c

teleport_potion @ 1a150b3d

-Subproject commit 5d1c07e195ae544a33564ab2164cfa6fd89c6170
+Subproject commit 1a150b3ddbade34714e3ac0867109c40f5742d56

worldedit @ acc91888

-Subproject commit 56f77a2f278f6ca1731c1f0efe5026ff5c9f4735
+Subproject commit acc91888280c8f6fb3631ae10634edd0df403e73