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

Conflicts:
	resources/assets/enderio/textures/gui/widgets.png
	src/main/java/crazypants/enderio/gui/IconEIO.java
This commit is contained in:
tterrag1098 committed 2015-02-07 17:24:27 -05:00
commit bbd305a0ab
682 files changed
+7899 -1809

No files matched your search

@@ -60,8 +60,6 @@ public abstract class AbstractMachineContainer extends Container {
addSlotToContainer(slot);
playerSlotLocations.put(slot, loc);
}
}
@Override