diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 90d0abbb..0fe1bf2b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,29 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2374d888-04b5-4300-967c-f257dee6cdd6" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/compat/FuelHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModRegistries.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/init/ModTiles.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/items/BaseItem.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/items/ItemTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/proxy/ClientProxy.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/renders/TileFireboxRender.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/BaseTile.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBaseSlot.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java" afterPath="$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/tiles/TilePistonBellows.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -33,33 +13,23 @@
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FUSProjectUsageTrigger">
+    <session id="1807367187">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="2" />
+          <entry key="project.open.time.0" value="1" />
+          <entry key="project.open.time.4" value="1" />
+          <entry key="project.opened" value="2" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
   <component name="FavoritesManager">
     <favorites_list name="ForgeCraft" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PistonBellows.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Firebox.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-510">
-              <caret line="42" column="77" lean-forward="true" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="77" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -72,279 +42,110 @@
         <entry key="$PROJECT_DIR$/../PrimalCore" value="2962994312000" />
       </map>
     </option>
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
+    <option name="y" value="22" />
     <option name="width" value="1680" />
     <option name="height" value="1050" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
       <pane id="ProjectPane">
         <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="1.11" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="1.11" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="1.11" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="nmd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="primal" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="forgecraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="1.11" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="nmd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="primal" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="forgecraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="blocks" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ForgeCraft" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="1.11" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+          <expand>
+            <path>
+              <item name="ForgeCraft" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ForgeCraft" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ForgeCraft" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ForgeCraft" type="462c0819:PsiDirectoryNode" />
+              <item name="kfc" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ForgeCraft" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
+            <path>
+              <item name="ForgeCraft" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; 1.8 &gt;" type="70bed36:NamedLibraryElementNode" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="FullScreen" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
   </component>
   <component name="RunManager">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
       <option name="PROGRAM_PARAMETERS" />
       <predefined_log_file id="idea.log" enabled="true" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -353,72 +154,57 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1482033001334</updated>
+      <workItem from="1538459982472" duration="37000" />
+      <workItem from="1538460037447" duration="7000" />
     </task>
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="44000" />
+  </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1680" height="1050" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="22" width="1680" height="1050" extended-state="0" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32958034" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" order="0" weight="0.25" />
+      <window_info id="Nl-Palette" order="1" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Designer" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.47181627" />
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.32958034" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
+      <window_info anchor="right" id="Database" order="0" />
+      <window_info anchor="right" id="Commander" order="1" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="right" id="Theme Preview" order="6" />
+      <window_info anchor="right" id="Properties" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info anchor="right" id="Maven Projects" order="9" />
+      <window_info anchor="right" content_ui="combo" id="Project" order="10" visible="true" weight="0.25457877" />
     </layout>
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-510">
-          <caret line="42" column="77" lean-forward="true" selection-start-line="42" selection-start-column="4" selection-end-line="42" selection-end-column="77" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/CommonUtils.java" />
+    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java" />
+    <entry file="file://$PROJECT_DIR$/1.11/src/main/java/nmd/primal/forgecraft/blocks/PistonBellows.java" />
   </component>
 </project>
