diff options
author | Technus <daniel112092@gmail.com> | 2018-04-15 12:35:33 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2018-04-15 12:35:33 +0200 |
commit | a50fe06bfcae07d1bf25af784364392cd232d3cd (patch) | |
tree | 9a8905c62ea4c15102754444f1354845dd3dcf46 /src/main/java/gregtech/api/enums | |
parent | 7971edd3771ea2e0687e65151fb9b3bca90d2609 (diff) | |
parent | 2b492f360ad5bd1a2f525d101d8fdfa4628c2552 (diff) | |
download | GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.tar.gz GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.tar.bz2 GT5-Unofficial-a50fe06bfcae07d1bf25af784364392cd232d3cd.zip |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 3e750962c7..43e8e5c5f3 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1298,7 +1298,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { CallistoIce.mChemicalFormula="SpH\u2082O";
Quantium.mChemicalFormula="Qt";
Desh.mChemicalFormula="De";
- Oriharukon.mChemicalFormula="Oh";
+ Oriharukon.mChemicalFormula="Oh";
Draconium.mChemicalFormula="D";
DraconiumAwakened.mChemicalFormula="D*";
BlueAlloy.mChemicalFormula="AgRp\u2084";
@@ -1309,9 +1309,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { DeepIron.mChemicalFormula="Sp\u2082Fe";
Ichorium.mChemicalFormula="IcMa";
// Duralumin.mChemicalFormula="Al\u2086CuMnMg";
- Infinity.mChemicalFormula="I*";
- InfinityCatalyst.mChemicalFormula="IC";
+ Infinity.mChemicalFormula="If*";
+ InfinityCatalyst.mChemicalFormula="If";
//Pentacadmiummagneiumhexaoxid.mChemicalFormula="Cd5MgO6";
+ CosmicNeutronium.mChemicalFormula="SpNt";
}
private static void initSubTags() {
|