Merge branch 'OilRefining' into unstable

Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java

21 files changed, 1390 insertions, 701 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index e558ff06a5..6fd799ed77 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -268,6 +268,7 @@ public class GT_Mod implements IGT_Mod {
         GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false);

         GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO");

         gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "forceFreeFace",false);

+        gregtechproxy.mEasierEVPlusCables = tMainConfig.get("general", "EasierEVPlusCables", false).getBoolean(false);

 

         GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials);

 

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index c98515e0f4..b5aa16a276 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -320,6 +320,7 @@ public enum ItemList implements IItemContainer {
     Crop_Drop_Grapes,
     Crop_Drop_TeaLeaf,
     Crop_Drop_Cucumber,
+    Crop_Drop_Rape,
     Schematic,
     Schematic_Crafting,
     Schematic_1by1,
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java
index 0dff2f871e..1aa9a8ae58 100644
--- a/src/main/java/gregtech/api/enums/MaterialBuilder.java
+++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java
@@ -1,243 +1,256 @@
-package gregtech.api.enums;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import gregtech.api.objects.MaterialStack;

-

-public class MaterialBuilder {

-	public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5;

-	

-	private int metaItemSubID;

-	private TextureSet iconSet;

-	private float toolSpeed = 1.0f;

-	private int durability = 0;

-	private int toolQuality = 0;

-	private int types = 0;

-	private int r = 255, g = 255, b = 255, a = 0;

-	private String name;

-	private String defaultLocalName;

-	private int fuelType = 0;

-	private int fuelPower = 0;

-	private int meltingPoint = 0;

-	private int blastFurnaceTemp = 0;

-	private boolean blastFurnaceRequired = false;

-	private boolean transparent = false;

-	private int oreValue = 1;

-	private int densityMultiplier = 1;

-	private int densityDivider = 1;

-	private Dyes color = Dyes._NULL;

-	private int extraData = 0;

-	private List<MaterialStack> materialList = new ArrayList<MaterialStack>();

-	private List<TC_Aspects.TC_AspectStack> aspects = new ArrayList<TC_Aspects.TC_AspectStack>();

-	private boolean hasCorrespondingFluid = false;

-	private boolean hasCorrespondingGas = false;

-	private int liquidTemperature = 300;

-	private int gasTemperature = 300;

-

-	public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) {

-		this.metaItemSubID = metaItemSubID;

-		this.iconSet = iconSet;

-		this.name = defaultLocalName.replace(" ", "");

-		this.defaultLocalName = defaultLocalName;

-	}

-

-	public Materials constructMaterial() {

-		return new Materials(metaItemSubID, iconSet, toolSpeed, durability, toolQuality, types, r, g, b, a, name, defaultLocalName, fuelType, fuelPower, meltingPoint, blastFurnaceTemp,

-				blastFurnaceRequired, transparent, oreValue, densityMultiplier, densityDivider, color, extraData, materialList, aspects)

-				.setHasCorrespondingFluid(hasCorrespondingFluid)

-				.setHasCorrespondingGas(hasCorrespondingGas);

-	}

-	

-	public MaterialBuilder setName(String name){

-		this.name = name;

-		return this;

-	}

-	

-	public MaterialBuilder setTypes(int types){

-		this.types = types;

-		return this;

-	}

-	

-	public MaterialBuilder addDustItems(){

-		types = types | 1;

-		return this;

-	}

-	

-	public MaterialBuilder addMetalItems(){

-		types = types | 2;

-		return this;

-	}

-	

-	public MaterialBuilder addGemItems(){

-		types = types | 4;

-		return this;

-	}

-	

-	public MaterialBuilder addOreItems(){

-		types = types | 8;

-		return this;

-	}

-	

-	public MaterialBuilder addCell(){

-		types = types | 16;

-		return this;

-	}

-	

-	public MaterialBuilder addPlasma(){

-		types = types | 32;

-		return this;

-	}

-	

-	public MaterialBuilder addToolHeadItems(){

-		types = types | 64;

-		return this;

-	}

-	

-	public MaterialBuilder addGearItems(){

-		types = types | 128;

-		return this;

-	}

-	

-	public MaterialBuilder addFluid(){

-		this.hasCorrespondingFluid = true;

-		return this;

-	}

-	

-	public MaterialBuilder addGas(){

-		this.hasCorrespondingGas = true;

-		return this;

-	}

-	

-	

-	public MaterialBuilder setRGBA(int r, int g, int b, int a){

-		this.r = r;

-		this.g = g;

-		this.b = b;

-		this.a = a;

-		return this;

-	}

-	

-	public MaterialBuilder setRGB(int r, int g, int b){

-		this.r = r;

-		this.g = g;

-		this.b = b;

-		return this;

-	}

-	

-	public MaterialBuilder setTransparent(boolean transparent){

-		this.transparent = transparent;

-		return this;

-	}

-	

-	public MaterialBuilder setColor(Dyes color){

-		this.color = color;

-		return this;

-	}

-

-

-	public MaterialBuilder setToolSpeed(float toolSpeed) {

-		this.toolSpeed = toolSpeed;

-		return this;

-	}

-

-	public MaterialBuilder setDurability(int durability) {

-		this.durability = durability;

-		return this;

-	}

-

-	public MaterialBuilder setToolQuality(int toolQuality) {

-		this.toolQuality = toolQuality;

-		return this;

-	}

-

-

-	public MaterialBuilder setFuelType(int fuelType) {

-		this.fuelType = fuelType;

-		return this;

-	}

-

-	public MaterialBuilder setFuelPower(int fuelPower) {

-		this.fuelPower = fuelPower;

-		return this;

-	}

-

-	public MaterialBuilder setMeltingPoint(int meltingPoint) {

-		this.meltingPoint = meltingPoint;

-		return this;

-	}

-

-	public MaterialBuilder setBlastFurnaceTemp(int blastFurnaceTemp) {

-		this.blastFurnaceTemp = blastFurnaceTemp;

-		return this;

-	}

-

-	public MaterialBuilder setBlastFurnaceRequired(boolean blastFurnaceRequired) {

-		this.blastFurnaceRequired = blastFurnaceRequired;

-		return this;

-	}

-

-	public MaterialBuilder setOreValue(int oreValue) {

-		this.oreValue = oreValue;

-		return this;

-	}

-

-	public MaterialBuilder setDensityMultiplier(int densityMultiplier) {

-		this.densityMultiplier = densityMultiplier;

-		return this;

-	}

-

-	public MaterialBuilder setDensityDivider(int densityDivider) {

-		this.densityDivider = densityDivider;

-		return this;

-	}

-

-	public MaterialBuilder setExtraData(int extraData) {

-		this.extraData = extraData;

-		return this;

-	}

-

-	public MaterialBuilder addElectrolyzerRecipe(){

-		extraData = extraData | 1;

-		return this;

-	}

-	

-	public MaterialBuilder addCentrifugeRecipe(){

-		extraData = extraData | 2;

-		return this;

-	}

-	

-	public MaterialBuilder setMaterialList(List<MaterialStack> materialList) {

-		this.materialList = materialList;

-		return this;

-	}

-	

-	public MaterialBuilder setMaterialList(MaterialStack ... materials) {

-		this.materialList = Arrays.asList(materials);

-		return this;

-	}

-

-	public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack> aspects) {

-		this.aspects = aspects;

-		return this;

-	}

