diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-25 06:48:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 12:48:46 +0200 |
| commit | 683e0970aea98b5d59fb0de928d130cd8e44360e (patch) | |
| tree | 40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java/gregtech/loaders/preload | |
| parent | 00b6c43af283b0a7a33e039718a63826d635576e (diff) | |
| download | GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2 GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip | |
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java | 37 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index ee207bbaeb..051eee691a 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -2036,20 +2036,6 @@ public class LoaderGTBlockFluid implements Runnable { .eut(2) .addTo(maceratorRecipes); - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GTValues.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - GTOreDictUnificator.set( OrePrefixes.ingot, Materials.FierySteel, diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java index 0d2bd3ad55..05a3712979 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -301,43 +301,6 @@ public class LoaderGTOreDictionary implements Runnable { Materials.Lead, GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Osmium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Aluminium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.StainlessSteel, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Tungsten, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Neutronium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.TungstenSteel, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Iridium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Titanium, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); - GTOreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Chrome, - GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); - // Fake Circuits GTOreDictUnificator.registerOre( OrePrefixes.circuit, |