diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-01-09 18:01:39 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-01-09 18:01:39 +0100 |
| commit | 0ce78114a171aaf10bc05645509d7b133d30c759 (patch) | |
| tree | 4c4b5057c5dd5378320dee566fc1a7a3edf83c63 /src/main/java/gregtech/loaders/load/GT_ItemIterator.java | |
| parent | 2c2d2cd38d352c2d1c6694f0ba498f525a36b173 (diff) | |
| parent | cf82b9a5effc47c637dbf6c1212ea42b61d3a196 (diff) | |
| download | GT5-Unofficial-0ce78114a171aaf10bc05645509d7b133d30c759.tar.gz GT5-Unofficial-0ce78114a171aaf10bc05645509d7b133d30c759.tar.bz2 GT5-Unofficial-0ce78114a171aaf10bc05645509d7b133d30c759.zip | |
Merge branch 'Dream-Master_Test-Branch' into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/load/GT_ItemIterator.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_ItemIterator.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 850026d371..0fd4a13391 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -103,11 +103,11 @@ public class GT_ItemIterator if ((tItem instanceof IFluidContainerItem)) { GT_OreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, 32767)); } - if ((tName.equals("item.ItemSensorLocationCard")) || (tName.equals("item.ItemEnergySensorLocationCard")) || (tName.equals("item.ItemEnergyArrayLocationCard")) || (tName.equals("item.ItemTextCard"))) { - GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 32); + if ((tName.equals("item.ItemSensorLocationCard")) || (tName.equals("item.ItemEnergySensorLocationCard")) || (tName.equals("item.ItemEnergyArrayLocationCard")) || (tName.equals("item.ItemTextCard")) || (tName.equals("item.ItemTextCard")) || (tName.equals("item.ItemVanillaMachineCard")) || (tName.equals("item.RFSensorCard")) || (tName.equals("item.Item55ReactorCard"))) { + GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 30); } - if (tName.equals("item.ItemTimeCard")) { - GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 1L), 100, 32); + if ((tName.equals("item.ItemTimeCard")) || (tName.equals("item.itemCounterSensorLocationCard")) || (tName.equals("item.ItemLiquidSensorLocationCard")) || (tName.equals("item.ItemGeneratorSensorLocationCard")) || (tName.equals("item.ItemLiquidArrayLocationCard")) || (tName.equals("item.ItemInventoryScannerCard")) || (tName.equals("item.AppengCard")) || (tName.equals("item.RFenergyCard")) || (tName.equals("item.ItemVanillaMachineCard"))) { + GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 1L), 100, 30); } if (tName.equals("tile.ArsMagica:ore_vinteum")) { GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Vinteum, new ItemStack(tItem, 1, 0)); |