Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH

2 files changed, 54 insertions, 3 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)});
         }
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index ce5b0f8753..d0380fb1ab 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -357,6 +357,24 @@ achievement.Neutronium=Find Neutronium Ore
 achievement.Neutronium.desc=Height: 5-30, Chance: 10, /IO/Venus/Mercury/Encheladus/Titan/Miranda/Triton/KuiperBelt/Tceti//
 achievement.Adamantium=Find Adamantium Ore
 achievement.Adamantium.desc=Height: 5-30, Chance: 10, Proteus/Triton/Pluto/KuiperBelt/Makemake/Haumea/VegaB/BarnardE/BarnardF/Tceti//
+achievement.MeteoricIron=Meteoric Iron Ore
+achievement.MeteoricIron.desc=Height: 50-61, Chance: 10, DeepDarkDim/
+achievement.InfinityCatalyst=Infinity Catalyst Ore
+achievement.InfinityCatalyst.desc=Height: 5-15, Chance: 10, DeepDarkDim/
+achievement.Naquadria=Naquadria Ore
+achievement.Naquadria.desc=Height: 5-15, Chance: 10, DeepDarkDim/
+achievement.DraconiumAwakened=Awakened Draconium
+achievement.DraconiumAwakened.desc=Height: 3-10, Chance: 10, DeepDarkDim/
+achievement.Bedrockium=Bedrokium Ore
+achievement.Bedrockium.desc=Height: 3-10, Chance: 10, DeepDarkDim/
+achievement.Cobalt=Cobalt Ore
+achievement.Cobalt.desc=Height: 22-32, Chance: 10, DeepDarkDim/
+achievement.Magnesium=Magnesium Ore
+achievement.Magnesium.desc=Height: 32-42, Chance: 10, DeepDarkDim/
+achievement.Manganese=Manganese Ore
+achievement.Manganese.desc=Height: 43-53, Chance: 10, DeepDarkDim/
+achievement.Antimony=Antimony Ore
+achievement.Antimony.desc=Height: 22-32, Chance: 10, DeepDarkDim/
 
 achievement.flintpick=First Tools
 achievement.flintpick.desc=Craft a flint pick
@@ -641,9 +659,42 @@ achievement.gt.metaitem.01.32696.desc=Pickup this item to see the recipe in NEI
 achievement.gt.metaitem.01.32697=Sensor UV tier
 achievement.gt.metaitem.01.32697.desc=Pickup this item to see the recipe in NEI
 
-achievement.gt.metaitem.03:32095=Wetware Mainframe
+achievement.gt.blockmachines.fusioncomputer.tier.06=Fusion Computer Mark I
+achievement.gt.blockmachines.fusioncomputer.tier.06.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.fusioncomputer.tier.07=Fusion Computer Mark II
+achievement.gt.blockmachines.fusioncomputer.tier.07.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.fusioncomputer.tier.08=Fusion Computer Mark III
+achievement.gt.blockmachines.fusioncomputer.tier.08.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.03.32072=Neuro Processing Unit
+achievement.gt.metaitem.03.32072.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.03.32095=Wetware Mainframe
 achievement.gt.metaitem.03.32095.desc=Pickup this item to see the recipe in NEI
 
+achievement.item.NanoCircuit=Nano Circuit
+achievement.item.NanoCircuit.desc=Pickup this item to see the recipe in NEI
+achievement.item.PikoCircuit=Piko Circuit
+achievement.item.PikoCircuit.desc=Pickup this item to see the recipe in NEI
+achievement.item.QuantumCircuit=Quantum Circuit
+achievement.item.QuantumCircuit.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.metaitem.01.32605=Ultimate Battery
+achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI
+achievement.gt.metaitem.01.32609=Really Ultimate Battery
+achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI
+
+achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet
+achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumChestplate=Quantum Chestplate
+achievement.ic2.itemArmorQuantumChestplate.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumLegs=Quantum Leggings
+achievement.ic2.itemArmorQuantumLegs.desc=Pickup this item to see the recipe in NEI
+achievement.ic2.itemArmorQuantumBoots=Quantum Boots
+achievement.ic2.itemArmorQuantumBoots.desc=Pickup this item to see the recipe in NEI
+
+achievement.item.graviChestPlate=Gravi Chestplate
+achievement.item.graviChestPlate.desc=Pickup this item to see the recipe in NEI
+
 for.bees.species.clay=Clay
 for.bees.species.slimeball=Slimeball
 for.bees.species.peat=Peat
@@ -678,4 +729,4 @@ for.bees.species.uranium=Uranium
 for.bees.species.plutonium=Plutonium
 for.bees.species.naquadah=Naquadah
 
-itemGroup.GTtools=Prebuild Tools
+itemGroup.GTtools=Prebuild Tools
\ No newline at end of file