-

-	public int getLiquidTemperature() {

-		return liquidTemperature;

-	}

-

-	public MaterialBuilder setLiquidTemperature(int liquidTemperature) {

-		this.liquidTemperature = liquidTemperature;

-		return this;

-	}

-

-	public int getGasTemperature() {

-		return gasTemperature;

-	}

-

-	public MaterialBuilder setGasTemperature(int gasTemperature) {

-		this.gasTemperature = gasTemperature;

-		return this;

-	}

-}

+package gregtech.api.enums;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import gregtech.api.objects.MaterialStack;
+
+public class MaterialBuilder {
+	public static final int DIESEL = 0, GAS = 1, THERMAL = 2, SEMIFLUID = 3, PLASMA = 4, MAGIC = 5;
+	
+	private int metaItemSubID;
+	private TextureSet iconSet;
+	private float toolSpeed = 1.0f;
+	private int durability = 0;
+	private int toolQuality = 0;
+	private int types = 0;
+	private int r = 255, g = 255, b = 255, a = 0;
+	private String name;
+	private String defaultLocalName;
+	private int fuelType = 0;
+	private int fuelPower = 0;
+	private int meltingPoint = 0;
+	private int blastFurnaceTemp = 0;
+	private boolean blastFurnaceRequired = false;
+	private boolean transparent = false;
+	private int oreValue = 1;
+	private int densityMultiplier = 1;
+	private int densityDivider = 1;
+	private Dyes color = Dyes._NULL;
+	private int extraData = 0;
+	private List<MaterialStack> materialList = new ArrayList<MaterialStack>();
+	private List<TC_Aspects.TC_AspectStack> aspects = new ArrayList<TC_Aspects.TC_AspectStack>();
+	private boolean hasCorrespondingFluid = false;
+	private boolean hasCorrespondingGas = false;
+	private boolean canBeCracked = false;
+	private boolean canBeSteamCracked = false;
+	private int liquidTemperature = 300;
+	private int gasTemperature = 300;
+
+	public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) {
+		this.metaItemSubID = metaItemSubID;
+		this.iconSet = iconSet;
+		this.name = defaultLocalName.replace(" ", "").replace("-", "");
+		this.defaultLocalName = defaultLocalName;
+	}
+
+	public Materials constructMaterial() {
+		return new Materials(metaItemSubID, iconSet, toolSpeed, durability, toolQuality, types, r, g, b, a, name, defaultLocalName, fuelType, fuelPower, meltingPoint, blastFurnaceTemp,
+				blastFurnaceRequired, transparent, oreValue, densityMultiplier, densityDivider, color, extraData, materialList, aspects)
+				.setHasCorrespondingFluid(hasCorrespondingFluid)
+				.setHasCorrespondingGas(hasCorrespondingGas)
+				.setCanBeCracked(canBeCracked);
+	}
+	
+	public MaterialBuilder setName(String name){
+		this.name = name;
+		return this;
+	}
+	
+	public MaterialBuilder setTypes(int types){
+		this.types = types;
+		return this;
+	}
+	
+	public MaterialBuilder addDustItems(){
+		types = types | 1;
+		return this;
+	}
+	
+	public MaterialBuilder addMetalItems(){
+		types = types | 2;
+		return this;
+	}
+	
+	public MaterialBuilder addGemItems(){
+		types = types | 4;
+		return this;
+	}
+	
+	public MaterialBuilder addOreItems(){
+		types = types | 8;
+		return this;
+	}
+	
+	public MaterialBuilder addCell(){
+		types = types | 16;
+		return this;
+	}
+	
+	public MaterialBuilder addPlasma(){
+		types = types | 32;
+		return this;
+	}
+	
+	public MaterialBuilder addToolHeadItems(){
+		types = types | 64;
+		return this;
+	}
+	
+	public MaterialBuilder addGearItems(){
+		types = types | 128;
+		return this;
+	}
+	
+	public MaterialBuilder addFluid(){
+		this.hasCorrespondingFluid = true;
+		return this;
+	}
+	
+	public MaterialBuilder addGas(){
+		this.hasCorrespondingGas = true;
+		return this;
+	}
+	
+	
+	public MaterialBuilder setRGBA(int r, int g, int b, int a){
+		this.r = r;
+		this.g = g;
+		this.b = b;
+		this.a = a;
+		return this;
+	}
+	
+	public MaterialBuilder setRGB(int r, int g, int b){
+		this.r = r;
+		this.g = g;
+		this.b = b;
+		return this;
+	}
+	
+	public MaterialBuilder setTransparent(boolean transparent){
+		this.transparent = transparent;
+		return this;
+	}
+	
+	public MaterialBuilder setColor(Dyes color){
+		this.color = color;
+		return this;
+	}
+
+
+	public MaterialBuilder setToolSpeed(float toolSpeed) {
+		this.toolSpeed = toolSpeed;
+		return this;
+	}
+
+	public MaterialBuilder setDurability(int durability) {
+		this.durability = durability;
+		return this;
+	}
+
+	public MaterialBuilder setToolQuality(int toolQuality) {
+		this.toolQuality = toolQuality;
+		return this;
+	}
+
+
+	public MaterialBuilder setFuelType(int fuelType) {
+		this.fuelType = fuelType;
+		return this;
+	}
+
+	public MaterialBuilder setFuelPower(int fuelPower) {
+		this.fuelPower = fuelPower;
+		return this;
+	}
+
+	public MaterialBuilder setMeltingPoint(int meltingPoint) {
+		this.meltingPoint = meltingPoint;
+		return this;
+	}
+
+	public MaterialBuilder setBlastFurnaceTemp(int blastFurnaceTemp) {
+		this.blastFurnaceTemp = blastFurnaceTemp;
+		return this;
+	}
+
+	public MaterialBuilder setBlastFurnaceRequired(boolean blastFurnaceRequired) {
+		this.blastFurnaceRequired = blastFurnaceRequired;
+		return this;
+	}
+
+	public MaterialBuilder setOreValue(int oreValue) {
+		this.oreValue = oreValue;
+		return this;
+	}
+
+	public MaterialBuilder setDensityMultiplier(int densityMultiplier) {
+		this.densityMultiplier = densityMultiplier;
+		return this;
+	}
+
+	public MaterialBuilder setDensityDivider(int densityDivider) {
+		this.densityDivider = densityDivider;
+		return this;
+	}
+
+	public MaterialBuilder setExtraData(int extraData) {
+		this.extraData = extraData;
+		return this;
+	}
+
+	public MaterialBuilder addElectrolyzerRecipe(){
+		extraData = extraData | 1;
+		return this;
+	}
+	
+	public MaterialBuilder addCentrifugeRecipe(){
+		extraData = extraData | 2;
+		return this;
+	}
+	
+	public MaterialBuilder setMaterialList(List<MaterialStack> materialList) {
+		this.materialList = materialList;
+		return this;
+	}
+	
+	public MaterialBuilder setMaterialList(MaterialStack ... materials) {
+		this.materialList = Arrays.asList(materials);
+		return this;
+	}
+
+	public MaterialBuilder setAspects(List<TC_Aspects.TC_AspectStack> aspects) {
+		this.aspects = aspects;
+		return this;
+	}
+
+	public int getLiquidTemperature() {
+		return liquidTemperature;
+	}
+
+	public MaterialBuilder setLiquidTemperature(int liquidTemperature) {
+		this.liquidTemperature = liquidTemperature;
+		return this;
+	}
+
+	public int getGasTemperature() {
+		return gasTemperature;
+	}
+
+	public MaterialBuilder setGasTemperature(int gasTemperature) {
+		this.gasTemperature = gasTemperature;
+		return this;
+	}
+
+	public boolean canBeCracked() {
+		return canBeCracked;
+	}
+
+	public MaterialBuilder setCanBeCracked(boolean canBeCracked) {
+		this.canBeCracked = canBeCracked;
+		return this;
+	}
+
+}
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 18748669a1..ee0e989530 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -71,7 +71,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Gallium = new Materials(37, TextureSet.SET_SHINY, 		1.0F, 64, 2, 1|2|32, 220, 220, 255, 0, "Gallium", "Gallium", 0, 0, 302, 0, false, false, 5, 1, 1, Dyes.dyeLightGray, Element.Ga, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 1)));
     public static Materials Gold = new Materials(86, TextureSet.SET_SHINY, 		   12.0F, 64, 2, 1|2|8|32|64|128, 255, 255, 30, 0, "Gold", "Gold", 0, 0, 1337, 0, false, false, 4, 1, 1, Dyes.dyeYellow, Element.Au, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.LUCRUM, 2)));
     public static Materials Holmium = new Materials(74, TextureSet.SET_METALLIC, 	1.0F, 0, 2, 1|2|32, 255, 255, 255, 0, "Holmium", "Holmium", 0, 0, 1734, 1734, true, false, 4, 1, 1, Dyes._NULL, Element.Ho, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));
