Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-03 12:41:21 +01:00
commit f08f24b95d

10
.gitmodules vendored
View File

@ -115,18 +115,18 @@
[submodule "hudbars"] [submodule "hudbars"]
path = hudbars path = hudbars
url = https://sys4.fr/gitea/nalc/minetest_hudbars.git url = https://sys4.fr/gitea/nalc/minetest_hudbars.git
[submodule "interact"]
path = interact
url = https://sys4.fr/gitea/nalc/interact.git
[submodule "inventorycheck"] [submodule "inventorycheck"]
path = inventorycheck path = inventorycheck
url = https://sys4.fr/gitea/nalc/inventorycheck.git url = https://sys4.fr/gitea/nalc/inventorycheck.git
branch = nalc
[submodule "irc_commands"] [submodule "irc_commands"]
path = irc_commands path = irc_commands
url = https://sys4.fr/gitea/nalc/irc_commands.git url = https://sys4.fr/gitea/nalc/irc_commands.git
branch = nalc
[submodule "item_drop"] [submodule "item_drop"]
path = item_drop path = item_drop
url = https://sys4.fr/gitea/nalc/item_drop.git url = https://sys4.fr/gitea/nalc/item_drop.git
branch = nalc
[submodule "jumping"] [submodule "jumping"]
path = jumping path = jumping
url = https://sys4.fr/gitea/nalc/jumping.git url = https://sys4.fr/gitea/nalc/jumping.git
@ -487,10 +487,6 @@
path = unified_inventory path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git url = https://sys4.fr/gitea/nalc/unified_inventory.git
branch = nalc-1.1 branch = nalc-1.1
[submodule "interact"]
path = interact
url = https://sys4.fr/gitea/nalc/interact.git
branch = nalc-1.1
[submodule "serverguide"] [submodule "serverguide"]
path = serverguide path = serverguide
url = https://sys4.fr/gitea/nalc/serverguide.git url = https://sys4.fr/gitea/nalc/serverguide.git