Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.

1792 errors. A good night's work, I think.
This commit is contained in:
Ben Spiers committed 2014-04-20 04:34:19 +01:00
1 parent ab47724473
commit db7121454a
280 files changed
+6850 -2031

No files matched your search

@@ -188,7 +188,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)*Mekanism.FROM_TE));
}
else if(inventory[27].itemID == Item.redstone.itemID && getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY)
else if(inventory[27].itemID == Items.redstone.itemID && getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY)
{
setEnergy(getEnergy() + Mekanism.ENERGY_PER_REDSTONE);
inventory[27].stackSize--;
@@ -355,7 +355,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
int y = MathHelper.floor_double(posY);
int z = MathHelper.floor_double(posZ);
if(worldObj.getBlockTileEntity(x, y, z) instanceof TileEntityChargepad)
if(worldObj.getTileEntity(x, y, z) instanceof TileEntityChargepad)
{
return true;
}