merge upstream 🐈

2017-08-03 22:38:08 +02:00 · 2017-08-03 22:38:08 +02:00 · 68cd79dc12
parent 492cd9cbae 1238a7ffda
commit 68cd79dc12
9 changed files with 5 additions and 9 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -47,9 +47,6 @@
 [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
 [submodule "mods/bags"]
 	path = mods/bags
 	url = https://git.tchncs.de/Illuna-Minetest/bags
--- a/mods/3d_armor
+++ b/mods/3d_armor
@ -1 +1 @@
-Subproject commit 5517be8ff2a99ef104c795ce6b726133dd7cc8a1
+Subproject commit 0454d72c727b1642490e30826029146bbfe4aaa5
--- a/mods/coloured_nametag
+++ b/mods/coloured_nametag
@ -1 +0,0 @@
-Subproject commit c50a4ca893e5383d75ff274533327a5faf20b1b7
--- a/mods/default/models/character.b3d
+++ b/mods/default/models/character.b3d
--- a/mods/default/models/character.blend
+++ b/mods/default/models/character.blend
--- a/mods/hopper
+++ b/mods/hopper
@ -1 +1 @@
-Subproject commit ca9abb76136ebad532fe9fdad7b647147399eb39
+Subproject commit eb26adcbfe131e50f9374596f323673691cd6830
--- a/mods/mg_villages
+++ b/mods/mg_villages
@ -1 +1 @@
-Subproject commit 3e504c356e5c76173e058f762f3fcd0a62064350
+Subproject commit aeadb8ca8e1e2eddbbb1a09e7112152c1780e33c
--- a/mods/teleport_potion
+++ b/mods/teleport_potion
@ -1 +1 @@
-Subproject commit 5d1c07e195ae544a33564ab2164cfa6fd89c6170
+Subproject commit 1a150b3ddbade34714e3ac0867109c40f5742d56
--- a/mods/worldedit
+++ b/mods/worldedit
@ -1 +1 @@
-Subproject commit 56f77a2f278f6ca1731c1f0efe5026ff5c9f4735
+Subproject commit acc91888280c8f6fb3631ae10634edd0df403e73
				`@ -1 +0,0 @@`
				`Subproject commit c50a4ca893e5383d75ff274533327a5faf20b1b7`