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

Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/enderface/BlockEnderIO.java
	src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/gui/IGuiScreen.java
This commit is contained in:
tterrag1098 committed 2015-02-26 11:33:42 -05:00
commit 96273cede4
223 files changed
+7920 -1655

No files matched your search

@@ -98,6 +98,8 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
}
renderSlotHighlights();
super.drawGuiContainerBackgroundLayer(par1, par2, par3);
}
public void renderSlotHighlights() {
@@ -153,7 +155,7 @@ public abstract class GuiMachineBase<T extends AbstractMachineEntity> extends Gu
addToolTip(tt);
}
private void updateProgressTooltips(int scaledProgress, float progress) {
protected final void updateProgressTooltips(int scaledProgress, float progress) {
if(lastProgressTooltipValue == scaledProgress || progressTooltips == null) {
return;
}