Merge branch '1.7.10' into 1.10

* 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
This commit is contained in:
aidancbrady committed 2016-11-27 13:33:57 -05:00
commit c510ce7d8c
9 files changed
+35 -2

No files matched your search

@@ -889,6 +889,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
@Override
public SecurityMode getSecurity(ItemStack stack)
{
if(!general.allowProtection)
{
return SecurityMode.PUBLIC;
}
return SecurityMode.values()[ItemDataUtils.getInt(stack, "security")];
}