aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-07-16 20:59:20 +0200
committerDream-Master <dream-master@gmx.net>2017-07-16 20:59:20 +0200
commitda695524da058ca59c871881e0cc8388f3cb9129 (patch)
treec0c87d43a6c32dec0afdd3abd3878aaa5f9e36b8 /src
parent98c934adcb8f059a3f7780bb8b8c8d1befc63712 (diff)
downloadGT5-Unofficial-da695524da058ca59c871881e0cc8388f3cb9129.tar.gz
GT5-Unofficial-da695524da058ca59c871881e0cc8388f3cb9129.tar.bz2
GT5-Unofficial-da695524da058ca59c871881e0cc8388f3cb9129.zip
Fixed a bug where Brick, and Fireclay had the wrong texture sets.
The above materials originally had the ROUGH texture. I tested what they would look like with the DULL texture and I forgot to revert it afterwards. cherry pick 9db52423cc71e3f5aae263390ed923b940f25dcf
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index c2ccab7ab5..c533701093 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -537,8 +537,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Potash = new MaterialBuilder(623, TextureSet.SET_DULL, "Potash").addDustItems().setRGB(120, 66, 55).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Potassium, 2), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial();
public static Materials SodaAsh = new MaterialBuilder(624, TextureSet.SET_DULL, "Soda Ash").addDustItems().setRGB(220, 220, 255).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Sodium, 2), new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 3)).addElectrolyzerRecipe().constructMaterial();
- public static Materials Brick = new MaterialBuilder(625, TextureSet.SET_DULL , "Brick").addDustItems().setRGB(155, 86, 67).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Aluminium, 4), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)).constructMaterial();
- public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_DULL , "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, 1)).constructMaterial();
+ public static Materials Brick = new MaterialBuilder(625, TextureSet.SET_ROUGH , "Brick").addDustItems().setRGB(155, 86, 67).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Aluminium, 4), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)).constructMaterial();
+ public static Materials Fireclay = new MaterialBuilder(626, TextureSet.SET_ROUGH , "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick, 1)).constructMaterial();
public static Materials BioDiesel = new MaterialBuilder(627, TextureSet.SET_FLUID , "Bio Diesel").addCell().addFluid().setRGB(255, 128, 0).setColor(Dyes.dyeOrange).setFuelType(MaterialBuilder.DIESEL).setFuelPower(256).constructMaterial();
public static Materials NitrationMixture = new MaterialBuilder(628, TextureSet.SET_FLUID , "Nitration Mixture").addCell().setRGB(230, 226, 171).setColor(Dyes.dyeBrown).constructMaterial();