From 04049196010534fdb420971ad4f726a7c4c6ae5b Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 18:48:23 +0200
Subject: [PATCH 1/9] Nerf Fusion Reactor

From 200k+ RF/t to around 1.5k RF/t on lower injection rates.
---
 src/main/java/mekanism/generators/common/FusionReactor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java
index c6b39fd32..9ac0ce704 100644
--- a/src/main/java/mekanism/generators/common/FusionReactor.java
+++ b/src/main/java/mekanism/generators/common/FusionReactor.java
@@ -60,8 +60,8 @@ public class FusionReactor implements IFusionReactor
 	public static double plasmaHeatCapacity = 100;
 	public static double caseHeatCapacity = 1;
 	public static double enthalpyOfVaporization = 10;
-	public static double thermocoupleEfficiency = 0.05;
-	public static double steamTransferEfficiency = 0.1;
+	public static double thermocoupleEfficiency = 0.00125;
+	public static double steamTransferEfficiency = 0.0025;
 
 	//Heat transfer metrics
 	public static double plasmaCaseConductivity = 0.2;

From a6cb74522cbde08488efa49f0611d8261caef812 Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 18:54:35 +0200
Subject: [PATCH 2/9] Added Methane Gas

---
 .../client/render/MekanismRenderer.java         |   1 +
 src/main/java/mekanism/common/Mekanism.java     |   1 +
 .../resources/assets/mekanism/lang/en_US.lang   |   1 +
 .../textures/blocks/liquid/LiquidMethane.png    | Bin 0 -> 12145 bytes
 .../blocks/liquid/LiquidMethane.png.mcmeta      |   5 +++++
 5 files changed, 8 insertions(+)
 create mode 100644 src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png
 create mode 100644 src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png.mcmeta

diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java
index d6a75452b..f6a572ecd 100644
--- a/src/main/java/mekanism/client/render/MekanismRenderer.java
+++ b/src/main/java/mekanism/client/render/MekanismRenderer.java
@@ -114,6 +114,7 @@ public class MekanismRenderer
 			GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidTritium"));
 			GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDT"));
 			GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidLithium"));
+			GasRegistry.getGas("methane").setIcon(event.map.registerIcon("mekanism:liquid/LiquidMethane"));
 
 			for(Gas gas : GasRegistry.getRegisteredGasses())
 			{
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index ad1ee6786..142cad69e 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -1168,6 +1168,7 @@ public class Mekanism
 		GasRegistry.register(new Gas("tritium")).registerFluid();
 		GasRegistry.register(new Gas("fusionFuelDT")).registerFluid();
 		GasRegistry.register(new Gas("lithium")).registerFluid();
+		GasRegistry.register(new Gas("methane")).registerFluid();
 
 		FluidRegistry.registerFluid(new Fluid("heavyWater"));
 		FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true));
diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index eeb8050fc..6032adfb6 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -300,6 +300,7 @@ gas.deuterium=Deuterium
 gas.tritium=Tritium
 gas.lithium=Lithium
 gas.fusionFuelDT=D-T Fuel
+gas.methane=Methane
 
 gas.iron=Iron Slurry
 gas.gold=Gold Slurry
diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png
new file mode 100644
index 0000000000000000000000000000000000000000..755fe8dc21d8b1e5ff7545e91b24a7a5f90e6ecb
GIT binary patch
literal 12145
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
Y(9d+Y5c^dPy&)A)eW9gTCvO??f3sf!OaK4?

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png.mcmeta
new file mode 100644
index 000000000..0645f48c6
--- /dev/null
+++ b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidMethane.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}

From f922b8c8b167053bdb91e2995131cf82e8a46965 Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 18:58:58 +0200
Subject: [PATCH 3/9] Oredictionary for Metallurgic infuser + Sawmill balance

