Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-17 20:47:39 +01:00
commit 9e27212e45

15
.gitmodules vendored
View File

@ -169,30 +169,27 @@
[submodule "metatools"] [submodule "metatools"]
path = metatools path = metatools
url = https://sys4.fr/gitea/nalc/minetest-mod-metatools.git url = https://sys4.fr/gitea/nalc/minetest-mod-metatools.git
branch = nalc
[submodule "mob_horse"] [submodule "mob_horse"]
path = mob_horse path = mob_horse
url = https://sys4.fr/gitea/nalc/mob_horse.git url = https://sys4.fr/gitea/nalc/mob_horse.git
branch = nalc
[submodule "mobs"] [submodule "mobs"]
path = mobs path = mobs
url = https://sys4.fr/gitea/nalc/mobs_redo.git url = https://sys4.fr/gitea/mtcontrib/mobs_redo.git
branch = nalc
[submodule "mobs_animal"] [submodule "mobs_animal"]
path = mobs_animal path = mobs_animal
url = https://sys4.fr/gitea/nalc/mobs_animal.git url = https://sys4.fr/gitea/nalc/mobs_animal.git
branch = nalc
[submodule "mobs_monster"] [submodule "mobs_monster"]
path = mobs_monster path = mobs_monster
url = https://sys4.fr/gitea/nalc/mobs_monster.git url = https://sys4.fr/gitea/nalc/mobs_monster.git
branch = nalc
[submodule "mobs_water"] [submodule "mobs_water"]
path = mobs_water path = mobs_water
url = https://sys4.fr/gitea/nalc/mobs_water.git url = https://sys4.fr/gitea/nalc/mobs_water.git
branch = nalc
[submodule "moognu"] [submodule "moognu"]
path = moognu path = moognu
url = https://sys4.fr/gitea/nalc/moognu.git url = https://sys4.fr/gitea/nalc/moognu.git
[submodule "moreblocks"]
path = moreblocks
url = https://sys4.fr/gitea/nalc/moreblocks.git
branch = nalc branch = nalc
[submodule "more_chests"] [submodule "more_chests"]
path = more_chests path = more_chests
@ -478,10 +475,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 "moreblocks"]
path = moreblocks
url = https://sys4.fr/gitea/nalc/moreblocks.git
branch = nalc
[submodule "irc"] [submodule "irc"]
path = irc path = irc
url = https://sys4.fr/gitea/nalc/irc.git url = https://sys4.fr/gitea/nalc/irc.git