diff options
author | Dream-Master <dream-master@gmx.net> | 2017-07-25 00:51:59 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2017-07-25 00:51:59 +0200 |
commit | f0c1ca494c761aab4152ec9566b28394ab2ce904 (patch) | |
tree | c8f96234ec2bf022d7bbc41cabbcad323448e779 /src/main/java/gregtech/api/enums | |
parent | 4b3618594c53ff37c437d47b550316db02f0105a (diff) | |
parent | 39c70dbe3d5f5d62fe02233875c079588c645499 (diff) | |
download | GT5-Unofficial-f0c1ca494c761aab4152ec9566b28394ab2ce904.tar.gz GT5-Unofficial-f0c1ca494c761aab4152ec9566b28394ab2ce904.tar.bz2 GT5-Unofficial-f0c1ca494c761aab4152ec9566b28394ab2ce904.zip |
Merge branch 'GTNHexperimental' into experimental-test
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 3 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/SubTag.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index bed0d6819d..8504af6b7f 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1280,7 +1280,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo(YellowLimonite, BrownLimonite, Pyrite, BandedIron, Nickel, Vermiculite, Glauconite, GlauconiteSand, Pentlandite, Tin, Antimony, Ilmenite, Manganese, Chrome, Chromite, Andradite); SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo(Pyrite, YellowLimonite, BasalticMineralSand, GraniticMineralSand); SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron, BrownLimonite); - SubTag.WASHING_MERCURY.addTo(Gold, Silver, Osmium, Mithril, Platinum, /**Midasium,**/ Cooperite, AstralSilver); + SubTag.WASHING_MERCURY.addTo(Gold, Osmium, Mithril, Platinum, /**Midasium,**/ Cooperite, AstralSilver); + SubTag.INCREASE_WASHING_MERCURY.addTo(Silver); SubTag.WASHING_SODIUMPERSULFATE.addTo(Zinc, Nickel, Copper, Cobalt, Cobaltite, Tetrahedrite); SubTag.METAL.addTo(AnyIron, AnyCopper, AnyBronze, Metal, Aluminium, Americium, Antimony, Beryllium, Bismuth, Caesium, Cerium, Chrome, Cobalt, Copper, Dysprosium, Erbium, Europium, Gadolinium, Gallium, Gold, Holmium, Indium, Iridium, Iron, Lanthanum, Lead, Lutetium, Magnesium, Manganese, Mercury, Niobium, Molybdenum, Neodymium, Neutronium, Nickel, Osmium, Palladium, Platinum, Plutonium, Plutonium241, diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java index 84f7a5be2c..b716b3c6d3 100644 --- a/src/main/java/gregtech/api/enums/SubTag.java +++ b/src/main/java/gregtech/api/enums/SubTag.java @@ -54,6 +54,10 @@ public final class SubTag implements ICondition<ISubTagContainer> { */ public static final SubTag WASHING_MERCURY = getNewSubTag("WASHING_MERCURY"); /** + * Add this to your Material if you want to have its Ore Mercury washed with a higher Output chance (100%) + */ + public static final SubTag INCREASE_WASHING_MERCURY = getNewSubTag("INCREASE_WASHING_MERCURY"); + /** * Add this to your Material if you want to have its Ore electromagnetically separated to give Gold. */ public static final SubTag ELECTROMAGNETIC_SEPERATION_GOLD = getNewSubTag("ELECTROMAGNETIC_SEPERATION_GOLD"); |