Merge branch 'master' into endercore

Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
This commit is contained in:
tterrag1098 committed 2015-05-20 10:35:59 -04:00
commit 6324c7ee69
61 files changed
+1006 -512

No files matched your search

@@ -69,7 +69,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
@Override
public float getProgress() {
return currentTask == null ? 0 : currentTask.getProgress();
return currentTask == null ? -1 : currentTask.getProgress();
}
@Override
@@ -134,11 +134,11 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
// this chance value has been used up
nextChance = Float.NaN;
}
sendTaskProgressPacket();
startFailed = !started;
} else {
startFailed = true;
}
sendTaskProgressPacket();
return requiresClientSync;
}
@@ -183,7 +183,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
markDirty();
currentTask = null;
lastProgressScaled = 0;
sendTaskProgressPacket();
}
protected void mergeResults(ResultStack[] results) {