merge upstream 🐈

2017-03-20 22:40:16 +01:00 · 2017-03-20 22:40:16 +01:00 · 7f2d4f4fbf
commit 7f2d4f4fbf
parent e99f72a103 9f19de97fe
3 changed files with 5 additions and 1 deletions
--- a/mods/3d_armor
+++ b/mods/3d_armor
@ -1 +1 @@
-Subproject commit e46ff3488b4cae227a84fd71cbb321f91f446412
+Subproject commit 5517be8ff2a99ef104c795ce6b726133dd7cc8a1
--- a/mods/unifieddyes
+++ b/mods/unifieddyes
@ -0,0 +1 @@
+Subproject commit 726bb75e1d0daa36d4c95fb675bc672badad7a77
				`@ -0,0 +1 @@`
				`Subproject commit 726bb75e1d0daa36d4c95fb675bc672badad7a77`