Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-02 17:44:49 +01:00
commit 64f16f1a46

8
.gitmodules vendored
View File

@ -34,35 +34,27 @@
[submodule "christmas_craft"] [submodule "christmas_craft"]
path = christmas_craft path = christmas_craft
url = https://sys4.fr/gitea/nalc/christmas_craft.git url = https://sys4.fr/gitea/nalc/christmas_craft.git
branch = nalc
[submodule "claycrafter"] [submodule "claycrafter"]
path = claycrafter path = claycrafter
url = https://sys4.fr/gitea/nalc/claycrafter.git url = https://sys4.fr/gitea/nalc/claycrafter.git
branch = nalc
[submodule "coloredwood"] [submodule "coloredwood"]
path = coloredwood path = coloredwood
url = https://sys4.fr/gitea/nalc/coloredwood.git url = https://sys4.fr/gitea/nalc/coloredwood.git
branch = nalc
[submodule "colouredstonebricks"] [submodule "colouredstonebricks"]
path = colouredstonebricks path = colouredstonebricks
url = https://sys4.fr/gitea/nalc/colouredstonebricks.git url = https://sys4.fr/gitea/nalc/colouredstonebricks.git
branch = nalc
[submodule "columnia"] [submodule "columnia"]
path = columnia path = columnia
url = https://sys4.fr/gitea/nalc/columnia.git url = https://sys4.fr/gitea/nalc/columnia.git
branch = nalc
[submodule "cozy"] [submodule "cozy"]
path = cozy path = cozy
url = https://sys4.fr/gitea/nalc/cozy.git url = https://sys4.fr/gitea/nalc/cozy.git
branch = nalc
[submodule "craftguide"] [submodule "craftguide"]
path = craftguide path = craftguide
url = https://sys4.fr/gitea/nalc/craftguide.git url = https://sys4.fr/gitea/nalc/craftguide.git
branch = nalc
[submodule "creeper"] [submodule "creeper"]
path = creeper path = creeper
url = https://sys4.fr/gitea/nalc/creeper.git url = https://sys4.fr/gitea/nalc/creeper.git
branch = nalc
[submodule "darkage"] [submodule "darkage"]
path = darkage path = darkage
url = https://sys4.fr/gitea/nalc/darkage.git url = https://sys4.fr/gitea/nalc/darkage.git