aidancbrady
|
87438dcc7f
|
Boiler work, added heat info tab, worked on polishing heat interactions among machines
|
2016-02-27 13:32:48 -05:00 |
|
Aidan C. Brady
|
2fe4cf290d
|
Merge branch 'master' into development (@unpairedbracket, make sure I did this right)
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2015-02-19 16:12:28 -05:00 |
|
Ben Spiers
|
49be30de34
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2014-12-14 19:04:03 +00:00 |
|
Ben Spiers
|
a91dcc49d4
|
Introduce statistical consumption of gases.
|
2014-12-14 18:10:46 +00:00 |
|