Merge branch 'stable-1.0' into stable-1.1
This commit is contained in:
commit
cb839b895d
9
.gitmodules
vendored
9
.gitmodules
vendored
|
@ -208,14 +208,15 @@
|
|||
[submodule "moreplants"]
|
||||
path = moreplants
|
||||
url = https://sys4.fr/gitea/nalc/moreplants.git
|
||||
[submodule "moretrees"]
|
||||
path = moretrees
|
||||
url = https://sys4.fr/gitea/nalc/moretrees.git
|
||||
[submodule "mtfoods"]
|
||||
path = mtfoods
|
||||
url = https://sys4.fr/gitea/nalc/mtfoods.git
|
||||
branch = nalc
|
||||
[submodule "multitest"]
|
||||
path = multitest
|
||||
url = https://sys4.fr/gitea/nalc/multitest.git
|
||||
branch = nalc
|
||||
[submodule "names_per_ip"]
|
||||
path = names_per_ip
|
||||
url = https://sys4.fr/gitea/nalc/names_per_ip.git
|
||||
|
@ -448,10 +449,6 @@
|
|||
path = name_restrictions
|
||||
url = https://sys4.fr/gitea/nalc/name_restrictions.git
|
||||
branch = nalc-1.1
|
||||
[submodule "moretrees"]
|
||||
path = moretrees
|
||||
url = https://sys4.fr/gitea/nalc/moretrees.git
|
||||
branch = nalc-1.1
|
||||
[submodule "plantlife_modpack"]
|
||||
path = plantlife_modpack
|
||||
url = https://sys4.fr/gitea/nalc/plantlife_modpack.git
|
||||
|
|
Loading…
Reference in New Issue
Block a user