Metallurgic Infuser now accepts any diamond oredictionary.
Fix Sawmill outputting ready-made rubber from logs instead of resin.
---
 src/main/java/mekanism/api/MekanismConfig.java           | 4 ++++
 .../java/mekanism/common/integration/OreDictManager.java | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

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"))
 		{

From de284aa1c4afdddae0a5fd1549276d5a20885729 Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 19:30:00 +0200
Subject: [PATCH 4/9] Allow reduce particle from completed multiblocks

Users can now reduce particle effects emitted from completed multiblocks.
May enhance performance.
---
 src/main/java/mekanism/client/ClientProxy.java   | 16 ++++++++++------
 .../java/mekanism/client/SparkleAnimation.java   |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
index f5755bbc1..691785a7e 100644
--- a/src/main/java/mekanism/client/ClientProxy.java
+++ b/src/main/java/mekanism/client/ClientProxy.java
@@ -231,6 +231,8 @@ public class ClientProxy extends CommonProxy
 		client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean();
 		client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt();
 		client.opaqueTransmitters = Mekanism.configuration.get("client", "OpaqueTransmitterRender", false).getBoolean();
+		client.doMultiblockSparkle = Mekanism.configuration.get("client", "DoMultiblockSparkle", true).getBoolean();
+		client.multiblockSparkleIntensity = Mekanism.configuration.get("client", "MultiblockSparkleIntesity", 6).getInt();
 
 		if(Mekanism.configuration.hasChanged())
 		{
@@ -567,13 +569,15 @@ public class ClientProxy extends CommonProxy
 	@Override
 	public void doMultiblockSparkle(final TileEntityMultiblock<?> tileEntity)
 	{
-		new SparkleAnimation(tileEntity, new INodeChecker() {
-			@Override
-			public boolean isNode(TileEntity tile)
-			{
+		if(client.doMultiblockSparkle == true){
+			new SparkleAnimation(tileEntity, new INodeChecker() {
+				@Override
+				public boolean isNode(TileEntity tile)
+				{
 				return MultiblockManager.areEqual(tile, tileEntity);
-			}
-		}).run();
+				}
+			}).run();
+		}
 	}
 
 	@Override
diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java
index b759b4dcc..1222bebc5 100644
--- a/src/main/java/mekanism/client/SparkleAnimation.java
+++ b/src/main/java/mekanism/client/SparkleAnimation.java
@@ -6,6 +6,7 @@ import java.util.Set;
 
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.general;
+import mekanism.api.MekanismConfig.client;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -46,10 +47,11 @@ public class SparkleAnimation
 				public void run()
 				{
 					World world = pointer.getWorldObj();
+					int count = client.multiblockSparkleIntensity;
 					
 					for(Coord4D coord : iteratedNodes)
 					{
-						for(int i = 0; i < 6; i++)
+						for(int i = 0; i < count; i++)
 						{
 							world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + -.01, coord.zCoord + random.nextDouble(), 0, 0, 0);
 							world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + 1.01, coord.zCoord + random.nextDouble(), 0, 0, 0);

From 9bca7c648193d91911b818bc8e153daf52999f35 Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 19:30:43 +0200
Subject: [PATCH 5/9] More configs for Heat Generator

Regulate Heat Generator efficiency
Enable/Disable Heat Generator ability to output heat
---
 .../java/mekanism/generators/common/MekanismGenerators.java | 6 +++++-
 .../generators/common/tile/TileEntityHeatGenerator.java     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java
index dc43aff06..c9e72ccc5 100644
--- a/src/main/java/mekanism/generators/common/MekanismGenerators.java
+++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java
@@ -203,6 +203,8 @@ public class MekanismGenerators implements IModule
 		dataStream.writeDouble(generators.heatGeneration);
 		dataStream.writeDouble(generators.heatGenerationLava);
 		dataStream.writeDouble(generators.heatGenerationNether);
+		dataStream.writeInt(generators.heatGenerationFluidRate);
+		dataStream.writeBoolean(generators.heatGenEnable)
 		dataStream.writeDouble(generators.solarGeneration);
 		
 		dataStream.writeDouble(generators.windGenerationMin);
@@ -224,7 +226,9 @@ public class MekanismGenerators implements IModule
 		generators.bioGeneration = dataStream.readDouble();
 		generators.heatGeneration = dataStream.readDouble();
 		generators.heatGenerationLava = dataStream.readDouble();
-		generators.heatGenerationNether = dataStream.readDouble();
+		generators.heatGenerationNether = dataStream.readDouble();;
+		generators.heatGenerationFluidRate = dataStream.readInt();
+		generators.heatGenEnable = dataStream.readBoolean();
 		generators.solarGeneration = dataStream.readDouble();
 		
 		generators.windGenerationMin = dataStream.readDouble();
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
index 968fd1b15..c9f580b11 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
@@ -130,7 +130,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
 			{
 				setActive(true);
 
-				lavaTank.drain(10, true);
+				lavaTank.drain(generators.heatGenerationFluidRate, true);
 				transferHeatTo(generators.heatGeneration);
 			}
 			else {
@@ -445,7 +445,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
 	@Override
 	public boolean canConnectHeat(ForgeDirection side)
 	{
+		if(generators.heatGenEnable == true){
 		return side == ForgeDirection.DOWN;
+		}else {
+		return side == ForgeDirection.UNKNOWN;
+		}
 	}
 
 	@Override

From 524fa01b1123e1528bbb091a9ce5d52511aaacb7 Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 19:32:47 +0200
Subject: [PATCH 6/9] Missing Lang for Teleporter

---
 src/main/resources/assets/mekanism/lang/en_US.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index 6032adfb6..7caabcb47 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -487,6 +487,7 @@ gui.undefined=Undefined
 gui.owner=Owner
 gui.public=Public
 gui.private=Private
+gui.trusted=Trusted
 gui.add=Add
 gui.set=Set
 gui.freq=Freq

From d32bb14c2834b4ee9e599687a10e38a43c430f4a Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 19:35:08 +0200
Subject: [PATCH 7/9] Cardboard Boxes are now single use

---
 .../mekanism/common/block/BlockCardboardBox.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java
index 9f4fca734..0509b0ab3 100644
--- a/src/main/java/mekanism/common/block/BlockCardboardBox.java
+++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java
@@ -105,15 +105,15 @@ public class BlockCardboardBox extends BlockContainer
 					data.block.onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.block, 1, data.meta));
 					data.block.onPostBlockPlaced(world, x, y, z, data.meta);
 				}
+				
+				// float motion = 0.7F;
+				// double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
+				// double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
+				// double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
 
-				float motion = 0.7F;
-				double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
-				double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
-				double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
+				// EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack);
 
-				EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack);
-
-				world.spawnEntityInWorld(entityItem);
+				// world.spawnEntityInWorld(entityItem);
 			}
 		}
 

From 282c21d3cbf0f673d6b92c911f5b3615984ed3dd Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Sun, 11 Sep 2022 19:40:42 +0200
Subject: [PATCH 8/9] Add Methane to gas burner fuel list

---
 src/main/java/mekanism/api/MekanismConfig.java                 | 1 +
 src/main/java/mekanism/common/CommonProxy.java                 | 1 +
 src/main/java/mekanism/common/network/PacketConfigSync.java    | 2 ++
 .../java/mekanism/generators/common/MekanismGenerators.java    | 3 ++-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index e392b1ae0..2efa02907 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -30,6 +30,7 @@ public class MekanismConfig
 		public static int userWorldGenVersion = 0;
 		public static double ENERGY_PER_REDSTONE = 10000;
 		public static int ETHENE_BURN_TIME = 40;
+		public static int METHANE_BURN_TIME = 10;
 		public static double DISASSEMBLER_USAGE = 10;
 		public static EnergyType energyUnit = EnergyType.J;
 		public static TempType tempUnit =	TempType.K;
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index 293508a9b..b8eca12e7 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -270,6 +270,7 @@ public class CommonProxy implements IGuiProvider
 		general.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble();
 		general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "Determines Electrolytic Separator usage").getDouble();
 		general.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt();
+		general.METHANE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MethaneBurnTime", 10).getInt();
 		general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble();
 		general.DISASSEMBLER_USAGE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisassemblerEnergyUsage", 10).getInt();
 		general.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt();
diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java
index 41274908e..ae4fd038b 100644
--- a/src/main/java/mekanism/common/network/PacketConfigSync.java
+++ b/src/main/java/mekanism/common/network/PacketConfigSync.java
@@ -44,6 +44,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			dataStream.writeDouble(general.TO_TE);
 			dataStream.writeDouble(general.FROM_H2);
 			dataStream.writeInt(general.ETHENE_BURN_TIME);
+			dataStream.writeInt(general.METHANE_BURN_TIME);
 			dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
 			dataStream.writeDouble(general.DISASSEMBLER_USAGE);
 			dataStream.writeInt(general.VOICE_PORT);
@@ -138,6 +139,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			general.TO_TE = dataStream.readDouble();
 			general.FROM_H2 = dataStream.readDouble();
 			general.ETHENE_BURN_TIME = dataStream.readInt();
+			general.METHANE_BURN_TIME = dataStream.readInt();
 			general.ENERGY_PER_REDSTONE = dataStream.readDouble();
 			general.DISASSEMBLER_USAGE = dataStream.readDouble();
 			general.VOICE_PORT = dataStream.readInt();
diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java
index c9e72ccc5..24fb4876b 100644
--- a/src/main/java/mekanism/generators/common/MekanismGenerators.java
+++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java
@@ -181,6 +181,7 @@ public class MekanismGenerators implements IModule
 		}));
 
 		FuelHandler.addGas(GasRegistry.getGas("ethene"), general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
+		FuelHandler.addGas(GasRegistry.getGas("methane"), general.METHANE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * general.METHANE_BURN_TIME);
 	}
 
 	@Override
@@ -204,7 +205,7 @@ public class MekanismGenerators implements IModule
 		dataStream.writeDouble(generators.heatGenerationLava);
 		dataStream.writeDouble(generators.heatGenerationNether);
 		dataStream.writeInt(generators.heatGenerationFluidRate);
-		dataStream.writeBoolean(generators.heatGenEnable)
+		dataStream.writeBoolean(generators.heatGenEnable);
 		dataStream.writeDouble(generators.solarGeneration);
 		
 		dataStream.writeDouble(generators.windGenerationMin);

From a8944e0b908f99188dac48a6d1d0f7574a387a0d Mon Sep 17 00:00:00 2001
From: TechnoParadox <gustavo.caliari@live.com>
Date: Tue, 13 Sep 2022 16:35:58 +0200
Subject: [PATCH 9/9] Remove redundant oredict fix

---
 .../java/mekanism/common/integration/OreDictManager.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java
index 4ca8ba5ea..323c9143a 100644
--- a/src/main/java/mekanism/common/integration/OreDictManager.java
+++ b/src/main/java/mekanism/common/integration/OreDictManager.java
@@ -344,12 +344,6 @@ 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"))
 		{