-    public static Materials Hydrogen = new Materials(1, TextureSet.SET_FLUID, 		1.0F, 0, 2, 16|32, 0, 0, 255, 240, "Hydrogen", "Hydrogen", 1, 15, 14, 0, false, true, 2, 1, 1, Dyes.dyeBlue, Element.H, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
+    public static Materials Hydrogen = new Materials(1, TextureSet.SET_FLUID, 		1.0F, 0, 2, 16|32, 0, 0, 255, 240, "Hydrogen", "Hydrogen", 1, 20, 14, 0, false, true, 2, 1, 1, Dyes.dyeBlue, Element.H, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1)));
     public static Materials Helium = new Materials(4, TextureSet.SET_FLUID, 		1.0F, 0, 2, 16|32, 255, 255, 0, 240, "Helium", "Helium", 0, 0, 1, 0, false, true, 5, 1, 1, Dyes.dyeYellow, Element.He, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 2)));
     public static Materials Helium_3 = new Materials(5, TextureSet.SET_FLUID, 		1.0F, 0, 2, 16|32, 255, 255, 0, 240, "Helium_3", "Helium-3", 0, 0, 1, 0, false, true, 10, 1, 1, Dyes.dyeYellow, Element.He_3, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 3)));
     public static Materials Indium = new Materials(56, TextureSet.SET_METALLIC, 	1.0F, 0, 2, 1|2|32, 64, 0, 128, 0, "Indium", "Indium", 0, 0, 429, 0, false, false, 4, 1, 1, Dyes.dyeGray, Element.In, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));
