diff options
| author | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
| commit | cb0f1d4d2c705676de231272cd731a319071c0ac (patch) | |
| tree | 8acf54c21a000f12191bd25126761bac8ea5584c /src/main/java/gregtech/loaders/load | |
| parent | c12e474c23ca02fb3479312850f6ae07e623d8b9 (diff) | |
| parent | 417d45d2578402d9bb6406e2622d9261a4c25cf4 (diff) | |
| download | GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.gz GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.bz2 GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.zip | |
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_ItemIterator.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 22488cf893..714a27c617 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -25,6 +25,8 @@ public class GT_FuelLoader ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);//TODO CHECK NEW x3
ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
+ ItemList.sIron3Chloride = GT_Mod.gregtechproxy.addFluid("iron3chloride", "Iron III Chloride", null, 1, 295);
+ ItemList.sHydrochloricAcid = GT_Mod.gregtechproxy.addFluid("hydrochloricacid", "Hydrochloric Acid", null, 1, 295);
new GT_Recipe(new ItemStack(Items.lava_bucket), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2);
GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 25000);
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 8a6836146f..850026d371 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -104,10 +104,10 @@ public class GT_ItemIterator 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, ItemList.Circuit_Basic.get(2L, new Object[0]), 200, 32); + GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, 32); } if (tName.equals("item.ItemTimeCard")) { - GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, ItemList.Circuit_Basic.get(1L, new Object[0]), 100, 32); + GT_Values.RA.addAssemblerRecipe(new ItemStack(tItem, 1, 32767), null, GT_ModHandler.getIC2Item("electronicCircuit", 1L), 100, 32); } if (tName.equals("tile.ArsMagica:ore_vinteum")) { GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Vinteum, new ItemStack(tItem, 1, 0)); |