From ac06c287b586e6c2533ad9ae3760296a9399e901 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:57:08 +0200 Subject: [PATCH 1/8] bump version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 791a6a64af2..9586b4106be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ FMP_version=1.2.0.345 CCLIB_version=1.1.3.141 NEI_version=1.0.5.120 CCC_version=1.0.7.48 -mod_version=9.10.39 -alt_version=9, 10, 39 +mod_version=9.10.40 +alt_version=9, 10, 40 From ffe683bc2010cf82975c8eac6f4f570c51482d6b Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:57:17 +0200 Subject: [PATCH 2/8] Create RawOsmiumBlock.png --- .../mekanism/textures/blocks/RawOsmiumBlock.png | Bin 0 -> 202 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RawOsmiumBlock.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/RawOsmiumBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RawOsmiumBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..31f90494e005947479102bc0a29f105ed9a7f47e GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ4G7PQ$tkJsST=L<-i13( ztT?=X|J7R)rrp>FR8ZjQ;uyjq%j$4YuvtOijw<h(<*WzhvMNjxInc5{ncefhtA)gr ztw#=g{I&ehX@&V$tT?NtyRvT*y&!#Y#oDMi17rJUqc`o}qhkuEbts26pNxvjPZEs1 zsQqExqWO|<ny+$AT=e6K(}k^H<$0zH+&}e~kxiGceTmOu4WQi&p00i_>zopr0QK=u AmH+?% literal 0 HcmV?d00001 From 279a270be2a582ba243745f5be2cc0fc9b8efe65 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:57:20 +0200 Subject: [PATCH 3/8] Create RawOsmiumOre.png --- .../mekanism/textures/items/RawOsmiumOre.png | Bin 0 -> 584 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/items/RawOsmiumOre.png diff --git a/src/main/resources/assets/mekanism/textures/items/RawOsmiumOre.png b/src/main/resources/assets/mekanism/textures/items/RawOsmiumOre.png new file mode 100644 index 0000000000000000000000000000000000000000..5bbd64e8f4e77ef088043b933f1a522757a39a53 GIT binary patch literal 584 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47!?A1LR`H9Q@n#xgCcW+qjE!2 zb0abeA~Or4vWlX!i(_(1;_}Mk^ULeHSN{C@^VhFmzkmP!`}gm^fB*jf{}0sV6P)H7 zlI|at84#Wo7?BM%Bql#BwjeAm56!69+){{X2?Z62g_TJ~RmsKGX(jFHr5zb%ommy# z*_AyxRlT{@eR(zg1$7fES{GNgEvaf>THUd%rgM31*9xFBn)=r^Pgpl?!LI2Gch6qB zf6lT4b2cBIyXDCIZO0aDKfYl1_Juo6EZTW;@vc)#cAs9dfA`WoXO<q=v+UsB<@?Sp zKeTVf;r%O*99Vtq(3<0i_g=oS@5;>s*KQxWarf}edq-~FKmYj6#i#EsJ$rxW-JiSf z|33Nl|HbEja)MuH0E0}pB*+gKW*8vl<HlZ~;1N$3#}En0*aMD!hYbW+FW7&x=<Rk< z@QB@z!2N33cY8*4M#YfJR|;j0A4|UW^kPRe*M9>k&&zA=Bn5wkShGD0=(sY`!vC3c zPf^8c=Z~?g72nCL9s3-3SF+82;eTFjiJKDB)=y!c8pg<4xV7%bluM6F_ca`>nWne& zkJq1fB3tgh-JN^RemUc1?;TNYcT!@XPxf@2Yv>f+`LQmu`D1j6cWBS)$J@3%`@Pf3 zQ1sR}mdxT;F+I1hPS~chc2&ou$)}@)dv|<gk4VTDeWrBjHOP~mu6{1-oD!M<ruQB? literal 0 HcmV?d00001 From 5368fd4fb8fb029d8baf99562fae1cdf6b8d7ed4 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:57:39 +0200 Subject: [PATCH 4/8] update deepslate osmium ore texture --- .../textures/blocks/DeepslateOsmiumOre.png | Bin 802 -> 749 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/mekanism/textures/blocks/DeepslateOsmiumOre.png b/src/main/resources/assets/mekanism/textures/blocks/DeepslateOsmiumOre.png index 3f73bc01b6516eabe3efabc988e6248429a70638..c7ca2f4597946957ad707eb394c2ed8405b29969 100644 GIT binary patch delta 323 zcmV-J0lfaA2JHo~v;lu$P)t-sd3kwcWMolMQ9V6FFE2N?#Mqmpyuiub&e!9y%FDpg z-i)BTt-;K)!PS+s%8Q$`tF*|mzS6nO)3(Lg%hTVjyTiN1*RHn7d5^8R%hRK@%(cqY zr@+Lu%FK|Z!k?|myYZ9r00009a7bBm000XU000XU0RWnu7yy3&0HaAnK~yMHB~J+s z!!QT~8@6`YeY9P><Nv>$>5!s0F~-Ksp(5P{2pAYa6&%a}&D{#9C$QO)MzHI5!fs}b zut4k&M=89HBxZSP=L?)&YNq-e*W3L;3}c%@k}_jT&?eJcw$B-K5u(c7WG7RlP%18= z9Ky>QV-;woxQIJ^>8l^augdp0e-hc{m&z@VVXpSSuSBqqHl)_fieJfUjEr@;{{VE@ V1rzlt;cWl_002ovPDHLkV1fs@qfP(- delta 357 zcmV-r0h<2p1)>J9v;lvOP)t-sd3kwcWMolMQ9V6FWo2bAFE>j|Pr1y~o20zJ$=$NZ z)0MNzbaZsJ%FK?Wy}-!as>H@vSXhm(x|z4Lxy;n0waur%#DSx)K|w~j%hRK@%y4jU z&e!9%#MryV*RHn7jG()DkFB-J)UnFTz|!8e!`G^?#k9)Ijjk8Cw#(I@t;(~=&yc0U zjhL`@jHx`~ViA)a0vLa*Nkl<ZC{ry@S5`tX6r7Sg6t4x9qS(8F?0<Pq&M{xf^Z-<j z-I$9d$h~*l%6qa5HgF~d?LIn&F(^)+p8%-%(c_DYpq-d0cqFH1VmrSmEtnS0F0Zba z#nn3UMO+RFc!L^t=;n5tR^Q!+N;_N?Tn~>=&z11(Najn5wsAp)2iku~^sjG1W)5en z-akISzJH3*aknp$zlTf>H--f5E=ai!KrNqB2#Ndy=yV2aTbBdk00000NkvXXu0mjf Dq$Ic# From 6dafdec5efa7f8a21019932e1cb4c812c1600d0b Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:59:08 +0200 Subject: [PATCH 5/8] add raw osmium and efr support --- src/main/java/mekanism/common/Mekanism.java | 3 +++ src/main/java/mekanism/common/MekanismItems.java | 2 ++ src/main/java/mekanism/common/integration/MekanismHooks.java | 2 ++ src/main/resources/assets/mekanism/lang/en_US.lang | 1 + 4 files changed, 8 insertions(+) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 5974b180b1b..845cade7cdf 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -997,6 +997,7 @@ public void addRecipes() FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.RawOsmiumOre), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); @@ -1230,6 +1231,8 @@ public void registerOreDict() OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust); OreDictionary.registerOre("dustWood", MekanismItems.Sawdust); OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock); + OreDictionary.registerOre("rawOsmium", MekanismItems.RawOsmiumOre); + OreDictionary.registerOre("oreOsmium", MekanismItems.RawOsmiumOre); //Alloys! diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 96e0424a92d..c8a9bc6199f 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -63,6 +63,7 @@ public class MekanismItems public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack"); public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)new ItemFreeRunners().setUnlocalizedName("FreeRunners"); public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon"); + public static final Item RawOsmiumOre = new ItemMekanism().setUnlocalizedName("RawOsmiumOre"); //Multi-ID Items public static final Item OtherDust = new ItemOtherDust(); @@ -141,6 +142,7 @@ public static void register() GameRegistry.registerItem(GaugeDropper, "GaugeDropper"); GameRegistry.registerItem(TierInstaller, "FactoryInstaller"); GameRegistry.registerItem(OtherDust, "OtherDust"); + GameRegistry.registerItem(RawOsmiumOre, "RawOsmiumOre"); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET); FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET); diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 1b127326be2..4f135146520 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -26,6 +26,7 @@ import cpw.mods.fml.common.event.FMLInterModComms; import dan200.computercraft.api.ComputerCraftAPI; import ganymedes01.etfuturum.api.DeepslateOreRegistry; +import ganymedes01.etfuturum.api.RawOreRegistry; import mekanism.api.MekanismConfig.mekce; /** @@ -80,6 +81,7 @@ public void hook() @Method(modid = "etfuturum") public void hookEFRRecipes() { DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.DeepslateOreBlock, 0); + RawOreRegistry.addOre("oreOsmium", MekanismItems.RawOsmiumOre); } @Method(modid = "IC2") public void hookIC2Recipes() diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 7e9ae23d18c..88e053ad55e 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -51,6 +51,7 @@ item.Flamethrower.name=Flamethrower item.GaugeDropper.name=Gauge Dropper item.BioFuel.name=Biomass item.CraftingFormula.name=Crafting Formula +item.RawOsmiumOre.name=Raw Osmium //Control Circuits item.BasicControlCircuit.name=Basic Control Circuit From 7f957ea39d97a4cb59f453d2b0ccdfce810e7d96 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:59:40 +0200 Subject: [PATCH 6/8] fix recipe's not finding efr stuff for recipes --- src/main/java/mekanism/common/Mekanism.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 845cade7cdf..9e6be893a5c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -127,7 +127,7 @@ */ @Mod(modid = "Mekanism", name = "Mekanism", version = "GRADLE_MODVERSION", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + - "after:ComputerCraft;after:Galacticraft;after:MineTweaker3") + "after:ComputerCraft;after:Galacticraft;after:MineTweaker3;after:etfuturum") public class Mekanism { /** Mekanism Packet Pipeline */ From 90f5a4bcc9f0c899505744cff26dcf241e4d63bc Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:00:02 +0200 Subject: [PATCH 7/8] add raw osmium block --- src/main/java/mekanism/api/MekanismConfig.java | 1 + src/main/java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 7 +++++++ src/main/java/mekanism/common/block/BlockBasic.java | 6 +++++- .../java/mekanism/common/integration/OreDictManager.java | 5 +++++ .../java/mekanism/common/network/PacketConfigSync.java | 2 ++ src/main/resources/assets/mekanism/lang/en_US.lang | 1 + 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 6c2015936a3..69bd3debe26 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -196,6 +196,7 @@ public static class tools public static class recipes { public static boolean enableOsmiumBlock = true; + public static boolean enableRawOsmiumBlock = true; public static boolean enableBronzeBlock = true; public static boolean enableRefinedObsidianBlock = true; public static boolean enableCharcoalBlock = true; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 0aa65aa597a..7477d4bfb59 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -412,6 +412,7 @@ else if(s.trim().equalsIgnoreCase("a") || s.trim().equalsIgnoreCase("ambient") | Tier.loadConfig(); recipes.enableOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableOsmiumBlock", true).getBoolean(); + recipes.enableRawOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableRawOsmiumBlock", true).getBoolean(); recipes.enableBronzeBlock = Mekanism.configurationrecipes.get("recipes","enableBronzeBlock", true).getBoolean(); recipes.enableRefinedObsidianBlock = Mekanism.configurationrecipes.get("recipes","enableRefinedObsidianBlock", true).getBoolean(); recipes.enableCharcoalBlock = Mekanism.configurationrecipes.get("recipes","enableCharcoalBlock", true).getBoolean(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 9e6be893a5c..08a5d4ddd9b 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -249,6 +249,12 @@ public void addRecipes() })); } + if (MekanismConfig.recipes.enableRawOsmiumBlock){ + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.RawOsmiumOre, 9, 1), new Object[]{ + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 10) + })); + } + if (MekanismConfig.recipes.enableBronzeBlock) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), new Object[]{ "***", "***", "***", Character.valueOf('*'), "ingotBronze" @@ -1266,6 +1272,7 @@ public void registerOreDict() OreDictionary.registerOre("ingotRefinedLapis", new ItemStack(MekanismItems.Ingot, 1, 7)); OreDictionary.registerOre("block" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); + OreDictionary.registerOre("blockRaw" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock2, 1, 10)); OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); OreDictionary.registerOre("blockCharcoal", new ItemStack(MekanismBlocks.BasicBlock, 1, 3)); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index cea6e5be73c..3ca6dd165b0 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -100,6 +100,7 @@ * 1:7: Boiler Casing * 1:8: Boiler Valve * 1:9: Security Desk + * 1:10: Raw Osmium Block * @author AidanBrady * */ @@ -258,6 +259,8 @@ public void registerBlockIcons(IIconRegister register) icons[8][0] = ctms[8][0].mainTextureData.icon; icons[9][0] = register.registerIcon(ICON_BASE); + + icons[10][0] = register.registerIcon("mekanism:RawOsmiumBlock"); break; } @@ -1130,7 +1133,8 @@ public static enum BasicType PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true), BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true), - SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true); + SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true), + RAW_OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_2, 10, "RawOsmiumBlock", null, false); public BasicBlock typeBlock; public int meta; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 8afbdb18507..e9bf8ed99c8 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -123,6 +123,11 @@ public static void init() { "XXX", "XXX", "XXX", Character.valueOf('X'), "ingot" + mekanismMaterial })); } + if (MekanismConfig.recipes.enableRawOsmiumBlock) { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 10), new Object[]{ + "XXX", "XXX", "XXX", Character.valueOf('X'), "raw" + mekanismMaterial + })); + } if (MekanismConfig.recipes.enableMachineUpgrades) { CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[]{ " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dust" + mekanismMaterial diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index c1eb9e65a9e..a2e084ffc47 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -120,6 +120,7 @@ public void toBytes(ByteBuf dataStream) dataStream.writeDouble(usage.heavyWaterElectrolysisUsage); dataStream.writeDouble(usage.formulaicAssemblicatorUsage); dataStream.writeBoolean(recipes.enableOsmiumBlock); + dataStream.writeBoolean(recipes.enableRawOsmiumBlock); dataStream.writeBoolean(recipes.enableBronzeBlock); dataStream.writeBoolean(recipes.enableRefinedObsidianBlock); dataStream.writeBoolean(recipes.enableCharcoalBlock); @@ -319,6 +320,7 @@ public void fromBytes(ByteBuf dataStream) usage.heavyWaterElectrolysisUsage = dataStream.readDouble(); usage.formulaicAssemblicatorUsage = dataStream.readDouble(); recipes.enableOsmiumBlock = dataStream.readBoolean(); + recipes.enableRawOsmiumBlock = dataStream.readBoolean(); recipes.enableBronzeBlock = dataStream.readBoolean(); recipes.enableRefinedObsidianBlock = dataStream.readBoolean(); recipes.enableCharcoalBlock = dataStream.readBoolean(); diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 88e053ad55e..8caa4674192 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -118,6 +118,7 @@ tile.BasicBlock2.PressureDisperser.name=Pressure Disperser tile.BasicBlock2.BoilerCasing.name=Boiler Casing tile.BasicBlock2.BoilerValve.name=Boiler Valve tile.BasicBlock2.SecurityDesk.name=Security Desk +tile.BasicBlock2.RawOsmiumBlock.name=Raw Osmium Block //Machine Block tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber From 92f91bdd0c44ed3a147447a9a09debfecfd7ffd5 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:12:53 +0200 Subject: [PATCH 8/8] fix conflict with raw platinum block --- src/main/java/mekanism/common/Mekanism.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 08a5d4ddd9b..a79c591a896 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1272,7 +1272,7 @@ public void registerOreDict() OreDictionary.registerOre("ingotRefinedLapis", new ItemStack(MekanismItems.Ingot, 1, 7)); OreDictionary.registerOre("block" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); - OreDictionary.registerOre("blockRaw" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock2, 1, 10)); + OreDictionary.registerOre("blockRawOsmium", new ItemStack(MekanismBlocks.BasicBlock2, 1, 10)); OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); OreDictionary.registerOre("blockCharcoal", new ItemStack(MekanismBlocks.BasicBlock, 1, 3));