@@ -130,9 +130,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
      * The "Random Material" ones.
      */
     public static Materials Organic = new Materials(-1, TextureSet.SET_LEAF, 	1.0F, 0, 1, false, "Organic", "Organic");
-    public static Materials AnyCopper = new Materials(-1, TextureSet.SET_SHINY, 1.0F, 0, 3, false, "AnyCopper", "AnyCopper");
     public static Materials AnyBronze = new Materials(-1, TextureSet.SET_SHINY, 1.0F, 0, 3, false, "AnyBronze", "AnyBronze");
+    public static Materials AnyCopper = new Materials(-1, TextureSet.SET_SHINY, 1.0F, 0, 3, false, "AnyCopper", "AnyCopper");
     public static Materials AnyIron = new Materials(-1, TextureSet.SET_SHINY, 	1.0F, 0, 3, false, "AnyIron", "AnyIron");
+    public static Materials AnyRubber = new Materials(-1, TextureSet.SET_SHINY, 1.0F, 0, 3, false, "AnyRubber", "AnyRubber");
+    public static Materials AnySyntheticRubber = new Materials(-1, TextureSet.SET_SHINY, 1.0F, 0, 3, false, "AnySyntheticRubber", "AnySyntheticRubber");
     public static Materials Crystal = new Materials(-1, TextureSet.SET_SHINY, 	1.0F, 0, 3, false, "Crystal", "Crystal");
     public static Materials Quartz = new Materials(-1, TextureSet.SET_QUARTZ, 	1.0F, 0, 2, false, "Quartz", "Quartz");
     public static Materials Metal = new Materials(-1, TextureSet.SET_METALLIC, 	1.0F, 0, 2, false, "Metal", "Metal");
