mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 04:32:18 +00:00
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:
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
|
||||
|
||||
Reference in new issue
Block a user