Beta build 7.
Merge branch 'master' of https://github.com/Vazkii/Botania