@@ -381,7 +383,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Cocoa = new Materials(887, TextureSet.SET_FINE, 		1.0F, 0, 0, 1, 190, 95, 0, 0, "Cocoa", "Cocoa", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown);
     public static Materials Coffee = new Materials(888, TextureSet.SET_FINE, 		1.0F, 0, 0, 1, 150, 75, 0, 0, "Coffee", "Coffee", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown);
     public static Materials Creosote = new Materials(712, TextureSet.SET_FLUID, 	1.0F, 0, 0, 16, 128, 64, 0, 0, "Creosote", "Creosote", 3, 8, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown);
-    public static Materials Ethanol = new Materials(706, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 128, 0, 0, "Ethanol", "Ethanol", 0, 128, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VENENUM, 1), new TC_AspectStack(TC_Aspects.AQUA, 1)));
+    public static Materials Ethanol = new Materials(706, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 128, 0, 0, "Ethanol", "Ethanol", 0, 148, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VENENUM, 1), new TC_AspectStack(TC_Aspects.AQUA, 1)));
     public static Materials FermentedBiomass = new MaterialBuilder(691, TextureSet.SET_FLUID, "Fermented Biomass").addCell().addFluid().setRGB(68, 85, 0).setColor(Dyes.dyeBrown).constructMaterial();
     public static Materials FishOil = new Materials(711, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 196, 0, 0, "FishOil", "Fish Oil", 3, 2, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2)));
     public static Materials Fuel = new Materials(708, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 255, 0, 0, "Fuel", "Diesel", 0, 128, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
@@ -430,7 +432,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     /**
      * First Degree Compounds
      */
-    public static Materials Methane = new Materials(715, TextureSet.SET_FLUID, 			1.0F, 0, 1, 16, 255, 255, 255, 0, "Methane", "Methane", 1, 45, -1, 0, false, false, 3, 1, 1, Dyes.dyeMagenta, 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4)));
+    public static Materials Methane = new Materials(715, TextureSet.SET_FLUID, 			1.0F, 0, 1, 16, 255, 255, 255, 0, "Methane", "Methane", 1, 104, -1, 0, false, false, 3, 1, 1, Dyes.dyeMagenta, 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4)));
     public static Materials CarbonDioxide = new Materials(497, TextureSet.SET_FLUID, 	1.0F, 0, 2, 16|32, 169, 208, 245, 240, "CarbonDioxide", "Carbon Dioxide", 0, 0, 25, 1, false, true, 1, 1, 1, Dyes.dyeLightBlue, 1, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 2))).setHasCorrespondingGas(true);
     public static Materials NobleGases = new Materials(496, TextureSet.SET_FLUID, 		1.0F, 0, 2, 16|32, 169, 208, 245, 240, "NobleGases", "Noble Gases", 0, 0, 4, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(CarbonDioxide, 21), new MaterialStack(Helium, 9), new MaterialStack(Methane, 3), new MaterialStack(Deuterium, 1))).setHasCorrespondingFluid(true).setLiquidTemperature(79);
     public static Materials Air = new Materials(-1, TextureSet.SET_FLUID, 				1.0F, 0, 2, 16|32, 169, 208, 245, 240, "Air", "Air", 0, 0, -1, 0, false, true, 1, 1, 1, Dyes.dyeLightBlue, 0, Arrays.asList(new MaterialStack(Nitrogen, 40), new MaterialStack(Oxygen, 11), new MaterialStack(Argon, 1), new MaterialStack(NobleGases, 1)));
@@ -498,7 +500,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials PigIron = new Materials(307, TextureSet.SET_METALLIC, 		6.0F, 384, 2, 1|2|64, 200, 180, 180, 0, "PigIron", "Pig Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyePink, 2, Arrays.asList(new MaterialStack(Iron, 1)));
     public static Materials Plastic = new Materials(874, TextureSet.SET_DULL, 			3.0F, 32, 1, 1|2|64|128, 200, 200, 200, 0, "Plastic", "Polyethylene", 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials Epoxid = new Materials(470, TextureSet.SET_DULL, 			3.0F, 32, 1, 1|2|64|128, 200, 140, 20, 0, "Epoxid", "Epoxy Resin", 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
-    public static Materials Silicone = new Materials(471, TextureSet.SET_DULL, 			3.0F, 128, 1, 1|2|64|128, 220, 220, 220, 0, "Silicone", "Polydimethylsiloxane", 0, 0, 900, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
+    public static Materials Polydimethylsiloxane = new MaterialBuilder(633, TextureSet.SET_FLUID, "Polydimethylsiloxane").addDustItems().setRGB(245, 245, 245).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)).addElectrolyzerRecipe().constructMaterial();
+    public static Materials Silicone = new Materials(471, TextureSet.SET_DULL, 			3.0F, 128, 1, 1|2|64|128, 220, 220, 220, 0, "Silicone", "Silicone Rubber", 0, 0, 900, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1), new MaterialStack(Silicon, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials Polycaprolactam = new Materials(472, TextureSet.SET_DULL, 	3.0F, 32, 1, 1|2|64|128, 50, 50, 50, 0, "Polycaprolactam", "Polycaprolactam", 0, 0, 500, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 11), new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials Polytetrafluoroethylene  = new Materials(473, TextureSet.SET_DULL, 3.0F, 32, 1, 1|2|64|128, 100, 100, 100, 0, "Polytetrafluoroethylene", "Polytetrafluoroethylene", 0, 0, 1400, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials Powellite = new Materials(883, TextureSet.SET_DULL, 		1.0F, 0, 2, 1 |8 , 255, 255, 0, 0, "Powellite", "Powellite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow, 2, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Molybdenum, 1), new MaterialStack(Oxygen, 4)));
@@ -507,7 +510,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Pyrolusite = new Materials(943, TextureSet.SET_DULL, 		1.0F, 0, 2, 1 |8 , 150, 150, 170, 0, "Pyrolusite", "Pyrolusite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, 1, Arrays.asList(new MaterialStack(Manganese, 1), new MaterialStack(Oxygen, 2)));
     public static Materials Pyrope = new Materials(835, TextureSet.SET_METALLIC, 		1.0F, 0, 2, 1 |8 , 120, 50, 100, 0, "Pyrope", "Pyrope", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyePurple, 1, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Magnesium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12)));
     public static Materials RockSalt = new Materials(944, TextureSet.SET_FINE, 			1.0F, 0, 1, 1 |8 , 240, 200, 200, 0, "RockSalt", "Rock Salt", 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeWhite, 1, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Chlorine, 1)));
-    public static Materials Rubber = new Materials(880, TextureSet.SET_SHINY, 			1.5F, 16, 0, 1|2|64|128, 0, 0, 0, 0, "Rubber", "Rubber", 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeBlack, 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
+    public static Materials Rubber = new Materials(880, TextureSet.SET_SHINY, 			1.5F, 32, 0, 1|2|64|128, 0, 0, 0, 0, "Rubber", "Rubber", 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeBlack, 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials RawRubber = new Materials(896, TextureSet.SET_DULL, 		1.0F, 0, 0, 1, 204, 199, 137, 0, "RawRubber", "Raw Rubber", 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Carbon, 5), new MaterialStack(Hydrogen, 8)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2)));
     public static Materials Ruby = new Materials(502, TextureSet.SET_RUBY, 				7.0F, 256, 2, 1|4|8 |64, 255, 100, 100, 127, "Ruby", "Ruby", 0, 0, -1, 0, false, true, 5, 1, 1, Dyes.dyeRed, 1, Arrays.asList(new MaterialStack(Chrome, 1), new MaterialStack(Aluminium, 2), new MaterialStack(Oxygen, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_AspectStack(TC_Aspects.VITREUS, 4)));
     public static Materials Salt = new Materials(817, TextureSet.SET_FINE, 				1.0F, 0, 1, 1 |8 , 250, 250, 250, 0, "Salt", "Salt", 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeWhite, 1, Arrays.asList(new MaterialStack(Sodium, 1), new MaterialStack(Chlorine, 1)));
@@ -518,8 +521,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials SiliconDioxide = new Materials(837, TextureSet.SET_QUARTZ, 	1.0F, 0, 1, 1 |16, 200, 200, 200, 0, "SiliconDioxide", "Silicon Dioxide", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, 1, Arrays.asList(new MaterialStack(Silicon, 1), new MaterialStack(Oxygen, 2)));
     public static Materials Snow = new Materials(728, TextureSet.SET_FINE, 				1.0F, 0, 0, 1| 16, 250, 250, 250, 0, "Snow", "Snow", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite, 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.GELUM, 1)));
     public static Materials Sodalite = new Materials(525, TextureSet.SET_LAPIS, 		1.0F, 0, 1, 1|4|8 , 20, 20, 255, 0, "Sodalite", "Sodalite", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlue, 1, Arrays.asList(new MaterialStack(Aluminium, 3), new MaterialStack(Silicon, 3), new MaterialStack(Sodium, 4), new MaterialStack(Chlorine, 1)));
