Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
#	src/main/java/techreborn/client/gui/GuiDistillationTower.java
#	src/main/java/techreborn/client/gui/GuiFluidReplicator.java
#	src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
#	src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
#	src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/compat/CompatManager.java
This commit is contained in:
modmuss50 2019-01-12 12:08:28 +00:00
commit 4422fc7dc0
11 changed files with 35 additions and 104 deletions

View file

@ -76,7 +76,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
this.ticksSinceLastChange = 0;
}
public boolean getMutliBlock() {
public boolean getMultiBlock() {
if (multiblockChecker == null) {
return false;
}
@ -117,7 +117,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
ticksSinceLastChange = 0;
}
if (!world.isRemote && getMutliBlock()) {
if (!world.isRemote && getMultiBlock()) {
super.update();
}
@ -157,7 +157,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
// ITileRecipeHandler
@Override
public boolean canCraft(final TileEntity tile, final IndustrialGrinderRecipe recipe) {
if (!getMutliBlock()) {
if (!getMultiBlock()) {
return false;
}
final FluidStack recipeFluid = recipe.fluidStack;