Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-12-06 21:53:50 +01:00
commit 0f588976b7

3
.gitmodules vendored
View File

@ -355,15 +355,12 @@
[submodule "sea"] [submodule "sea"]
path = sea path = sea
url = https://sys4.fr/gitea/nalc/minetest-mod-sea.git url = https://sys4.fr/gitea/nalc/minetest-mod-sea.git
branch = nalc-1.1
[submodule "slimes"] [submodule "slimes"]
path = slimes path = slimes
url = https://sys4.fr/gitea/nalc/mod-slimes.git url = https://sys4.fr/gitea/nalc/mod-slimes.git
branch = nalc
[submodule "nether"] [submodule "nether"]
path = nether path = nether
url = https://sys4.fr/gitea/nalc/nether-pack.git url = https://sys4.fr/gitea/nalc/nether-pack.git
branch = nalc
[submodule "colddb"] [submodule "colddb"]
path = colddb path = colddb
url = https://sys4.fr/gitea/nalc/colddb.git url = https://sys4.fr/gitea/nalc/colddb.git