-    public static Materials SodiumPersulfate = new Materials(718, TextureSet.SET_FLUID, 1.0F, 0, 2, 16, 255, 255, 255, 0, "SodiumPersulfate", "Sodium Persulfate", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Sodium, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Oxygen, 4)));
-    public static Materials SodiumSulfide = new Materials(719, TextureSet.SET_FLUID, 	1.0F, 0, 2, 16, 255, 255, 255, 0, "SodiumSulfide", "Sodium Sulfide", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1)));
+    public static Materials SodiumPersulfate = new Materials(718, TextureSet.SET_FLUID, 1.0F, 0, 2, 16, 255, 255, 255, 0, "SodiumPersulfate", "Sodium Persulfate", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 2), new MaterialStack(Oxygen, 8)));
+    public static Materials SodiumSulfide = new Materials(719, TextureSet.SET_FLUID, 	1.0F, 0, 2, 1, 255, 230, 128, 0, "SodiumSulfide", "Sodium Sulfide", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1)));
     public static Materials HydricSulfide = new Materials(460, TextureSet.SET_FLUID, 	1.0F, 0, 2, 16, 255, 255, 255, 0, "HydricSulfide", "Hydrogen Sulfide", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange, 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1)));
 
     public static Materials OilHeavy = new Materials(730, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 10, 10, 10, 0, "OilHeavy", "Heavy Oil", 3, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack);
