diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
|---|---|---|
| committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-15 12:28:14 +0200 |
| commit | 34474480f73ca5ab1c711d73bdb4bd809673e063 (patch) | |
| tree | 794ef12002b88e2f01b5f6d76c9c1f9b62a48961 /src/main/java/gregtech/loaders/load | |
| parent | c3f2b2b49dc3911a377fd062908d4df78bd3e58d (diff) | |
| parent | 08c75fd813a4b48ba7a6b58391767161791c96e7 (diff) | |
| download | GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.gz GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.tar.bz2 GT5-Unofficial-34474480f73ca5ab1c711d73bdb4bd809673e063.zip | |
Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate
Conflicts:
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
src/main/java/gregtech/loaders/load/GT_FuelLoader.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
src/main/java/gregtech/nei/GT_NEI_DefaultHandler.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 ae7a3ad88c..188a6590b9 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 ", Materials.NitricAcid, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1), ItemList.Cell_Empty.get(1, new Object[0]), 1000);
+ 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);
|