aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorOneEyeMaker <oneeyemaker@gmail.com>2016-07-27 07:05:14 +0300
committerGitHub <noreply@github.com>2016-07-27 07:05:14 +0300
commitfa1955f6e535679a2df17cc83e0c7873cfa15055 (patch)
tree6cdc8f166427f0d99b9b3395a8a536b8f7bfe497 /src/main/java/gregtech/api/metatileentity/implementations
parent4c20885d144e5b2eaa7177668f71a32ecc694b9f (diff)
parentb4bcebf4583a0cac5b59a30b23cd8bb41422c7d4 (diff)
downloadGT5-Unofficial-fa1955f6e535679a2df17cc83e0c7873cfa15055.tar.gz
GT5-Unofficial-fa1955f6e535679a2df17cc83e0c7873cfa15055.tar.bz2
GT5-Unofficial-fa1955f6e535679a2df17cc83e0c7873cfa15055.zip
Merge pull request #4 from Blood-Asp/experimental
Update changes
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
index b355fc00d7..fb863ef37a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
@@ -1,5 +1,7 @@
package gregtech.api.metatileentity.implementations;
+import java.util.Random;
+
import gregtech.api.enums.*;
import gregtech.api.gui.GT_Container_BasicMachine;
import gregtech.api.gui.GT_GUIContainer_BasicMachine;
@@ -17,8 +19,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import java.util.Random;
-
import static gregtech.api.enums.GT_Values.V;
import static gregtech.api.enums.GT_Values.W;
@@ -101,10 +101,10 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel);
break;
case 6:
- aRecipe[i] = OrePrefixes.plate.get(Materials.HSSE);
+ aRecipe[i] = OrePrefixes.plate.get(Materials.HSSG);
break;
case 7:
- aRecipe[i] = OrePrefixes.plate.get(Materials.HSSG);
+ aRecipe[i] = OrePrefixes.plate.get(Materials.HSSE);
break;
case 8:
aRecipe[i] = OrePrefixes.plate.get(Materials.Neutronium);
@@ -166,16 +166,16 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Nichrome);
break;
case 5:
- aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Nichrome);
+ aRecipe[i] = OrePrefixes.wireGt02.get(Materials.TungstenSteel);
break;
case 6:
- aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NiobiumTitanium);
+ aRecipe[i] = OrePrefixes.wireGt02.get(Materials.HSSG);
break;
case 7:
- aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Superconductor);
+ aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Naquadah);
break;
case 8:
- aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Superconductor);
+ aRecipe[i] = OrePrefixes.wireGt02.get(Materials.NaquadahAlloy);
break;
default:
aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Nichrome);
@@ -200,16 +200,16 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Nichrome);
break;
case 5:
- aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Nichrome);
+ aRecipe[i] = OrePrefixes.wireGt04.get(Materials.TungstenSteel);
break;
case 6:
- aRecipe[i] = OrePrefixes.wireGt16.get(Materials.NiobiumTitanium);
+ aRecipe[i] = OrePrefixes.wireGt04.get(Materials.HSSG);
break;
case 7:
- aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Superconductor);
+ aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Naquadah);
break;
case 8:
- aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Superconductor);
+ aRecipe[i] = OrePrefixes.wireGt04.get(Materials.NaquadahAlloy);
break;
default:
aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Nichrome);
@@ -687,4 +687,4 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
}
public static enum X {PUMP, WIRE, WIRE4, HULL, PIPE, GLASS, PLATE, MOTOR, ROTOR, SENSOR, PISTON, CIRCUIT, EMITTER, CONVEYOR, ROBOT_ARM, COIL_HEATING, COIL_ELECTRIC, STICK_MAGNETIC, STICK_DISTILLATION, BETTER_CIRCUIT, FIELD_GENERATOR, COIL_HEATING_DOUBLE, STICK_ELECTROMAGNETIC;}
-} \ No newline at end of file
+}