aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-09-22 20:11:11 +0200
committerDream-Master <dream-master@gmx.net>2017-09-27 22:19:07 +0200
commit9067cd1282d81142c35a28d5c924dfdb0e77ebde (patch)
tree6be4e3738a05158f8da644aec1c27e4a1a82fb70 /src/main/java/gregtech/api/enums
parentc02d98c1e8877d601c14fff1d8c94d3cd99f2a8d (diff)
downloadGT5-Unofficial-9067cd1282d81142c35a28d5c924dfdb0e77ebde.tar.gz
GT5-Unofficial-9067cd1282d81142c35a28d5c924dfdb0e77ebde.tar.bz2
GT5-Unofficial-9067cd1282d81142c35a28d5c924dfdb0e77ebde.zip
cherry pick
Commit: 00831784660573b54248a8213cae1d64619a2b98 [0083178] rename Biomass again to Forestry Biomass. Change a brewing recipe a bit to can using Fluids that not registered at GT (FluidStack) Add new recipes for Forestry Biomass and remove old ones.
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 005a703b6c..c0e8f989a9 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -370,7 +370,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
*/
public static Materials Antimatter = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Antimatter" , "Antimatter" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePink , Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 9), new TC_AspectStack(TC_Aspects.PERFODIO, 8)));
public static Materials BioFuel = new Materials( 705, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 128, 0, 0, "BioFuel" , "Biofuel" , 0, 6, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange );
- public static Materials Biomass = new Materials( 704, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 0, 255, 0, 0, "Biomass" , "Biomass" , 3, 8, -1, 0, false, false, 1, 1, 1, Dyes.dyeGreen );
+ public static Materials Biomass = new Materials( 704, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 0, 255, 0, 0, "Biomass" , "Forestry Biomass" , 3, 8, -1, 0, false, false, 1, 1, 1, Dyes.dyeGreen );
public static Materials CharcoalByproducts = new MaterialBuilder(675, TextureSet.SET_FLUID , "Charcoal Byproducts").addCell().setRGB(120, 68, 33).setColor(Dyes.dyeBrown).constructMaterial();
public static Materials Cheese = new Materials( 894, TextureSet.SET_FINE , 1.0F, 0, 0, 1 |8 , 255, 255, 0, 0, "Cheese" , "Cheese" , 0, 0, 320, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
public static Materials Chili = new Materials( 895, TextureSet.SET_FINE , 1.0F, 0, 0, 1 , 200, 0, 0, 0, "Chili" , "Chili" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed );