Merge branch 'v9' into 1.8.9

Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
This commit is contained in:
Ben Spiers committed 2016-02-01 23:40:35 +00:00
commit 25d0b7441b
35 files changed
+439 -256

No files matched your search

@@ -9,7 +9,6 @@ import mekanism.api.MekanismConfig.client;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.IEnergizedItem;
import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IBoundingBlock;
@@ -564,11 +563,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ)
{
if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem()))
{
return false;
}
if(world.isRemote)
{
return true;