Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc fixes

Browse source
This commit is contained in:
TheDarkDnKTv 2020-08-19 16:21:59 +03:00
parent 55c10123d7
commit e7880f9987
4 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtechmod/api/enums/Materials.java
View file

@ -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 ), 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 ), 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 ), 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 ), 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 ), 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 ), 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 ),

2
src/main/resources/assets/gregtech_addon/lang/en_US.lang
View file

@ -1148,7 +1148,7 @@ fluid.hydrogen=Hydrogen
fluid.deuterium=Deuterium fluid.deuterium=Deuterium
fluid.tritium=Tritium fluid.tritium=Tritium
fluid.helium=Helium fluid.helium=Helium
fluid.helium_3=Helium 3 fluid.helium-3=Helium 3
fluid.methane=Methane fluid.methane=Methane
fluid.nitrogen=Nitrogen fluid.nitrogen=Nitrogen
fluid.nitrogendioxide=Nitrogen Dioxide fluid.nitrogendioxide=Nitrogen Dioxide

0
src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png → src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorite.png.mcmeta → src/main/resources/assets/gregtech_addon/textures/blocks/fluids/fluid.chlorine.png.mcmeta
View file