Merge remote-tracking branch 'origin/master' into endercore

Conflicts:
	src/main/java/crazypants/enderio/BlockEio.java
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java
	src/main/java/crazypants/enderio/conduit/ConduitUtil.java
	src/main/java/crazypants/enderio/gui/IconButtonEIO.java
	src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java
	src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java
	src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
	src/main/java/crazypants/enderio/waila/WailaCompat.java
	src/main/java/crazypants/gui/GuiContainerBase.java
This commit is contained in:
tterrag1098 committed 2015-06-02 16:27:52 -04:00
commit 75bc0f27b9
46 files changed
+1258 -255

No files matched your search

@@ -48,20 +48,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt
return res;
}
@Override
public boolean canInsertItem(int i, ItemStack itemstack, int j) {
if(!super.canInsertItem(i, itemstack, j)) {
return false;
}
if(!isItemValidForSlot(i, itemstack)) {
return false;
}
if(inventory[i] == null) {
return true;
}
return inventory[i].isItemEqual(itemstack);
}
@Override
public boolean isActive() {
return currentTask == null ? false : currentTask.getProgress() >= 0 && hasPower() && redstoneCheckPassed;