merge upstream 🐈

2016-11-09 23:32:50 +01:00 · 2016-11-09 23:32:50 +01:00 · 359febd4ac
parent 16866f0b08 c8f3e7c8b5
commit 359febd4ac
2 changed files with 2 additions and 2 deletions
--- a/mods/ethereal
+++ b/mods/ethereal
@ -1 +1 @@
-Subproject commit 0b15a708a018ce71fea4ad6262fed7250a5c4001
+Subproject commit 21fa315e9e0f89ab9ff0933b2b944c05f6c795d6
--- a/mods/homedecor_modpack
+++ b/mods/homedecor_modpack
@ -1 +1 @@
-Subproject commit 6b396cf1506b3a294bf476a61955ffa37eb25706
+Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828