Merge branch 'stable-1.0' into stable-1.1

.gitmodules

@@ -364,11 +364,12 @@
 [submodule "colddb"]
 	path = colddb
 	url = https://sys4.fr/gitea/nalc/colddb.git
-	branch = nalc
 [submodule "factions"]
 	path = factions
 	url = https://sys4.fr/gitea/nalc/factions.git
-	branch = nalc
+[submodule "plantlife_modpack"]
+	path = plantlife_modpack
+	url = https://sys4.fr/gitea/nalc/plantlife_modpack.git
 [submodule "camera"]
 	path = camera
 	url = https://sys4.fr/gitea/nalc/camera.git
@@ -409,10 +410,6 @@
 	path = homedecor_modpack
 	url = https://sys4.fr/gitea/nalc/homedecor_modpack.git
 	branch = nalc
-[submodule "plantlife_modpack"]
-	path = plantlife_modpack
-	url = https://sys4.fr/gitea/nalc/plantlife_modpack.git
-	branch = nalc-1.1
 [submodule "nalc"]
 	path = nalc
 	url = https://sys4.fr/gitea/nalc/nalc.git