Merge branch 'master' of github.com:K-4U/Hydraulicraft Conflicts: java/k4unl/minecraft/Hydraulicraft/baseClasses/entities/TileTransporter.java java/pneumaticCraft/api/tileentity/AirHandlerSupplier.java
Merge branch 'master' of github.com:K-4U/Hydraulicraft Conflicts: java/k4unl/minecraft/Hydraulicraft/baseClasses/entities/TileTransporter.java java/pneumaticCraft/api/tileentity/AirHandlerSupplier.java