Gradle magic
Fixed conflict
More magic
Update zh_CN.lang
Removed old unused API
Made talisman take more durability damage on warp effects
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of github.com:Thaumic-Tinkerer/ThaumicTinkerer into develop
Minor change
MLTT: Gradle is Magic
Added RS output to restorer. Closes #479
Merge remote-tracking branch 'origin/develop' into develop
Various fixes to crop loot
Added null check. Fixes #490
Merge pull request #485 from crafteverywhere/patch-6

Update zh_CN.lang
Attempt at fixing 499
Merge remote-tracking branch 'origin/develop' into develop
Minor changes and fixed #499