maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4

Browse source
This commit is contained in:
Prospector 2016-05-28 12:40:27 -07:00
commit d051286f95
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -57,7 +57,7 @@ configurations {
} }
version = "1.2.2" version = "1.2.3"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {

1
src/main/java/techreborn/items/DynamicCell.java
View file

@ -24,6 +24,7 @@ public class DynamicCell extends UniversalBucket{
super(1000, new ItemStack(ModItems.emptyCell), false); super(1000, new ItemStack(ModItems.emptyCell), false);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.cellFilled"); setUnlocalizedName("techreborn.cellFilled");
setMaxStackSize(16);
} }
@Override @Override

4
src/main/java/techreborn/tiles/TileMatterFabricator.java
View file

@ -16,7 +16,7 @@ import techreborn.items.ItemParts;
public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable,IInventoryProvider public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable,IInventoryProvider
{ {
public static int fabricationRate = 2666656; public static int fabricationRate = 10000;
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(7, "TileMatterFabricator", 64, this); public Inventory inventory = new Inventory(7, "TileMatterFabricator", 64, this);
public int progresstime = 0; public int progresstime = 0;
@ -99,7 +99,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
ItemStack stack = inventory.getStackInSlot(i); ItemStack stack = inventory.getStackInSlot(i);
if (this.amplifier < 100000 && stack != null) if (this.amplifier < 10000 && stack != null)
{ {
int amp = (int) ((long) (getValue(stack) / 32)); int amp = (int) ((long) (getValue(stack) / 32));
if (ItemUtils.isItemEqual(stack, inventory.getStackInSlot(i), true, true)) if (ItemUtils.isItemEqual(stack, inventory.getStackInSlot(i), true, true))