Thaumcraft merged to 1.7 branch. Removed folder