Fixed #311
Merge branch '1.7' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into 1.7