Fix for Pumps

Closes #1224
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft