diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index aea5f50c5..e392b1ae0 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -87,6 +87,8 @@ public class MekanismConfig
 		public static boolean enableAmbientLighting;
 		public static int ambientLightingLevel;
 		public static boolean opaqueTransmitters = false;
+		public static boolean doMultiblockSparkle = true;
+		public static int multiblockSparkleIntensity = 6;
 	}
 	
 	public static class machines
@@ -140,6 +142,8 @@ public class MekanismConfig
 		public static double heatGeneration;
 		public static double heatGenerationLava;
 		public static double heatGenerationNether;
+		public static int heatGenerationFluidRate;
+		public static boolean heatGenEnable;
 		public static double solarGeneration;
 
 		public static double windGenerationMin;
diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java
index 8583c89e8..4ca8ba5ea 100644
--- a/src/main/java/mekanism/common/integration/OreDictManager.java
+++ b/src/main/java/mekanism/common/integration/OreDictManager.java
@@ -66,8 +66,7 @@ public final class OreDictManager
 
 		if (OreDictionary.getOres("itemRubber").size() > 0) {
 			for (ItemStack ore : OreDictionary.getOres("woodRubber")) {
-				RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRubber").get(0), 1), 1F);
-			}
+			RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRawRubber").get(0), 2), 1F);			}
 		}
 
 		for (ItemStack ore : OreDictionary.getOres("dustSulfur")) {
@@ -345,6 +344,12 @@ public final class OreDictManager
 			InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("DIAMOND"), 10));
 			RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.diamond));
 		}
+		
+		for(ItemStack ore : OreDictionary.getOres("gemDiamond"))
+		{
+			InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("DIAMOND"), 10));
+			RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.CompressedDiamond));		
+		}
 			
 		for(ItemStack ore : OreDictionary.getOres("dustTin"))
 		{