Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9

# Conflicts:
#	src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
#	src/main/java/techreborn/tiles/TileBlastFurnace.java
This commit is contained in:
modmuss50 2016-01-16 13:09:09 +00:00
commit 2a617919d9
3 changed files with 6 additions and 5 deletions

View file

@ -320,7 +320,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
if (block.getUnlocalizedName().equals("tile.air")) {
if (block.isAir(world, x, y, z)) {
} else if (block.getUnlocalizedName().equals("tile.lava")) {
hasLava = true;