mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Merge branch 'master' into Weather_Obelisk
Conflicts: src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java
This commit is contained in:
commit
a2106ff032
260 files changed
+4914
-1370
No files matched your search
@@ -16,6 +16,7 @@ public enum ModObject {
|
||||
itemBasicFilterUpgrade,
|
||||
itemExistingItemFilter,
|
||||
itemModItemFilter,
|
||||
itemPowerItemFilter,
|
||||
itemExtractSpeedUpgrade,
|
||||
|
||||
// Power
|
||||
@@ -109,4 +110,4 @@ public enum ModObject {
|
||||
unlocalisedName = name();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user