From f2376d8a5f35840f61fc6caf88f299f2aaf34565 Mon Sep 17 00:00:00 2001 From: Yannick Marcotte-Gourde Date: Fri, 3 Jan 2025 17:00:55 -0500 Subject: [PATCH 1/3] Don't ignore Tinker's Construct blocks in ore registration. (#3709) Co-authored-by: Martin Robertz --- src/main/java/gregtech/common/GTProxy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java index 065577ae31c..d95af01f794 100644 --- a/src/main/java/gregtech/common/GTProxy.java +++ b/src/main/java/gregtech/common/GTProxy.java @@ -1627,8 +1627,9 @@ public void registerOre(OreDictionary.OreRegisterEvent aEvent) { try { aEvent.Ore.stackSize = 1; - // skipping TinkerConstruct ore registration - if (this.mIgnoreTcon && aOriginalMod.equals(TinkerConstruct.ID)) { + // skipping TinkerConstruct ore registration except for blocks + if (this.mIgnoreTcon && aOriginalMod.equals(TinkerConstruct.ID) + && !(aEvent.Ore.getItem() instanceof ItemBlock)) { return; } String tModToName = aMod + " -> " + aEvent.Name; From 7745244566b1531e892a119c42b969613b139c66 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:57:59 +0100 Subject: [PATCH 2/3] fix chem formulas for a few lanth materials (#3744) Co-authored-by: Martin Robertz Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../gtnhlanth/common/register/WerkstoffMaterialPool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java index 7000bf86ec4..c4cb6f459e0 100644 --- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -225,7 +225,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff( new short[] { 250, 223, 173 }, "Nitrogenated Monazite Rare Earth Concentrate", - subscriptNumbers("??LaNd??"), + subscriptNumbers("????"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable() @@ -236,7 +236,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff( new short[] { 244, 202, 22 }, "Nitric Monazite Leached Concentrate", - subscriptNumbers("??LaNd??"), + subscriptNumbers("????"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable() @@ -416,7 +416,7 @@ public class WerkstoffMaterialPool implements Runnable { public static final Werkstoff SamaricResidue = new Werkstoff( new short[] { 248, 243, 231 }, "Samaric Residue", - subscriptNumbers("??SmGd??"), + subscriptNumbers("Sm2Gd"), new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable() From b2c7982d3260162533a7c627cf9c6d971cc1ea54 Mon Sep 17 00:00:00 2001 From: DylanTaylor1 <89085119+DylanTaylor1@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:07:56 -0500 Subject: [PATCH 3/3] No Free Computation (#3745) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java index 7893298514b..da72e374e9e 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEQuantumComputer.java @@ -263,7 +263,7 @@ protected CheckRecipeResult checkProcessing_EM() { return SimpleCheckRecipeResult.ofFailure("no_computing"); } if (overclock.getStatus(true).isOk && overvolt.getStatus(true).isOk) { - float eut = V[7] * (float) overClockRatio * (float) overVoltageRatio; + float eut = Math.max(V[6], V[7] * (float) overClockRatio * (float) overVoltageRatio); if (eut < Integer.MAX_VALUE - 7) { mEUt = -(int) eut; } else {