mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 03:49:31 +00:00
Merge branch 'GasConduits' of https://github.com/Tonius/EnderIO into Tonius-GasConduits
This commit is contained in:
commit
0d314b380d
90 files changed
+7044
-162
No files matched your search
@@ -11,7 +11,7 @@ public enum ModObject {
|
||||
itemConduitFacade,
|
||||
itemRedstoneConduit,
|
||||
itemItemConduit,
|
||||
itemMeConduit,
|
||||
itemGasConduit,
|
||||
itemBasicFilterUpgrade,
|
||||
itemExistingItemFilter,
|
||||
itemModItemFilter,
|
||||
@@ -48,19 +48,19 @@ public enum ModObject {
|
||||
blockFarmStation,
|
||||
blockTank,
|
||||
blockCrafter,
|
||||
blockVacuumChest,
|
||||
blockVacuumChest,
|
||||
blockWirelessCharger,
|
||||
blockEnchanter,
|
||||
|
||||
|
||||
blockPoweredSpawner,
|
||||
itemBrokenSpawner,
|
||||
|
||||
|
||||
blockKillerJoe,
|
||||
|
||||
blockElectricLight,
|
||||
blockLightNode,
|
||||
blockLight,
|
||||
|
||||
|
||||
//Blocks
|
||||
blockDarkSteelPressurePlate,
|
||||
blockReinforcedObsidian,
|
||||
@@ -81,9 +81,9 @@ public enum ModObject {
|
||||
itemYetaWrench,
|
||||
|
||||
blockTravelAnchor,
|
||||
itemTravelStaff,
|
||||
itemMagnet,
|
||||
itemGliderWing,
|
||||
itemTravelStaff,
|
||||
itemMagnet,
|
||||
itemGliderWing,
|
||||
blockEndermanSkull;
|
||||
|
||||
public final String unlocalisedName;
|
||||
|
||||
Reference in new issue
Block a user