Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-06 19:56:33 +01:00
commit c12372fcfc

3
.gitmodules vendored
View File

@ -346,15 +346,12 @@
[submodule "connected_chests"] [submodule "connected_chests"]
path = connected_chests path = connected_chests
url = https://sys4.fr/gitea/nalc/connected_chests.git url = https://sys4.fr/gitea/nalc/connected_chests.git
branch = nalc
[submodule "quartz"] [submodule "quartz"]
path = quartz path = quartz
url = https://sys4.fr/gitea/nalc/quartz.git url = https://sys4.fr/gitea/nalc/quartz.git
branch = nalc
[submodule "cherry_tree"] [submodule "cherry_tree"]
path = cherry_tree path = cherry_tree
url = https://sys4.fr/gitea/nalc/cherry_tree.git url = https://sys4.fr/gitea/nalc/cherry_tree.git
branch = nalc
[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