Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-05-12 13:26:35 -05:00
commit 5a57dc5817
4 changed files with 16 additions and 4 deletions

View file

@ -30,8 +30,15 @@ public class ContainerAlloySmelter extends TechRebornContainer {
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 0, 47, 17));
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 1, 65, 17));
// outputs
this.addSlotToContainer(new SlotOutput(tileAlloysmelter.inventory, 2,
116, 35));
this.addSlotToContainer(new SlotOutput(tileAlloysmelter.inventory, 2, 116, 35));
// battery
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 3, 56, 53));
// upgrades
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 4, 152, 8));
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 5, 152, 26));
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 6, 152, 44));
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 7, 152, 62));
int i;

View file

@ -34,6 +34,11 @@ public class ContainerAssemblingMachine extends TechRebornContainer {
this.addSlotToContainer(new SlotOutput(tileAssemblingMachine.inventory, 2,116, 35));
// power
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 3, 56, 53));
// upgrades
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 4, 152, 8));
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 5, 152, 26));
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 6, 152, 44));
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 7, 152, 62));
int i;