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

@@ -140,7 +140,12 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe
}
return super.func_146978_c(p_146978_1_, p_146978_2_, p_146978_3_, p_146978_4_, p_146978_5_, p_146978_6_);
}
@Override
public List<GhostSlot> getGhostSlots() {
return ghostSlots;
}
@Override
protected void mouseClicked(int x, int y, int p_73864_3_) {
for (GuiTextField f : textFields) {