Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-01 22:28:11 +01:00
commit f3c87a27c8

17
.gitmodules vendored
View File

@ -265,30 +265,27 @@
[submodule "runes"] [submodule "runes"]
path = runes path = runes
url = https://sys4.fr/gitea/nalc/runes.git url = https://sys4.fr/gitea/nalc/runes.git
[submodule "serverguide"]
path = serverguide
url = https://sys4.fr/gitea/nalc/serverguide.git
[submodule "shutdown"] [submodule "shutdown"]
path = shutdown path = shutdown
url = https://sys4.fr/gitea/nalc/shutdown.git url = https://sys4.fr/gitea/nalc/shutdown.git
branch = nalc
[submodule "signs_lib"] [submodule "signs_lib"]
path = signs_lib path = signs_lib
url = https://sys4.fr/gitea/nalc/signs_lib.git url = https://sys4.fr/gitea/mtcontrib/signs_lib.git
branch = nalc
[submodule "snow"] [submodule "snow"]
path = snow path = snow
url = https://sys4.fr/gitea/nalc/minetest-mod-snow.git url = https://sys4.fr/gitea/nalc/minetest-mod-snow.git
branch = nalc-1.1
[submodule "spears"] [submodule "spears"]
path = spears path = spears
url = https://sys4.fr/gitea/nalc/spears.git url = https://sys4.fr/gitea/nalc/spears.git
branch = nalc
[submodule "sponge"] [submodule "sponge"]
path = sponge path = sponge
url = https://sys4.fr/gitea/nalc/sponge.git url = https://sys4.fr/gitea/nalc/sponge.git
branch = nalc
[submodule "stained_glass"] [submodule "stained_glass"]
path = stained_glass path = stained_glass
url = https://sys4.fr/gitea/nalc/stained_glass.git url = https://sys4.fr/gitea/minetest-mods/stained_glass.git
branch = nalc
[submodule "technic"] [submodule "technic"]
path = technic path = technic
url = https://sys4.fr/gitea/nalc/technic.git url = https://sys4.fr/gitea/nalc/technic.git
@ -445,10 +442,6 @@
path = unified_inventory path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git url = https://sys4.fr/gitea/nalc/unified_inventory.git
branch = nalc-1.1 branch = nalc-1.1
[submodule "serverguide"]
path = serverguide
url = https://sys4.fr/gitea/nalc/serverguide.git
branch = nalc-1.1
[submodule "irc"] [submodule "irc"]
path = irc path = irc
url = https://sys4.fr/gitea/nalc/irc.git url = https://sys4.fr/gitea/nalc/irc.git