merge upstream

This commit is contained in:
tchncs 2016-11-06 19:01:28 +01:00
commit 2c5573d5e4
4 changed files with 9 additions and 2 deletions

7
.gitmodules vendored
View file

@ -62,7 +62,6 @@
[submodule "mods/coloured_nametag"]
path = mods/coloured_nametag
url = https://github.com/Amaz1/coloured_nametag
[submodule "mods/bags"]
path = mods/bags
url = https://git.tchncs.de/Illuna-Minetest/bags
@ -105,3 +104,9 @@
[submodule "mods/technic"]
path = mods/technic
url = https://git.tchncs.de/Illuna-Minetest/technic
[submodule "mods/markers"]
path = mods/markers
url = https://github.com/Sokomine/markers
[submodule "mods/areas"]
path = mods/areas
url = https://github.com/ShadowNinja/areas