Merge branch 'master' into Weather_Obelisk

Conflicts:
	src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java
This commit is contained in:
tterrag1098 committed 2015-01-20 15:16:11 -05:00
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();
}
}
}