More 1.7 changes
Merge branch '1.7' of https://github.com/pixlepix/ThaumicTinkerer into 1.7