diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2017-12-24 11:54:30 +1000 |
| commit | ecf908e98ccee72a713091e8ab547e35a41d7436 (patch) | |
| tree | f0dade1481aa02fd0ac4fcf8a672cc7a761a0547 /src/Java/gtPlusPlus/xmod/eio | |
| parent | b9fe3352840abe0846834cefd578895ec6f5e520 (diff) | |
| parent | fa5de3584ce7bc97ce6f32b31f6062b5b6e89e75 (diff) | |
| download | GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.gz GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.bz2 GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.zip | |
> Why does Git make me do these? arghhh...
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/material/ALLOY.java
# src/Java/gtPlusPlus/core/material/ELEMENT.java
# src/Java/gtPlusPlus/core/material/Material.java
# src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/eio')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java index cdb04c9b45..a8c5382a21 100644 --- a/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java @@ -1,10 +1,6 @@ package gtPlusPlus.xmod.eio.material; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.state.MaterialState; public class MaterialEIO { @@ -18,6 +14,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().GOLD, 1), @@ -33,6 +30,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 1), @@ -48,6 +46,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().IRON, 1), @@ -63,6 +62,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ALLOY.STEEL, 3), @@ -78,6 +78,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().GOLD, 1), @@ -94,6 +95,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ENERGETIC_ALLOY, 1), @@ -109,6 +111,7 @@ public class MaterialEIO { 10, 10, false, //Uses Blast furnace? + false, //Generates a cell //Material Stacks with Percentage of required elements. new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().SILICON, 1), |