aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-09-23 20:38:17 +0900
committerGitHub <noreply@github.com>2022-09-23 12:38:17 +0100
commitc8691be4cc651920419b31e0aec86b538f5404bc (patch)
tree509c6623ba2df8b0bd05493c15b633b8bfcf9cac
parentcf5bcb401eee7ec19224bebb2f85ad18b11d3214 (diff)
downloadGT5-Unofficial-c8691be4cc651920419b31e0aec86b538f5404bc.tar.gz
GT5-Unofficial-c8691be4cc651920419b31e0aec86b538f5404bc.tar.bz2
GT5-Unofficial-c8691be4cc651920419b31e0aec86b538f5404bc.zip
Fix misbehaved merge in #290 (#362)
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 11764b2c8b..aeec1e783d 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1497,7 +1497,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("stickBlackSteel", 8)
},
null,
- ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32),
+ ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64),
30 * 20,
500);
@@ -1710,7 +1710,7 @@ public class RECIPES_GREGTECH {
CORE.RA.addSixSlotAssemblingRecipe(
new ItemStack[] {
ItemUtils.getGregtechCircuit(17),
- ItemUtils.getItemStackOfAmountFromOreDict("plateRefinedTrinium", GTNH ? 64 : 32),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTrinium", GTNH ? 64 : 32),
CI.getSensor(6, GTNH ? 6 : 3),
CI.getBolt(7, GTNH ? 64 : 32),
ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),