diff options
author | Technus <daniel112092@gmail.com> | 2017-10-07 23:05:03 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-10-07 23:05:03 +0200 |
commit | ec6f25fffc0e1d0efcb646b54df02d7a5445fa32 (patch) | |
tree | 5873ce687ea2c1495b3f9290b090e5b893ee2e00 /src/main/java/gregtech/api/enums/Materials.java | |
parent | 12ac40647f5e927d7a0ac696da8edb11d7eda68e (diff) | |
parent | 9cd0c4a106dbdc95f3a4a2ea0c0749aa1385cbcc (diff) | |
download | GT5-Unofficial-ec6f25fffc0e1d0efcb646b54df02d7a5445fa32.tar.gz GT5-Unofficial-ec6f25fffc0e1d0efcb646b54df02d7a5445fa32.tar.bz2 GT5-Unofficial-ec6f25fffc0e1d0efcb646b54df02d7a5445fa32.zip |
Merge branch 'patch-1' of https://github.com/Ethryan/GT5-Unofficial into experimental
With changes
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 26a8fbb91c..afd760dc4c 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1258,32 +1258,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Naquadah.mChemicalFormula = "Nq"; NaquadahEnriched.mChemicalFormula = "Nq+"; Naquadria.mChemicalFormula = "Nq*"; - NaquadahAlloy.mChemicalFormula="Nq2KeC"; + NaquadahAlloy.mChemicalFormula="Nq\u2082KeC"; Sunnarium.mChemicalFormula = "Su"; Adamantium.mChemicalFormula="Ad"; InfusedGold.mChemicalFormula="AuMa*"; MeteoricIron.mChemicalFormula="SpFe"; - MeteoricSteel.mChemicalFormula="SpFe50C"; + MeteoricSteel.mChemicalFormula="SpFe\u2085\u2080C"; Duranium.mChemicalFormula="Du"; Tritanium.mChemicalFormula="Tt"; Ardite.mChemicalFormula="Ai"; Manyullyn.mChemicalFormula="AiCo"; - Mytryl.mChemicalFormula="SpPt2FeMa"; + Mytryl.mChemicalFormula="SpPt\u2082FeMa"; BlackPlutonium.mChemicalFormula="SpPu"; Ledox.mChemicalFormula="SpPb"; - CallistoIce.mChemicalFormula="SpH2O"; + CallistoIce.mChemicalFormula="SpH\u2082O"; Quantium.mChemicalFormula="Qt"; Desh.mChemicalFormula="De"; Draconium.mChemicalFormula="D"; DraconiumAwakened.mChemicalFormula="D*"; - BlueAlloy.mChemicalFormula="AgRp4"; - RedAlloy.mChemicalFormula="Cu("+Redstone.mChemicalFormula+")4"; + BlueAlloy.mChemicalFormula="AgRp\u2084"; + RedAlloy.mChemicalFormula="Cu("+Redstone.mChemicalFormula+")\u2084"; AnyIron.mChemicalFormula="Fe"; AnyCopper.mChemicalFormula="Cu"; ElectrumFlux.mChemicalFormula="The formula is too long..."; - DeepIron.mChemicalFormula="Sp2Fe"; + DeepIron.mChemicalFormula="Sp\u2082Fe"; Ichorium.mChemicalFormula="IcMa"; -// Duralumin.mChemicalFormula="Al6CuMnMg"; +// Duralumin.mChemicalFormula="Al\u2086CuMnMg"; } private static void initSubTags() { |