Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-09-09 14:34:30 +02:00
commit 33f7f01201

2
.gitmodules vendored
View File

@ -432,7 +432,7 @@
branch = nalc-1.1 branch = nalc-1.1
[submodule "slimes"] [submodule "slimes"]
path = slimes path = slimes
url = https://sys4.fr/gitea/nalc/slimes.git url = https://sys4.fr/gitea/nalc/mod-slimes.git
branch = nalc branch = nalc
[submodule "nether"] [submodule "nether"]
path = nether path = nether