Merge branch 'master' into 1.8.8

Conflicts:
	build.gradle
This commit is contained in:
modmuss50 2015-12-05 20:30:20 +00:00
commit 40f78c3938
4 changed files with 26 additions and 90 deletions

View file

@ -85,6 +85,9 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui
for (EnumFacing direction : EnumFacing.values()) {
TileEntity tileEntity = worldObj.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()));
if (tileEntity instanceof TileMachineCasing) {
if(!((TileMachineCasing) tileEntity).isConnected()){
return false;
}
if ((tileEntity.getBlockType() instanceof BlockMachineCasing)) {
BlockMachineCasing machineCasing = (BlockMachineCasing) tileEntity.getBlockType();
int heat = machineCasing.getHeatFromState(tileEntity.getWorld().getBlockState(tileEntity.getPos()));

View file

@ -72,6 +72,9 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
for (EnumFacing direction : EnumFacing.values()) {
TileEntity tileEntity = worldObj.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()));
if (tileEntity instanceof TileMachineCasing) {
if(!((TileMachineCasing) tileEntity).isConnected()){
return false;
}
if ((tileEntity.getBlockType() instanceof BlockMachineCasing)) {
int heat;
BlockMachineCasing machineCasing = (BlockMachineCasing) tileEntity.getBlockType();