cleanup
Merge branch 'master' of github.com:Deadrik/TFCraft
Removed finite water. Cherry picked this from my local 78 branch since I was already trying to fix the stupid buckets.