Merge branch 'stable-1.0' into stable-1.1

.gitmodules

@@ -115,18 +115,18 @@
 [submodule "hudbars"]
 	path = hudbars
 	url = https://sys4.fr/gitea/nalc/minetest_hudbars.git
+[submodule "interact"]
+	path = interact
+	url = https://sys4.fr/gitea/nalc/interact.git
 [submodule "inventorycheck"]
 	path = inventorycheck
 	url = https://sys4.fr/gitea/nalc/inventorycheck.git
-	branch = nalc
 [submodule "irc_commands"]
 	path = irc_commands
 	url = https://sys4.fr/gitea/nalc/irc_commands.git
-	branch = nalc
 [submodule "item_drop"]
 	path = item_drop
 	url = https://sys4.fr/gitea/nalc/item_drop.git
-	branch = nalc
 [submodule "jumping"]
 	path = jumping
 	url = https://sys4.fr/gitea/nalc/jumping.git
@@ -487,10 +487,6 @@
 	path = unified_inventory
 	url = https://sys4.fr/gitea/nalc/unified_inventory.git
 	branch = nalc-1.1
-[submodule "interact"]
-	path = interact
-	url = https://sys4.fr/gitea/nalc/interact.git
-	branch = nalc-1.1
 [submodule "serverguide"]
 	path = serverguide
 	url = https://sys4.fr/gitea/nalc/serverguide.git