merge upstream 🐱

2016-12-04 20:46:35 +01:00 · 2016-12-04 20:46:35 +01:00 · a4bbdac2d5
commit a4bbdac2d5
parent 4e8b247626 20b5aa2b63
3 changed files with 1 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -125,9 +125,6 @@
 [submodule "mods/character_creator"]
 	path = mods/character_creator
 	url = https://github.com/minetest-mods/character_creator
-[submodule "mods/clothing"]
-	path = mods/clothing
-	url = https://github.com/stujones11/clothing
 [submodule "mods/3d_armor"]
 	path = mods/3d_armor
 	url = https://github.com/stujones11/minetest-3d_armor
--- a/mods/3d_armor
+++ b/mods/3d_armor
@ -1 +1 @@
-Subproject commit f071acd6dd4dc29977ef66b726807f4846b34278
+Subproject commit 98786fd8f7c12524e33ecffe36b9b750996a19fa
--- a/mods/clothing
+++ b/mods/clothing
@ -1 +0,0 @@
-Subproject commit 3c6f659f25d216c5ea186ac1bacc2007d4674ff9
				`@ -1 +0,0 @@`
				`Subproject commit 3c6f659f25d216c5ea186ac1bacc2007d4674ff9`