From e7880f9987dd626c1133cba25e8a0d1713a12212 Mon Sep 17 00:00:00 2001 From: TheDarkDnKTv Date: Wed, 19 Aug 2020 16:21:59 +0300 Subject: [PATCH] Misc fixes --- src/main/java/gregtechmod/api/enums/Materials.java | 2 +- .../resources/assets/gregtech_addon/lang/en_US.lang | 2 +- .../{fluid.chlorite.png => fluid.chlorine.png} | Bin ...hlorite.png.mcmeta => fluid.chlorine.png.mcmeta} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/main/resources/assets/gregtech_addon/textures/blocks/fluids/{fluid.chlorite.png => fluid.chlorine.png} (100%) rename src/main/resources/assets/gregtech_addon/textures/blocks/fluids/{fluid.chlorite.png.mcmeta => fluid.chlorine.png.mcmeta} (100%) diff --git a/src/main/java/gregtechmod/api/enums/Materials.java b/src/main/java/gregtechmod/api/enums/Materials.java index 384d7c7..3e50669 100644 --- a/src/main/java/gregtechmod/api/enums/Materials.java +++ b/src/main/java/gregtechmod/api/enums/Materials.java @@ -66,7 +66,7 @@ public enum Materials { Magic (-128, GT_ItemTextures.SET_SHINY , 1|2|4|8|16|32|64|128 , 100, 0, 200, 0, 5, 32, 0, 0, 0, 0, false, false, 7, 1, 1, Dyes.dyePurple, Element.Ma ), Magnesium ( 18, GT_ItemTextures.SET_METALLIC , 1|2 |8|16|32 , 255, 200, 200, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyePink, Element.Mg ), Manganese ( 31, GT_ItemTextures.SET_DULL , 1|2 |8 |64 , 250, 250, 250, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeWhite, Element.Mn ), - Mercury ( 87, GT_ItemTextures.SET_SHINY , 16|32 , 255, 220, 220, 0, 5, 32, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Hg ), + Mercury ( 87, GT_ItemTextures.SET_SHINY , 16|32 , 255, 212, 212, 0, 5, 32, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeWhite, Element.Hg ), Niobium ( 47, GT_ItemTextures.SET_METALLIC , 1|2 |8 , 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, false, false, 4, 1, 1, Dyes._NULL, Element.Nb ), Molybdenum ( 48, GT_ItemTextures.SET_SHINY , 1|2 |8 |64 , 180, 180, 220, 0, 0, 0, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes.dyeBlue, Element.Mo ), Neodymium ( 67, GT_ItemTextures.SET_METALLIC , 1|2 |8|16|32 , 255, 255, 255, 0, 0, 0, 0, 0, 1297, 1297, true, false , 4, 1, 1, Dyes._NULL, Element.Nd ), diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index 091f3a2..c2be93a 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -1148,7 +1148,7 @@ fluid.hydrogen=Hydrogen fluid.deuterium=Deuterium fluid.tritium=Tritium fluid.helium=Helium -fluid.helium_3=Helium 3 +fluid.helium-3=Helium 3 fluid.methane=Methane fluid.nitrogen=Nitrogen fluid.nitrogendioxide=Nitrogen Dioxide diff --git a/src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png b/src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png similarity index 100% rename from src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png rename to src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png diff --git a/src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png.mcmeta b/src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png.mcmeta similarity index 100% rename from src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png.mcmeta rename to src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png.mcmeta