Merge branch 'master' into 'master'

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
2016-09-24 20:32:38 +02:00 · 2016-09-24 20:32:38 +02:00 · b3edafbbd9
parent 4cb83e53ef 5bd9eac0ae
commit b3edafbbd9
3 changed files with 6 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -71,6 +71,10 @@
 [submodule "mods/columnia"]
 	path = mods/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"]
 	path = mods/coloured_nametag
 	url = https://github.com/Amaz1/coloured_nametag
+
--- a/mods/bags
+++ b/mods/bags
@ -1 +1 @@
-Subproject commit b073bcb760328654e9d73e61bf950a56d8adbbb5
+Subproject commit b99fb8a1c7f7a763efd77b293efb867552ad1ce1
--- a/mods/hemp
+++ b/mods/hemp
@ -0,0 +1 @@
+Subproject commit bb1112449e8462e386b0bf0b6c1481b0b6e7d2ca
				`@ -0,0 +1 @@`
				`Subproject commit bb1112449e8462e386b0bf0b6c1481b0b6e7d2ca`