aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlodBlock <60341015+GlodBlock@users.noreply.github.com>2021-10-31 01:35:36 +0800
committerGitHub <noreply@github.com>2021-10-31 01:35:36 +0800
commit7c7cabc094a0c146eb8ca73b468ab3f0c5b086c4 (patch)
tree86f3ef1b6e159dc2b2bce4b50f5fedab1f46cbdd /src
parenta272cd12d8c461c94595542a8089c6c1d2e4aa03 (diff)
downloadGT5-Unofficial-7c7cabc094a0c146eb8ca73b468ab3f0c5b086c4.tar.gz
GT5-Unofficial-7c7cabc094a0c146eb8ca73b468ab3f0c5b086c4.tar.bz2
GT5-Unofficial-7c7cabc094a0c146eb8ca73b468ab3f0c5b086c4.zip
fix conflict recipe
Diffstat (limited to 'src')
-rw-r--r--src/main/java/GoodGenerator/Loader/RecipeLoader.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
index b652a119aa..6c9e709955 100644
--- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java
+++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java
@@ -1684,7 +1684,7 @@ public class RecipeLoader {
GT_Values.RA.addBlastRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sapphire,1),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Coal,3),
FluidRegistry.getFluidStack("liquidnitrogen",1000),
null,
ItemRefer.Aluminum_Nitride_Dust.get(2),
@@ -1696,7 +1696,7 @@ public class RecipeLoader {
GT_Values.RA.addBlastRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GreenSapphire,1),
- GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Carbon,3),
+ GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Coal,3),
FluidRegistry.getFluidStack("liquidnitrogen",1000),
null,
ItemRefer.Aluminum_Nitride_Dust.get(2),