Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge upstream

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
.gitmodules vendored
View file

@ -62,7 +62,6 @@
[submodule "mods/coloured_nametag"] [submodule "mods/coloured_nametag"]
path = mods/coloured_nametag path = mods/coloured_nametag
url = https://github.com/Amaz1/coloured_nametag url = https://github.com/Amaz1/coloured_nametag
[submodule "mods/bags"] [submodule "mods/bags"]
path = mods/bags path = mods/bags
url = https://git.tchncs.de/Illuna-Minetest/bags url = https://git.tchncs.de/Illuna-Minetest/bags
@ -105,3 +104,9 @@
[submodule "mods/technic"] [submodule "mods/technic"]
path = mods/technic path = mods/technic
url = https://git.tchncs.de/Illuna-Minetest/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

1
mods/areas Submodule

@ -0,0 +1 @@
Subproject commit 7cb8787bebdad6b1077f7046eddeacc9da0d2136

1
mods/markers Submodule

@ -0,0 +1 @@
Subproject commit 52d1b90b8906b28d4b5ba93cd271b3865b316d00

2
mods/pkarcs

@ -1 +1 @@
Subproject commit 80f9ea5c64d547b15978edcd09743a866d8fbf0c Subproject commit a0281ae20225533c9b97c676dcde8c8f4382ddbc