Merge branch 'development' into 1.8

This commit is contained in:
Aidan C. Brady 2014-07-13 00:16:05 -04:00
commit 6fbfd22583

View file

@ -993,7 +993,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
} }
@Override @Override
@Method(modid = "IC2API")
public double getMaxTransfer(ItemStack itemStack) public double getMaxTransfer(ItemStack itemStack)
{ {
return getMaxEnergy(itemStack)*0.005; return getMaxEnergy(itemStack)*0.005;