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

Merge branch 'master' into 'master'

Browse source 
Use new hemp bags

*Do not accept until the bags PR I sent has been merged https://git.tchncs.de/Illuna-Minetest/bags/merge_requests/1*

* Updates `bags` version
* Bring in new `hemp` submodule (new dependency of `bags`)

See merge request !1
This commit is contained in:
Milan* 2016-09-24 20:32:38 +02:00
commit b3edafbbd9
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -71,6 +71,10 @@
[submodule "mods/columnia"] [submodule "mods/columnia"]
path = mods/columnia path = mods/columnia
url = https://git.tchncs.de/Illuna-Minetest/columnia url = https://git.tchncs.de/Illuna-Minetest/columnia
[submodule "mods/hemp"]
path = mods/hemp
url = https://github.com/pithydon/hemp.git
[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

2
mods/bags

@ -1 +1 @@
Subproject commit b073bcb760328654e9d73e61bf950a56d8adbbb5 Subproject commit b99fb8a1c7f7a763efd77b293efb867552ad1ce1

1
mods/hemp Submodule

@ -0,0 +1 @@
Subproject commit bb1112449e8462e386b0bf0b6c1481b0b6e7d2ca