Revert "Merge remote-tracking branch 'origin/master' into 1.7.10"

Yeah that didn't work...

This reverts commit 714542e2c2, reversing
changes made to b579bcdcd8.
This commit is contained in:
tterrag1098 committed 2014-06-28 23:53:49 -04:00
1 parent 714542e2c2
commit 7c7b644b3f
53 files changed
+150 -1078

No files matched your search

@@ -47,7 +47,6 @@ public enum ModObject {
blockFarmStation,
blockTank,
blockCrafter,
blockVacuumChest,
blockPoweredSpawner,
itemBrokenSpawner,
@@ -75,8 +74,7 @@ public enum ModObject {
blockTravelAnchor,
itemTravelStaff,
itemMagnet,
itemGliderWing;
itemMagnet;
public final String unlocalisedName;