Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-12 21:27:20 +02:00
commit cc681e6703

8
.gitmodules vendored
View File

@ -414,10 +414,6 @@
path = worldedge path = worldedge
url = https://sys4.fr/gitea/nalc/worldedge.git url = https://sys4.fr/gitea/nalc/worldedge.git
branch = nalc branch = nalc
[submodule "WorldEdit"]
path = WorldEdit
url = https://sys4.fr/gitea/nalc/WorldEdit.git
branch = nalc
[submodule "xban2"] [submodule "xban2"]
path = xban2 path = xban2
url = https://sys4.fr/gitea/nalc/xban2.git url = https://sys4.fr/gitea/nalc/xban2.git
@ -562,3 +558,7 @@
path = 3d_armor_classes path = 3d_armor_classes
url = https://sys4.fr/gitea/nalc/3d_armor_classes.git url = https://sys4.fr/gitea/nalc/3d_armor_classes.git
branch = nalc branch = nalc
[submodule "WorldEdit"]
path = WorldEdit
url = https://sys4.fr/gitea/nalc/Minetest-WorldEdit.git
branch = nalc