Merge branch '1.9.4' of https://github.com/aidancbrady/Mekanism into 1.9.4

* '1.9.4' of https://github.com/aidancbrady/Mekanism:
  A few fixes
  More fluid upgrading. TileEntity integration is about done
  Loads of work on new fluid system. Still needs polishing

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
	src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
	src/main/java/mekanism/common/tile/TileEntityDynamicValve.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/common/tile/TileEntityPRC.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
	src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
	src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
This commit is contained in:
aidancbrady committed 2016-06-29 12:27:09 -04:00
commit ca7345aecc

Diff Content Not Available