[homedecor_modpack] Corrige le merge précédent
This commit is contained in:
parent
1ff94a9a73
commit
1587447f48
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -546,10 +546,6 @@
|
|||||||
path = serverguide
|
path = serverguide
|
||||||
url = https://sys4.fr/gitea/nalc/serverguide.git
|
url = https://sys4.fr/gitea/nalc/serverguide.git
|
||||||
branch = nalc-1.1
|
branch = nalc-1.1
|
||||||
[submodule "homedecor_modpack"]
|
|
||||||
path = homedecor_modpack
|
|
||||||
url = https://sys4.fr/gitea/nalc/homedecor_modpack.git
|
|
||||||
branch = nalc-1.2
|
|
||||||
[submodule "basic_materials"]
|
[submodule "basic_materials"]
|
||||||
path = basic_materials
|
path = basic_materials
|
||||||
url = https://sys4.fr/gitea/nalc/basic_materials.git
|
url = https://sys4.fr/gitea/nalc/basic_materials.git
|
||||||
@ -566,3 +562,7 @@
|
|||||||
path = technic
|
path = technic
|
||||||
url = https://sys4.fr/gitea/nalc/technic.git
|
url = https://sys4.fr/gitea/nalc/technic.git
|
||||||
branch = master
|
branch = master
|
||||||
|
[submodule "homedecor_modpack"]
|
||||||
|
path = homedecor_modpack
|
||||||
|
url = https://sys4.fr/gitea/nalc/homedecor_modpack.git
|
||||||
|
branch = nalc-1.2
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 1520d27a73dd25d422c9599876952dab9196d56c
|
Subproject commit fb0ca9a15c487ebd5af8cf26a9060de18b596c91
|
Loading…
Reference in New Issue
Block a user