Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-06-09 12:39:06 +02:00
commit 9cf1dea367

2
.gitmodules vendored
View File

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