Merge pull request #229 from progwml6/master

update thaumium support by upating the location of the necessary config ...
Revert "Change derpy faucet behaviour."

Reverting due to issues that I currently do not have time to fix.
Smeltery Gigantus activate!
Merge branch 'master' of https://github.com/mDiyo/TinkersConstruct
Merge branch 'armor' of https://github.com/mDiyo/TinkersConstruct
Added armor.
Merge pull request #235 from Vexatos/master
Prevent breaking of tank air blocks in creative + survival
Added comment support for capes.txt parser

Fixes a syntax error on line 51 in the console.
Merge branch 'master' of github.com:mDiyo/TinkersConstruct
remove unused BOP API, add in waila to pre-run source cleaning w/ other API's