diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-12 21:12:01 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-05-12 21:12:01 +0200 |
| commit | 20142f1b10f06c32be1a5835691c1a89c3888a33 (patch) | |
| tree | 9a715d16426b76bdededd14dfd0244b0c5154385 /src/main/java/gregtech/loaders/load | |
| parent | 0c2dee56daeb7b94208a581f1dc9f21edbb5e2f6 (diff) | |
| parent | 60cea028a473537a820e8b48991989cf82546b6f (diff) | |
| download | GT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.tar.gz GT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.tar.bz2 GT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.zip | |
Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts:
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 4268252e8f..ae7a3ad88c 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -19,7 +19,7 @@ public class GT_FuelLoader implements Runnable {
public void run() {
GT_Log.out.println("GT_Mod: Initializing various Fuels.");
- ItemList.sNitricAcid = GT_Mod.gregtechproxy.addFluid("nitricacid", "Nitric acid ", null, 1, 295);
+ ItemList.sNitricAcid = GT_Mod.gregtechproxy.addFluid("nitricacid", "Nitric acid ", Materials.NitricAcid, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1), ItemList.Cell_Empty.get(1, new Object[0]), 1000);
ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);
|