Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-06 18:28:02 +01:00
commit 2866c7686c

12
.gitmodules vendored
View File

@ -288,28 +288,22 @@
url = https://sys4.fr/gitea/minetest-mods/stained_glass.git url = https://sys4.fr/gitea/minetest-mods/stained_glass.git
[submodule "technic"] [submodule "technic"]
path = technic path = technic
url = https://sys4.fr/gitea/nalc/technic.git url = https://sys4.fr/gitea/minetest-mods/technic.git
branch = nalc
[submodule "technic_armor"] [submodule "technic_armor"]
path = technic_armor path = technic_armor
url = https://sys4.fr/gitea/nalc/technic_armor.git url = https://sys4.fr/gitea/nalc/technic_armor.git
branch = nalc
[submodule "throwing"] [submodule "throwing"]
path = throwing path = throwing
url = https://sys4.fr/gitea/nalc/throwing.git url = https://sys4.fr/gitea/nalc/throwing.git
branch = nalc
[submodule "treasurer"] [submodule "treasurer"]
path = treasurer path = treasurer
url = https://sys4.fr/gitea/nalc/treasurer.git url = https://sys4.fr/gitea/nalc/minetest_treasurer.git
branch = nalc
[submodule "tsm_chests_dungeon"] [submodule "tsm_chests_dungeon"]
path = tsm_chests_dungeon path = tsm_chests_dungeon
url = https://sys4.fr/gitea/nalc/tsm_chests_dungeon.git url = https://sys4.fr/gitea/nalc/minetest_tsm_chests_dungeon.git
branch = nalc
[submodule "tsm_mines"] [submodule "tsm_mines"]
path = tsm_mines path = tsm_mines
url = https://sys4.fr/gitea/nalc/tsm_mines.git url = https://sys4.fr/gitea/nalc/tsm_mines.git
branch = nalc
[submodule "unifiedbricks"] [submodule "unifiedbricks"]
path = unifiedbricks path = unifiedbricks
url = https://sys4.fr/gitea/nalc/unifiedbricks.git url = https://sys4.fr/gitea/nalc/unifiedbricks.git