More work
Fixed forge and TiC version numbers
Updated TC
Merge branch '1.7' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into 1.7
Merge branch '1.7' into 1.7-crops