From b97989d05dac14dc6b6c3071eb3c1d173b0e3d7e Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 28 Jul 2017 22:42:17 +0200 Subject: [PATCH] Revert fix for CraftTweaker since its fixed on their end already, #1383 --- CHANGELOG.md | 1 - .../com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ac05569..3c712b5d1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ - Fixed bug where pattern create button wasn't visible when grid tabs were selected (raoulvdberge) - Fixed performance issue with Controllers turning off and on and Interfaces (raoulvdberge) - Fixed Interfaces exposing network inventory don't hide storages that are disconnected (raoulvdberge) -- Fixed Quartz to Silicon smelting recipe not being removable with CraftTweaker due to being registered in the wrong phase (raoulvdberge) - A Solderer with Speed Upgrades is now 2 times faster (raoulvdberge) ### 1.5.13 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 8a661c31b..fa1e9a1d4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -213,13 +213,13 @@ public class ProxyCommon { registerItem(RSItems.NETWORK_CARD); registerItem(RSItems.WRENCH); registerItem(RSItems.SECURITY_CARD); - - GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5f); } public void init(FMLInitializationEvent e) { OreDictionary.registerOre("itemSilicon", RSItems.SILICON); + GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5f); + WirelessGrid.ID = API.instance().getWirelessGridRegistry().add(new WirelessGridFactoryWirelessGrid()); WirelessFluidGrid.ID = API.instance().getWirelessGridRegistry().add(new WirelessGridFactoryWirelessFluidGrid()); PortableGrid.ID = API.instance().getWirelessGridRegistry().add(new WirelessGridFactoryPortableGrid());