aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorBlood-Asp <Blood@Asp>2015-06-27 03:26:08 +0200
committerBlood-Asp <Blood@Asp>2015-06-27 03:26:08 +0200
commit8198a51aeef641fd25d2b77f776c7640dd3f84a9 (patch)
treec72f6a26a68d4135119c73504cceef1fed3e98fe /main/java/gregtech/loaders
parent6591e802e925a1f57d62b8d506936d6d5e9fde3c (diff)
downloadGT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.tar.gz
GT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.tar.bz2
GT5-Unofficial-8198a51aeef641fd25d2b77f776c7640dd3f84a9.zip
Version 5.08.21
Diffstat (limited to 'main/java/gregtech/loaders')
-rw-r--r--main/java/gregtech/loaders/oreprocessing/ProcessingItem.java2
-rw-r--r--main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java2
-rw-r--r--main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
index 250eeff6b7..effba804c4 100644
--- a/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
+++ b/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java
@@ -61,7 +61,7 @@ public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistr
GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Uranium, 3628800L, new MaterialStack[0]));
}
else {
- System.out.println("Item Name: " + aOreDictName + " !!!Unknown Item detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, it's just an Information.");
+ //System.out.println("Item Name: " + aOreDictName + " !!!Unknown Item detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, it's just an Information.");
}
}
}
diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 8d4584865e..cac1cd7c93 100644
--- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -621,7 +621,7 @@ public class GT_MachineRecipeLoader
GT_ModHandler.addCompressionRecipe(new ItemStack(Items.quartz, 4, 0), new ItemStack(Blocks.quartz_block, 1, 0));
GT_ModHandler.addCompressionRecipe(new ItemStack(Items.wheat, 9, 0), new ItemStack(Blocks.hay_block, 1, 0));
GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4L), new ItemStack(Blocks.glowstone, 1));
- GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Graphite, 1L));
+ GT_Values.RA.addCutterRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Graphite, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Graphite, 9L), GT_Values.NI, 500, 48);
GT_ModHandler.addPulverisationRecipe(GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockSkyStone", 1L, 32767), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 45), GT_Values.NI, 0, false);
diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 33b4d4e982..a96d4a8adb 100644
--- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -932,7 +932,7 @@ public class GT_Loader_MetaTileEntities
ItemList.Generator_Naquadah_Mark_I.set(new GT_MetaTileEntity_SolidNaquadahReactor(1190, "basicgenerator.naquadah.tier.04", "Naquadah Reactor Mark I", 4).getStackForm(1L));
ItemList.Generator_Naquadah_Mark_II.set(new GT_MetaTileEntity_SolidNaquadahReactor(1191, "basicgenerator.naquadah.tier.05", "Naquadah Reactor Mark II", 5).getStackForm(1L));
- ItemList.Generator_Naquadah_Fluid.set(new GT_MetaTileEntity_FluidNaquadahReactor(1192, "basicgenerator.naquadah.tier.06", "Fluid Naquadah Reactor", 6).getStackForm(1L));
+ ItemList.Generator_Naquadah_Fluid.set(new GT_MetaTileEntity_FluidNaquadahReactor(1192, "basicgenerator.naquadah.tier.06", "Naquadah Reactor Mark III", 6).getStackForm(1L));
GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_I.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "UCU", "FMF", "WCW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('F'), ItemList.Field_Generator_EV, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('U'), OrePrefixes.stick.get(Materials.Uranium235) });
GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_II.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "FMF", "WCW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('F'), ItemList.Field_Generator_IV, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('P'), OrePrefixes.stick.get(Materials.Plutonium241) });