@@ -528,18 +531,34 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 
     public static Materials NatruralGas = new Materials(733, TextureSet.SET_FLUID, 		1.0F, 0, 1, 16, 255, 255, 255, 0, "NatruralGas", "Natural Gas", 1, 15, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite);
     public static Materials SulfuricGas = new Materials(734, TextureSet.SET_FLUID, 		1.0F, 0, 1, 16, 255, 255, 255, 0, "SulfuricGas", "Sulfuric Gas", 1, 20, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite);
-    public static Materials Gas = new Materials(735, TextureSet.SET_FLUID, 				1.0F, 0, 1, 16, 255, 255, 255, 0, "Gas", "Refinery Gas", 1, 128, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite);
+    public static Materials Gas = new Materials(735, TextureSet.SET_FLUID, 				1.0F, 0, 1, 16, 255, 255, 255, 0, "Gas", "Refinery Gas", 1, 128, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite).setCanBeCracked(true);
     public static Materials SulfuricNaphtha = new Materials(736, TextureSet.SET_FLUID, 	1.0F, 0, 0, 16, 255, 255, 0, 0, "SulfuricNaphtha", "Sulfuric Naphtha", 1, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
     public static Materials SulfuricLightFuel = new Materials(737, TextureSet.SET_FLUID,1.0F, 0, 0, 16, 255, 255, 0, 0, "SulfuricLightFuel", "Sulfuric Light Fuel", 0, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
     public static Materials SulfuricHeavyFuel = new Materials(738, TextureSet.SET_FLUID,1.0F, 0, 0, 16, 255, 255, 0, 0, "SulfuricHeavyFuel", "Sulfuric Heavy Fuel", 3, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack);
-    public static Materials Naphtha = new Materials(739, TextureSet.SET_FLUID, 			1.0F, 0, 0, 16, 255, 255, 0, 0, "Naphtha", "Naphtha", 1, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
-    public static Materials LightFuel = new Materials(740, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 255, 0, 0, "LightFuel", "Light Fuel", 0, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow);
-    public static Materials HeavyFuel = new Materials(741, TextureSet.SET_FLUID, 		1.0F, 0, 0, 16, 255, 255, 0, 0,