Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-17 23:28:42 +01:00
commit dac0d1eb14

9
.gitmodules vendored
View File

@ -208,14 +208,15 @@
[submodule "moreplants"] [submodule "moreplants"]
path = moreplants path = moreplants
url = https://sys4.fr/gitea/nalc/moreplants.git url = https://sys4.fr/gitea/nalc/moreplants.git
[submodule "moretrees"]
path = moretrees
url = https://sys4.fr/gitea/nalc/moretrees.git
[submodule "mtfoods"] [submodule "mtfoods"]
path = mtfoods path = mtfoods
url = https://sys4.fr/gitea/nalc/mtfoods.git url = https://sys4.fr/gitea/nalc/mtfoods.git
branch = nalc
[submodule "multitest"] [submodule "multitest"]
path = multitest path = multitest
url = https://sys4.fr/gitea/nalc/multitest.git url = https://sys4.fr/gitea/nalc/multitest.git
branch = nalc
[submodule "names_per_ip"] [submodule "names_per_ip"]
path = names_per_ip path = names_per_ip
url = https://sys4.fr/gitea/nalc/names_per_ip.git url = https://sys4.fr/gitea/nalc/names_per_ip.git
@ -448,10 +449,6 @@
path = name_restrictions path = name_restrictions
url = https://sys4.fr/gitea/nalc/name_restrictions.git url = https://sys4.fr/gitea/nalc/name_restrictions.git
branch = nalc-1.1 branch = nalc-1.1
[submodule "moretrees"]
path = moretrees
url = https://sys4.fr/gitea/nalc/moretrees.git
branch = nalc-1.1
[submodule "plantlife_modpack"] [submodule "plantlife_modpack"]
path = plantlife_modpack path = plantlife_modpack
url = https://sys4.fr/gitea/nalc/plantlife_modpack.git url = https://sys4.fr/gitea/nalc/plantlife_modpack.git