Change FluidType to a more appropriate class
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct