aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-05-15 08:14:00 +0200
committerTechnus <daniel112092@gmail.com>2017-05-15 08:14:00 +0200
commit90eaac5c7434aef000163b57ac000bc1a212a7d1 (patch)
treec4e7da32486c5ecf8739e952a20be102e1a86976 /src/main/java
parent1ddc91afc8aa2615241105c331e6fe145a7e8a6f (diff)
parentb9ea501e3f7a07ce247d2c945fd165ecb662b250 (diff)
downloadGT5-Unofficial-90eaac5c7434aef000163b57ac000bc1a212a7d1.tar.gz
GT5-Unofficial-90eaac5c7434aef000163b57ac000bc1a212a7d1.tar.bz2
GT5-Unofficial-90eaac5c7434aef000163b57ac000bc1a212a7d1.zip
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 079ac4bf80..ad88c6b9d0 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -830,7 +830,7 @@ public class GT_CraftingRecipeLoader implements Runnable {
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBoots", 1L));
}
- if (Loader.isModLoaded("GraviSuite")) {//TODO CHECK GRAVI RECIPES
+ if (Loader.isModLoaded("GraviSuite")) {
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W));
GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W), new Object[]{"CJC", "CNC", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1, GT_Values.W), 'N', GT_ModHandler.getIC2Item("nanoBodyarmor", 1L), 'W', OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Data)});
}