diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-24 20:36:08 +0200 |
| commit | de5992daf970326153eb713fe7587d044eae2fda (patch) | |
| tree | bae77aa181a1c955d5bacfb1f8716315d0c9639e /src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | |
| parent | e401ef5f788e131114b618a140a562e2633faa2a (diff) | |
| parent | c2eaf942e3d2fc62272caa27162a6ad253af153d (diff) | |
| download | GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.gz GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.tar.bz2 GT5-Unofficial-de5992daf970326153eb713fe7587d044eae2fda.zip | |
Merge branch 'BrickedBlastFurnace' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_RecipeRegistrator.java')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_RecipeRegistrator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 18478f7dae..3c6c106b1c 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -263,8 +263,8 @@ public class GT_RecipeRegistrator { RA.addPulveriserRecipe(aStack, new ItemStack[]{GT_OreDictUnificator.getDust(aData.mMaterial), GT_OreDictUnificator.getDust(aData.getByProduct(0)), GT_OreDictUnificator.getDust(aData.getByProduct(1)), GT_OreDictUnificator.getDust(aData.getByProduct(2))}, null, aData.mMaterial.mMaterial==Materials.Marble ? 1 : (int) Math.max(16, tAmount / M), 4, tHide); if (aAllowHammer) for (MaterialStack tMaterial : aData.getAllMaterialStacks()) - if (tMaterial.mMaterial.contains(SubTag.CRYSTAL) && !tMaterial.mMaterial.contains(SubTag.METAL)) { - if (RA.addForgeHammerRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getDust(aData.mMaterial), 200, 32)) + if (tMaterial.mMaterial.contains(SubTag.CRYSTAL) && !tMaterial.mMaterial.contains(SubTag.METAL) && tMaterial.mMaterial != Materials.Glass) { + if (RA.addForgeHammerRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getDust(aData.mMaterial), 200, 30)) break; } ItemStack tDust = GT_OreDictUnificator.getDust(aData.mMaterial); |