merge upstream

359febd4 · Milan · 16866f0b · c8f3e7c8 · 21fa315e · 0b15a708
Commit 359febd4 authored 8 years ago by Milan
--- a/ethereal @ 21fa315e
+++ b/ethereal @ 21fa315e
-Subproject commit 0b15a708a018ce71fea4ad6262fed7250a5c4001
+Subproject commit 21fa315e9e0f89ab9ff0933b2b944c05f6c795d6
--- a/homedecor_modpack @ 8638435b
+++ b/homedecor_modpack @ 8638435b
-Subproject commit 6b396cf1506b3a294bf476a61955ffa37eb25706
+Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828