diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-08-01 10:19:12 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-08-01 10:19:12 +0200 |
| commit | 1ceb02303dbb0952618f7fe01028871934a9cb00 (patch) | |
| tree | 827a6f3055e797b5c884e2c8f78dcca3a8c52c28 /src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | |
| parent | a3265450b750907ba36c4e8d78dd65b188a47682 (diff) | |
| parent | fe11172e01fcc378f9979c41de598c2255e80064 (diff) | |
| download | GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.gz GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.tar.bz2 GT5-Unofficial-1ceb02303dbb0952618f7fe01028871934a9cb00.zip | |
Merge branch 'experimental-test' into experimental
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 91d832a602..a5605dcf6d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -92,7 +92,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.addBlastRecipe(aOreStack, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Quicklime, aMultiplier * 3), null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, new Object[]{tSmeltInto}), ItemList.TE_Slag.get(1L, new Object[]{GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)}), tSmeltInto.stackSize * 500, 120, 1500); } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) { if(aMaterial.mBlastFurnaceTemp<20000) - GT_Values.RA.addBlastRecipe(aOreStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, new Object[]{tSmeltInto}), ItemList.TE_Slag.get(1L, new Object[]{GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)}), tSmeltInto.stackSize * 500, 120, 1500); + GT_Values.RA.addBlastRecipe(aOreStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier), null, null, GT_Utility.mul(aMultiplier * (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3) * aMaterial.mSmeltingMultiplier, new Object[]{tSmeltInto}), ItemList.TE_Slag.get(1L, new Object[]{GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)}), tSmeltInto.stackSize * 500, 120, 1500); GT_Values.RA.addBlastRecipe(aOreStack, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Quicklime, aMultiplier * 3), null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, new Object[]{tSmeltInto}), ItemList.TE_Slag.get(1L, new Object[]{GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)}), tSmeltInto.stackSize * 500, 120, 1500); } } |