\ No newline at end of file
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
index de30270e..01d3ba26 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/BloomeryBase.java
@@ -121,23 +121,26 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr
                             ItemStackHelper.loadAllItems(tag, dropList);
                             CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4));
                             if (recipe != null) {
-                                Integer minTemp = recipe.getCookTemp();
-                                Integer cookCounter = tile.getCookCounter();
-                                Integer idealTime = recipe.getCookTime();
-                                Integer remainingTime = idealTime - cookCounter;
+                                if(!recipe.isHidden()) {
+                                    if (!recipe.isDisabled()) {
+                                        Integer minTemp = recipe.getCookTemp();
+                                        Integer cookCounter = tile.getCookCounter();
+                                        Integer idealTime = recipe.getCookTime();
+                                        Integer remainingTime = idealTime - cookCounter;
 
-                                String display1 =
-                                        "Cooking: " + tileItem1.getDisplayName() +
-                                                " Target Temp: " + minTemp.toString() +
-                                                " Time Left: " + remainingTime.toString();
-                                String display2 = tileItem1.getDisplayName() + "finished.";
-                                ITextComponent itextcomponent1 = null;
-                                if (tileItem1.getSubCompound("BlockEntityTag").getBoolean("status")) {
-                                    itextcomponent1 = new TextComponentString(display2);
-                                } else itextcomponent1 = new TextComponentString(display1);
-
-                                player.sendStatusMessage(itextcomponent1, false);
+                                        String display1 =
+                                                "Cooking: " + tileItem1.getDisplayName() +
+                                                        " Target Temp: " + minTemp.toString() +
+                                                        " Time Left: " + remainingTime.toString();
+                                        String display2 = tileItem1.getDisplayName() + "finished.";
+                                        ITextComponent itextcomponent1 = null;
+                                        if (tileItem1.getSubCompound("BlockEntityTag").getBoolean("status")) {
+                                            itextcomponent1 = new TextComponentString(display2);
+                                        } else itextcomponent1 = new TextComponentString(display1);
 
+                                        player.sendStatusMessage(itextcomponent1, false);
+                                    }
+                                }
                             }
                             return true;
                         }
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTCrucible.java
similarity index 96%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTCrucible.java
index ffac02a1..2d7865f2 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/CT/CTCrucible.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTCrucible.java
@@ -1,12 +1,10 @@
-package nmd.primal.forgecraft.compat.CT;
+package nmd.primal.forgecraft.compat.ct;
 
 
 import crafttweaker.CraftTweakerAPI;
 import crafttweaker.IAction;
 import crafttweaker.annotations.ModOnly;
 import crafttweaker.annotations.ZenRegister;
