Merge branch '1.7.10'

This commit is contained in:
CrazyPants committed 2014-07-01 14:39:35 +08:00
commit 64ba3d0817
92 files changed
+544 -389

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, itemGliderWing, blockVacuumChest;
public final String unlocalisedName;