* master:
Fix for #4233, in which thermal evaporation tower was attempting to render with contents above its max capacity, causing out-of-bounds error that crashed client.
# By Tom Elfring
# Via GitHub (3) and Tom Elfring (1)
* '1.10' of https://github.com/aidancbrady/Mekanism:
Fix unsave cast in Atomic Disassembler - fixes#4120
Fix Turbine not returning energy capability
Do not extract steam as a gas from a reactor, it is not registred as a gas.
* master:
make christmas.... on christmas
Fix a little error
Fix some errors
Update zh_CN file
add subclass for IItemHandler, allowing other blocks to access the DSU-type stored contents - uses add/remove methods, supersedes DSU interface(s)
add simulate support to TileEntityBin.add/remove & backwards compatible versions with no simulate parameter
Issue3887 (#1)
add gradle binaries
* 1.7.10:
Added version-based handling, bump version to 9.1.1
Bump up Dynamic Tank max storage, fixed Factory container issue
Add config option to disable block protections
Fixed chunk churning issue with frames
Restrict Thermal Evaporation Plant output to needed
Going back to MIT, thanks to the concerns of @bshelden and @asiekierka
Conflicts:
build.properties
src/main/java/mekanism/api/MekanismConfig.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/ThreadGetData.java
src/main/java/mekanism/common/block/BlockBounding.java
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
src/main/java/mekanism/common/item/ItemBlockGasTank.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/network/PacketConfigSync.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
src/main/java/mekanism/tools/common/MekanismTools.java
* Fixed gas auto-output
* Fixed Dynamic Tank logic issue, changed transmitter redstone sensitivity to off by default
* Fixed tesla crash
* Bump version to 9.2.1
* Add a check to prevent render exception
* Increase MCMP version to latest
* Account for meta in the JEI ISubtypeInterpreter
I think an old JEI was using meta + the `ISubtypeInterpreter`, but it was not intended, and JEI does not do that now.
Right now, if you look up Mekanism stuff in JEI it shows all kinds of blocks instead of just the intended block.
This PR fixes the Mekanism `ISubtypeInterpreter` so that it differentiates machines and basic blocks again.
* Fixed homeLocation write
* Fix for issue #3887