Various fixes and start of Aether pack
Merge branch 'master' of github.com:FlansMods/FlansMod