Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11

# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
This commit is contained in:
modmuss50 2016-12-05 10:57:55 +00:00
commit 5782d2d032
10 changed files with 81 additions and 120 deletions

View file

@ -17,7 +17,7 @@ import techreborn.api.Reference;
import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.init.ModBlocks;
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider {
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider {
public int tickTime;
public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64, this);
@ -126,11 +126,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
return crafter;
}
@Override
public RebornContainer getContainer() {
return RebornContainer.getContainerFromClass(ContainerAssemblingMachine.class, this);
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] { 0, 1, 2 };