Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-16 21:20:44 +02:00
commit dbe82dfc6a

2
.gitmodules vendored
View File

@ -24,7 +24,7 @@
branch = nalc branch = nalc
[submodule "bobblocks"] [submodule "bobblocks"]
path = bobblocks path = bobblocks
url = https://sys4.fr/gitea/nalc/bobblocks.git url = https://sys4.fr/gitea/nalc/BobBlocks.git
branch = nalc branch = nalc
[submodule "bonemeal"] [submodule "bonemeal"]
path = bonemeal path = bonemeal