Merge pull request #218 from Xandavin/master

Thaumcraft crash fix, forge version update