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:
commit
2a617919d9
3 changed files with 6 additions and 5 deletions
|
@ -6,7 +6,9 @@ TechReborn is currently in a beta state.
|
||||||
|
|
||||||
We have permission to use Greg's textures, see here :https://i.imgur.com/YQEMrq5.png?1
|
We have permission to use Greg's textures, see here :https://i.imgur.com/YQEMrq5.png?1
|
||||||
|
|
||||||
The current main maintainers are @modmuss50 and @gigabit101 if you need any help please contact one of us.
|
The current main maintainer is @gigabit101 if you need any help please contact us.
|
||||||
|
|
||||||
|
@modmuss50 is a past maintainer of the mod(see http://techreborn.ninja/?p=20).
|
||||||
|
|
||||||
[](http://modmuss50.me:8080/job/TechReborn/)
|
[](http://modmuss50.me:8080/job/TechReborn/)
|
||||||
|
|
||||||
|
|
|
@ -320,7 +320,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
|
||||||
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
|
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")) {
|
} else if (block.getUnlocalizedName().equals("tile.lava")) {
|
||||||
hasLava = true;
|
hasLava = true;
|
||||||
|
|
|
@ -19,7 +19,6 @@ import reborncore.common.misc.Location;
|
||||||
import reborncore.common.multiblock.IMultiblockPart;
|
import reborncore.common.multiblock.IMultiblockPart;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import techreborn.api.recipe.RecipeCrafter;
|
import techreborn.api.recipe.RecipeCrafter;
|
||||||
import techreborn.blocks.BlockMachineBase;
|
|
||||||
import techreborn.blocks.BlockMachineCasing;
|
import techreborn.blocks.BlockMachineCasing;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
@ -220,8 +219,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
public boolean canInsertItem(int slotIndex, ItemStack itemStack, int side) {
|
||||||
if (slotIndex >= 1)
|
if (slotIndex >= 2)
|
||||||
return false;
|
return false;
|
||||||
return isItemValidForSlot(slotIndex, itemStack);
|
return isItemValidForSlot(slotIndex, itemStack);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue