Merge with upstream

This commit is contained in:
drcrazy 2017-10-27 09:39:31 +03:00
parent 60426c4cc1
commit c7f599ead1

View file

@ -219,7 +219,6 @@ public class TileFusionControlComputer extends TilePowerAcceptor implements IToo
if (hasStartedCrafting && this.crafingTickTime < this.finalTickTime) {
this.crafingTickTime++;
// Power gen
if (this.currentRecipe.getEuTick() > 0) {
// Waste power if it has no where to go
this.addEnergy(this.currentRecipe.getEuTick());