aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing
diff options
context:
space:
mode:
authorTechlone <techlone.mc@gmail.com>2017-06-04 21:31:08 +0500
committerTechlone <techlone.mc@gmail.com>2017-06-04 21:31:08 +0500
commit5df32b69abfa1071fabc6c8a1864ca1fa918e123 (patch)
tree3d0f5ef9fd6073f96bc1c6ad4920d70b76274b0b /src/main/java/gregtech/loaders/oreprocessing
parentc5402ee38998cc086ceb36fbce6c54aba6d9d79c (diff)
parentdbd2f5800886a36dbe4528aabfb2b30f1e7b0908 (diff)
downloadGT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.tar.gz
GT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.tar.bz2
GT5-Unofficial-5df32b69abfa1071fabc6c8a1864ca1fa918e123.zip
Merge branch 'unstable' into advminer2_improvements
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index 2e00133a69..64a8edaa5b 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -85,7 +85,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (aMaterial.mFuelPower > 0)
GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, aMaterial.mFuelPower, aMaterial.mFuelType);
GT_Utility.removeSimpleIC2MachineRecipe(GT_Utility.copyAmount(9L, new Object[]{aStack}), GT_ModHandler.getCompressorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L));
- GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), 2, GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+ GT_Values.RA.addImplosionRecipe(GT_Utility.copyAmount(aMaterial == Materials.MeteoricIron ? 1 : 2, new Object[]{aStack}), 2, GT_OreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), GT_Proxy.tBits, new Object[]{"hX", 'X', OrePrefixes.plate.get(aMaterial)});
if (aMaterial == Materials.Paper)