-import crafttweaker.api.item.IIngredient;
-import crafttweaker.api.item.IItemStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import nmd.primal.core.common.PrimalCore;
@@ -15,9 +13,7 @@ import nmd.primal.forgecraft.crafting.CrucibleCrafting;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 
-import java.util.List;
-
-@ZenClass("mods.primal.NBTCrucible")
+@ZenClass("mods.forgecraft.NBTCrucible")
 @ModOnly(ModInfo.MOD_ID)
 @ZenRegister
 public class CTCrucible {
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/AbstractCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/AbstractCategory.java
similarity index 94%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/AbstractCategory.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/AbstractCategory.java
index f200e3c5..2eed7637 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/AbstractCategory.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/AbstractCategory.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI;
+package nmd.primal.forgecraft.compat.jei;
 
 import com.google.common.collect.ImmutableList;
 import mezz.jei.api.gui.IDrawable;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/ModJEI.java
similarity index 84%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/ModJEI.java
index e3307239..539938e0 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/ModJEI.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/ModJEI.java
@@ -1,22 +1,22 @@
-package nmd.primal.forgecraft.compat.JEI;
+package nmd.primal.forgecraft.compat.jei;
 
 import mezz.jei.api.*;
 import mezz.jei.api.gui.ICraftingGridHelper;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
-import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeCategory;
-import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeChecker;
-import nmd.primal.forgecraft.compat.JEI.anvil.AnvilRecipeHandler;
-import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeCategory;
-import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeChecker;
-import nmd.primal.forgecraft.compat.JEI.casting.CastingRecipeHandler;
-import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeCategory;
-import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeChecker;
-import nmd.primal.forgecraft.compat.JEI.crucible.CrucibleRecipeHandler;
-import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeCategory;
-import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeChecker;
-import nmd.primal.forgecraft.compat.JEI.forge.ForgeRecipeHandler;
+import nmd.primal.forgecraft.compat.jei.anvil.AnvilRecipeCategory;
+import nmd.primal.forgecraft.compat.jei.anvil.AnvilRecipeChecker;
+import nmd.primal.forgecraft.compat.jei.anvil.AnvilRecipeHandler;
+import nmd.primal.forgecraft.compat.jei.casting.CastingRecipeCategory;
+import nmd.primal.forgecraft.compat.jei.casting.CastingRecipeChecker;
+import nmd.primal.forgecraft.compat.jei.casting.CastingRecipeHandler;
+import nmd.primal.forgecraft.compat.jei.crucible.CrucibleRecipeCategory;
+import nmd.primal.forgecraft.compat.jei.crucible.CrucibleRecipeChecker;
+import nmd.primal.forgecraft.compat.jei.crucible.CrucibleRecipeHandler;
+import nmd.primal.forgecraft.compat.jei.forge.ForgeRecipeCategory;
+import nmd.primal.forgecraft.compat.jei.forge.ForgeRecipeChecker;
+import nmd.primal.forgecraft.compat.jei.forge.ForgeRecipeHandler;
 import nmd.primal.forgecraft.crafting.AnvilCrafting;
 import nmd.primal.forgecraft.crafting.CastingCrafting;
 import nmd.primal.forgecraft.crafting.CrucibleCrafting;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeCategory.java
similarity index 97%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeCategory.java
index 1ec7e1a5..39042d11 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeCategory.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeCategory.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.anvil;
+package nmd.primal.forgecraft.compat.jei.anvil;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import nmd.primal.core.common.helper.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
-import nmd.primal.forgecraft.compat.JEI.AbstractCategory;
+import nmd.primal.forgecraft.compat.jei.AbstractCategory;
 import nmd.primal.forgecraft.init.ModItems;
 import nmd.primal.forgecraft.items.parts.ToolPart;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeChecker.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeChecker.java
index 7b9318da..415532e4 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeChecker.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeChecker.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.anvil;
+package nmd.primal.forgecraft.compat.jei.anvil;
 
 import nmd.primal.forgecraft.crafting.AnvilCrafting;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeHandler.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeHandler.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeHandler.java
index f9c3e0d2..1c7e600f 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeHandler.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeHandler.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.anvil;
+package nmd.primal.forgecraft.compat.jei.anvil;
 
 import mezz.jei.api.recipe.IRecipeWrapper;
 import mezz.jei.api.recipe.IRecipeWrapperFactory;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeWrapper.java
similarity index 96%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeWrapper.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeWrapper.java
index c256120c..4f79d12d 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/anvil/AnvilRecipeWrapper.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/anvil/AnvilRecipeWrapper.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.anvil;
+package nmd.primal.forgecraft.compat.jei.anvil;
 
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeCategory.java
similarity index 96%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeCategory.java
index 829c5a4c..25816252 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeCategory.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeCategory.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.casting;
+package nmd.primal.forgecraft.compat.jei.casting;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -10,7 +10,7 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
 import nmd.primal.core.common.helper.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
-import nmd.primal.forgecraft.compat.JEI.AbstractCategory;
+import nmd.primal.forgecraft.compat.jei.AbstractCategory;
 
 import javax.annotation.Nonnull;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeChecker.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeChecker.java
index 8c69e222..b30b16b9 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeChecker.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeChecker.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.casting;
+package nmd.primal.forgecraft.compat.jei.casting;
 
 import nmd.primal.forgecraft.crafting.CastingCrafting;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeHandler.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeHandler.java
index e32769de..6fc1f95f 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeHandler.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeHandler.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.casting;
+package nmd.primal.forgecraft.compat.jei.casting;
 
 import mezz.jei.api.recipe.IRecipeWrapper;
 import mezz.jei.api.recipe.IRecipeWrapperFactory;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeWrapper.java
similarity index 97%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeWrapper.java
index 2f43eea9..6eb3c50b 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/casting/CastingRecipeWrapper.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/casting/CastingRecipeWrapper.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.casting;
+package nmd.primal.forgecraft.compat.jei.casting;
 
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeCategory.java
similarity index 96%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeCategory.java
index e8cb6836..11bc17f4 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeCategory.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeCategory.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.crucible;
+package nmd.primal.forgecraft.compat.jei.crucible;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import nmd.primal.core.common.helper.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
-import nmd.primal.forgecraft.compat.JEI.AbstractCategory;
+import nmd.primal.forgecraft.compat.jei.AbstractCategory;
 import nmd.primal.forgecraft.init.ModBlocks;
 
 import javax.annotation.Nonnull;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeChecker.java
similarity index 55%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeChecker.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeChecker.java
index 704b7329..55fc4c37 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeChecker.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeChecker.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.crucible;
+package nmd.primal.forgecraft.compat.jei.crucible;
 
 import nmd.primal.forgecraft.crafting.CrucibleCrafting;
 
@@ -12,8 +12,12 @@ public class CrucibleRecipeChecker {
 
     public static List<CrucibleCrafting> getRecipes() {
         List<CrucibleCrafting> recipes = new ArrayList<>();
-        for (CrucibleCrafting recipe : CrucibleCrafting.getCrucibleCrafting()) {
-            recipes.add(recipe);
+        for (CrucibleCrafting recipe : CrucibleCrafting.getRECIPES()) {
+            if(!recipe.isDisabled()) {
+                if(!recipe.isHidden()) {
+                    recipes.add(recipe);
+                }
+            }
         }
         return recipes;
     }
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeHandler.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeHandler.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeHandler.java
index 1664347c..c4e9432e 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeHandler.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeHandler.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.crucible;
+package nmd.primal.forgecraft.compat.jei.crucible;
 
 import mezz.jei.api.recipe.IRecipeWrapper;
 import mezz.jei.api.recipe.IRecipeWrapperFactory;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeWrapper.java
similarity index 98%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeWrapper.java
index c5d03b7b..1ea8b68f 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/crucible/CrucibleRecipeWrapper.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/crucible/CrucibleRecipeWrapper.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.crucible;
+package nmd.primal.forgecraft.compat.jei.crucible;
 
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeCategory.java
similarity index 95%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeCategory.java
index 382dd9c4..b1c95788 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeCategory.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeCategory.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.forge;
+package nmd.primal.forgecraft.compat.jei.forge;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import nmd.primal.core.common.helper.CommonUtils;
 import nmd.primal.forgecraft.ModInfo;
-import nmd.primal.forgecraft.compat.JEI.AbstractCategory;
+import nmd.primal.forgecraft.compat.jei.AbstractCategory;
 import nmd.primal.forgecraft.init.ModBlocks;
 
 import javax.annotation.Nonnull;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeChecker.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeChecker.java
index d6f53d0a..554d578a 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeChecker.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeChecker.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.forge;
+package nmd.primal.forgecraft.compat.jei.forge;
 
 import nmd.primal.forgecraft.crafting.ForgeCrafting;
 
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeHandler.java
similarity index 90%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeHandler.java
index cf62cda3..fbce3940 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeHandler.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeHandler.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.forge;
+package nmd.primal.forgecraft.compat.jei.forge;
 
 import mezz.jei.api.recipe.IRecipeWrapper;
 import mezz.jei.api.recipe.IRecipeWrapperFactory;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeWrapper.java
similarity index 97%
rename from kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java
rename to kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeWrapper.java
index ce7e7fae..e7ba0fac 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/JEI/forge/ForgeRecipeWrapper.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/jei/forge/ForgeRecipeWrapper.java
@@ -1,4 +1,4 @@
-package nmd.primal.forgecraft.compat.JEI.forge;
+package nmd.primal.forgecraft.compat.jei.forge;
 
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.IRecipeWrapper;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
index 39f6cb6a..ba8809e4 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
@@ -22,13 +22,18 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
 
     public static final String RECIPE_PREFIX = "crucible";
     public static final IForgeRegistry<CrucibleCrafting> REGISTRY = ModInfo.Registries.CRUCIBLE_CRAFTING;
-    public static final Collection<CrucibleCrafting> RECIPES = REGISTRY.getValuesCollection();
 
-    public static ArrayList<CrucibleCrafting> getCrucibleCrafting() {
-        return crucibleCrafting;
+    public static Collection<CrucibleCrafting> getRECIPES() {
+        return RECIPES;
     }
 
-    private static ArrayList<CrucibleCrafting> crucibleCrafting = new ArrayList<>();
+    public static final Collection<CrucibleCrafting> RECIPES = REGISTRY.getValuesCollection();
+
+    //public static ArrayList<CrucibleCrafting> getCrucibleCrafting() {
+        //return crucibleCrafting;
+    //}
+
+    //private static ArrayList<CrucibleCrafting> crucibleCrafting = new ArrayList<>();
 
     private int cookTemp;
     private int cookTime;
@@ -114,15 +119,8 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
         this.coolTime = coolTime;
     }
 
-    public static void addRecipe(Ingredient i0, Ingredient i1, Ingredient i2, Ingredient i3, Ingredient i4,
-                                 ItemStack outputRaw, ItemStack outputCooked,
-                                 Integer temp, Integer cookTime, Integer coolTime)
-    {
-        crucibleCrafting.add(new CrucibleCrafting(i0, i1, i2, i3, i4, outputRaw, outputCooked, temp, cookTime, coolTime));
-    }
-
     public static boolean isRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack i4){
-        for(CrucibleCrafting recipe : crucibleCrafting){
+        for(CrucibleCrafting recipe : RECIPES){
             if(recipe.ing0.apply(i0) && recipe.ing1.apply(i1) && recipe.ing2.apply(i2) && recipe.ing3.apply(i3) && recipe.ing4.apply(i4) ){
                 return true;
             }
@@ -131,7 +129,7 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
     }
 
     public static CrucibleCrafting getRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack i4){
-        for(CrucibleCrafting recipe : crucibleCrafting){
+        for(CrucibleCrafting recipe : RECIPES){
             if(recipe.ing0.test(i0) && recipe.ing1.test(i1) && recipe.ing2.test(i2) && recipe.ing3.test(i3) && recipe.ing4.test(i4) ){
                 return recipe;
             }
@@ -140,7 +138,7 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
     }
 
     public static boolean isValidIngredient(ItemStack checkStack){
-        for(CrucibleCrafting recipe : crucibleCrafting) {
+        for(CrucibleCrafting recipe : RECIPES) {
             if (recipe.ing0.apply(checkStack) ||
                     recipe.ing1.apply(checkStack) ||
                     recipe.ing2.apply(checkStack) ||
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
index 8a434d59..b47fcf51 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
@@ -78,30 +78,32 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
             ItemStackHelper.loadAllItems(tag, dropList);
             CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4));
             if (recipe != null) {
-                if (this.getHeat() >= recipe.getCookTemp() &&
-                        !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
-                    cookCounter++;
-                    //this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true);
-                    //System.out.println("Cooking");
-                    this.updateBlock();
-                    this.markDirty();
-                }
-                if (cookCounter >= (recipe.getCookTime()/4) && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
-                    this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("hot", 15);
-                    //System.out.println("hot");
-                    this.updateBlock();
-                    this.markDirty();
-                }
-                if (cookCounter >= recipe.getCookTime() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
-                    this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("status", true);
-                    this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("heat", this.getHeat());
-                    cookCounter = 0;
-                    //System.out.println("Cooked");
-                    this.updateBlock();
-                    this.markDirty();
-                }
-                if (this.getSlotStack(1).isEmpty()) {
-                    this.cookCounter = 0;
+                if(!recipe.isDisabled()) {
+                    if (this.getHeat() >= recipe.getCookTemp() &&
+                            !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
+                        cookCounter++;
+                        //this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true);
+                        //System.out.println("Cooking");
+                        this.updateBlock();
+                        this.markDirty();
+                    }
+                    if (cookCounter >= (recipe.getCookTime() / 4) && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
+                        this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("hot", 15);
+                        //System.out.println("hot");
+                        this.updateBlock();
+                        this.markDirty();
+                    }
+                    if (cookCounter >= recipe.getCookTime() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
+                        this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("status", true);
+                        this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("heat", this.getHeat());
+                        cookCounter = 0;
+                        //System.out.println("Cooked");
+                        this.updateBlock();
+                        this.markDirty();
+                    }
+                    if (this.getSlotStack(1).isEmpty()) {
+                        this.cookCounter = 0;
+                    }
                 }
             }
         }
diff --git a/kfc/src/main/resources/assets/forgecraft/lang/en_us.lang b/kfc/src/main/resources/assets/forgecraft/lang/en_US.lang
similarity index 100%
rename from kfc/src/main/resources/assets/forgecraft/lang/en_us.lang
rename to kfc/src/main/resources/assets/forgecraft/lang/en_US.lang