diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-10-04 06:23:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 10:23:57 +0000 |
| commit | 0634659830defc74ca5ce822e95e5c0babc54d91 (patch) | |
| tree | 81d1cf7f3a8251023a704c55a0fbb527e9252dbe /src/main/java/gtPlusPlus/xmod | |
| parent | bb2f79ff04f86568eba657726fa4dcc828130dd0 (diff) | |
| download | GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.gz GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.tar.bz2 GT5-Unofficial-0634659830defc74ca5ce822e95e5c0babc54d91.zip | |
Remove collisions (#3324)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java | 2 |
2 files changed, 1 insertions, 5 deletions
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; |