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

@ -15,7 +15,7 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
public int tickTime;
public BasicSink energy;
public Inventory inventory = new Inventory(3, "TileAlloySmelter", 64);
public Inventory inventory = new Inventory(8, "TileAlloySmelter", 64);
public RecipeCrafter crafter;
public TileAlloySmelter()

View file

@ -15,7 +15,7 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl
public int tickTime;
public BasicSink energy;
public Inventory inventory = new Inventory(4, "TileAssemblingMachine", 64);
public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64);
public RecipeCrafter crafter;
public TileAssemblingMachine()