From 0634659830defc74ca5ce822e95e5c0babc54d91 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Fri, 4 Oct 2024 06:23:57 -0400 Subject: Remove collisions (#3324) Co-authored-by: Martin Robertz --- src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 4 ---- .../java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 317c61ee63..d95f27f479 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -31,10 +31,6 @@ public abstract class LogBase extends BlockLog { String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Log"; GameRegistry.registerBlock(this, ItemBlock.class, blockName); this.setBlockName(blockName); - ItemUtils.addItemToOreDictionary( - ItemUtils.getSimpleStack(this), - "log" + Utils.sanitizeString(blockNameLocalized), - true); ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true); this.setCreativeTab(AddToCreativeTab.tabBOP); Blocks.fire.setFireInfo(this, 20, 100); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java index 37ef0edc66..5218d0e451 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java @@ -59,7 +59,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase { final Material[] badMaterials = { MaterialsFluorides.THORIUM_HEXAFLUORIDE, MaterialsFluorides.THORIUM_TETRAFLUORIDE, MaterialsAlloy.BLOODSTEEL, MaterialsNuclides.LiFBeF2ThF4UF4, - MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235 }; + MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235, MaterialsAlloy.NITINOL_60 }; for (final Material R : badMaterials) { if (M == R) { return; -- cgit