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