diff options
| author | John <Techlone@users.noreply.github.com> | 2017-03-02 23:06:15 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 23:06:15 +0500 |
| commit | d919d1bc400bc585a02fe6e05593ade37a0276ec (patch) | |
| tree | a12590ceb67b13c5d171464dfefcb86a55438268 /src/main/java/gregtech/api/enums | |
| parent | 2246de7cf49bdce9da2127bcde0c5a73c6b750bb (diff) | |
| parent | 8e945a8b88fbe08c728e8ed4d919c4c013780514 (diff) | |
| download | GT5-Unofficial-d919d1bc400bc585a02fe6e05593ade37a0276ec.tar.gz GT5-Unofficial-d919d1bc400bc585a02fe6e05593ade37a0276ec.tar.bz2 GT5-Unofficial-d919d1bc400bc585a02fe6e05593ade37a0276ec.zip | |
Merge pull request #8 from Blood-Asp/unstable
Update
Diffstat (limited to 'src/main/java/gregtech/api/enums')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 2cb50871fa..83602c2f89 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -434,6 +434,7 @@ public enum OrePrefixes { plateTriple.mGeneratedItems.add(Materials.Paper); plateQuadruple.mGeneratedItems.add(Materials.Paper); plateQuintuple.mGeneratedItems.add(Materials.Paper); + ring.mGeneratedItems.add(Materials.Paper); lens.mGeneratedItems.add(Materials.EnderPearl); lens.mGeneratedItems.add(Materials.EnderEye); @@ -691,7 +692,7 @@ public enum OrePrefixes { aMaterial == Materials.Osmium || aMaterial == Materials.Iridium || aMaterial == Materials.Bronze || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel || aMaterial == Materials.StainlessSteel || aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel || aMaterial == Materials.Rubber || aMaterial == Materials.HSSE || aMaterial == Materials.Neutronium || aMaterial == Materials.HSSG || aMaterial == Materials.Aluminium || - aMaterial == Materials.Invar || aMaterial == Materials.Brass)) + aMaterial == Materials.Invar || aMaterial == Materials.Brass || aMaterial == Materials.Paper)) ring.mDisabledItems.add(aMaterial); //Foil if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium || aMaterial == Materials.Silicon || aMaterial == Materials.Gold || |