diff options
| author | Dream-Master <dream-master@gmx.net> | 2020-04-05 22:45:43 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2020-04-05 22:45:43 +0200 |
| commit | 3985d626dba68c6c007844ef21ab2b1d60d07fb5 (patch) | |
| tree | 6f06a65ef76d3d7685d1e87c9310a0b02ae77acd /src/main/java/gregtech/loaders/oreprocessing | |
| parent | efc19bb2041c20f54b97523ac2ef6c25d8710be9 (diff) | |
| parent | aa78f84887e86c01480ce99002dffaaa5758d684 (diff) | |
| download | GT5-Unofficial-3985d626dba68c6c007844ef21ab2b1d60d07fb5.tar.gz GT5-Unofficial-3985d626dba68c6c007844ef21ab2b1d60d07fb5.tar.bz2 GT5-Unofficial-3985d626dba68c6c007844ef21ab2b1d60d07fb5.zip | |
Merge branch 'Very-Experimental' into experimental
# Conflicts:
# build.properties
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index a32835026e..fe5f4e357d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -49,7 +49,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if ((!OrePrefixes.block.isIgnored(aMaterial)) && (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) { GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); } - if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper)) { + if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) && (aMaterial != Materials.Marble) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper)) { GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 62f573adb3..d7c7a89edc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -79,7 +79,9 @@ public class ProcessingStone break; case "Redrock": case "Marble": + GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), null, 200, 30); case "Basalt": + GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), null, 200, 30); case "Quartzite": GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), 10, false); break; |