diff --git a/build.gradle b/build.gradle
index 5c41268d1..2dbf72621 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,6 @@ sourceSets {
     api
     main {
         java {
-            exclude 'appeng/recipes/handlers/**'
             exclude 'appeng/worldgen/**'
             exclude 'appeng/spatial/StorageChunkProvider.java'
             exclude 'appeng/spatial/StorageHelper.java'
diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java
index 78bf0826b..091bc2aa3 100644
--- a/src/main/java/appeng/bootstrap/BlockRendering.java
+++ b/src/main/java/appeng/bootstrap/BlockRendering.java
@@ -35,10 +35,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 
@@ -51,9 +48,6 @@ class BlockRendering implements IBlockRendering
 	@OnlyIn( Dist.CLIENT )
 	private IBlockColor blockColor;
 
-	@OnlyIn( Dist.CLIENT )
-	private Map<String, IUnbakedModel> builtInModels = new HashMap<>();
-
 	@OnlyIn( Dist.CLIENT )
 	private RenderType renderType;
 
@@ -76,13 +70,6 @@ class BlockRendering implements IBlockRendering
 		return this;
 	}
 
-	@Override
-	public IBlockRendering builtInModel( String name, IUnbakedModel model )
-	{
-		this.builtInModels.put( name, model );
-		return this;
-	}
-
 	@Override
 	public IBlockRendering renderType(RenderType type) {
 		this.renderType = type;
@@ -108,8 +95,6 @@ class BlockRendering implements IBlockRendering
 			factory.addModelOverride( block.getRegistryName().getPath(), ( l, m ) -> new AutoRotatingBakedModel( m ) );
 		}
 
-		this.builtInModels.forEach( factory::addBuiltInModel );
-
 		// TODO : 1.12
 		if( this.blockColor != null )
 		{
diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java
index 9ccacd52f..ec38add83 100644
--- a/src/main/java/appeng/bootstrap/FeatureFactory.java
+++ b/src/main/java/appeng/bootstrap/FeatureFactory.java
@@ -30,7 +30,6 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import appeng.bootstrap.components.BuiltInModelComponent;
 import appeng.bootstrap.components.ModelOverrideComponent;
 import appeng.tile.AEBaseTile;
 import net.minecraft.block.Block;
@@ -42,17 +41,10 @@ import net.minecraft.entity.EntityType;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import appeng.api.definitions.IItemDefinition;
-import appeng.api.util.AEColor;
-import appeng.api.util.AEColoredItemDefinition;
 import appeng.api.features.AEFeature;
-import appeng.core.features.ActivityState;
-import appeng.core.features.ColoredItemDefinition;
-import appeng.core.features.ItemStackSrc;
 import appeng.util.Platform;
 
 
@@ -66,9 +58,6 @@ public class FeatureFactory
 	@OnlyIn( Dist.CLIENT )
 	private ModelOverrideComponent modelOverrideComponent;
 
-	@OnlyIn( Dist.CLIENT )
-	private BuiltInModelComponent builtInModelComponent;
-
 	public FeatureFactory()
 	{
 		this.defaultFeatures = new AEFeature[] { AEFeature.CORE };
@@ -78,8 +67,6 @@ public class FeatureFactory
 		{
 			this.modelOverrideComponent = new ModelOverrideComponent();
 			this.addBootstrapComponent( this.modelOverrideComponent );
-			this.builtInModelComponent = new BuiltInModelComponent();
-			this.addBootstrapComponent( this.builtInModelComponent );
 		}
 	}
 
@@ -90,7 +77,6 @@ public class FeatureFactory
 		if( Platform.hasClientClasses() )
 		{
 			this.modelOverrideComponent = parent.modelOverrideComponent;
-			this.builtInModelComponent = parent.builtInModelComponent;
 		}
 	}
 
@@ -131,12 +117,6 @@ public class FeatureFactory
 		this.bootstrapComponents.computeIfAbsent( eventType, c -> new ArrayList<IBootstrapComponent>() ).add( component );
 	}
 
-	@OnlyIn( Dist.CLIENT )
-	void addBuiltInModel( String path, IUnbakedModel model )
-	{
-		this.builtInModelComponent.addModel( path, model );
-	}
-
 	@OnlyIn( Dist.CLIENT )
 	void addModelOverride( String resourcePath, BiFunction<ResourceLocation, IBakedModel, IBakedModel> customizer )
 	{
diff --git a/src/main/java/appeng/bootstrap/IBlockRendering.java b/src/main/java/appeng/bootstrap/IBlockRendering.java
index 0bb4a8cd9..dc7332ab9 100644
--- a/src/main/java/appeng/bootstrap/IBlockRendering.java
+++ b/src/main/java/appeng/bootstrap/IBlockRendering.java
@@ -47,12 +47,6 @@ public interface IBlockRendering
 	@OnlyIn( Dist.CLIENT )
 	IBlockRendering blockColor( IBlockColor blockColor );
 
-	/**
-	 * Registers a built-in model under the given resource path.
-	 */
-	@OnlyIn( Dist.CLIENT )
-	IBlockRendering builtInModel( String name, IUnbakedModel model );
-
 	@OnlyIn( Dist.CLIENT )
 	IBlockRendering renderType(RenderType type);
 
diff --git a/src/main/java/appeng/bootstrap/IItemRendering.java b/src/main/java/appeng/bootstrap/IItemRendering.java
index 2e71864d2..8492e01e4 100644
--- a/src/main/java/appeng/bootstrap/IItemRendering.java
+++ b/src/main/java/appeng/bootstrap/IItemRendering.java
@@ -23,8 +23,6 @@ import java.util.Arrays;
 import java.util.Collection;
 
 import net.minecraft.client.renderer.color.IItemColor;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -36,29 +34,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 public interface IItemRendering
 {
 
-	/**
-	 * Registers a custom item mesh definition that will be used to dynamically determine the
-	 * item model to be used for rendering by inspecting the item stack (i.e. for NBT data).
-	 * Please
-	 */
-//FIXME	@OnlyIn( Dist.CLIENT )
-//FIXME	IItemRendering meshDefinition( ItemMeshDefinition meshDefinition );
-
-	/**
-	 * Registers an item model for meta=0, see {@link #model(int, ModelResourceLocation)}.
-	 */
-	@OnlyIn( Dist.CLIENT )
-	default IItemRendering model( ModelResourceLocation model )
-	{
-		return this.model( 0, model );
-	}
-
-	/**
-	 * Registers an item model for a given meta.
-	 */
-	@OnlyIn( Dist.CLIENT )
-	IItemRendering model( int meta, ModelResourceLocation model );
-
 	/**
 	 * Convenient override for {@link #variants(Collection)}.
 	 */
@@ -72,8 +47,6 @@ public interface IItemRendering
 	 * Registers the item variants of this item. This are all models that need to be loaded for this item.
 	 * This has no direct effect on rendering, but is used to load models that are used for example by
 	 * the ItemMeshDefinition.
-	 *
-	 * Models registered via {@link #model(int, ModelResourceLocation)} are automatically added here.
 	 */
 	@OnlyIn( Dist.CLIENT )
 	IItemRendering variants( Collection<ResourceLocation> resources );
@@ -85,10 +58,4 @@ public interface IItemRendering
 	@OnlyIn( Dist.CLIENT )
 	IItemRendering color( IItemColor itemColor );
 
-	/**
-	 * Registers a built-in model under the given resource path.
-	 */
-	@OnlyIn( Dist.CLIENT )
-	IItemRendering builtInModel( String name, IUnbakedModel model );
-
 }
diff --git a/src/main/java/appeng/bootstrap/IModelRegistry.java b/src/main/java/appeng/bootstrap/IModelRegistry.java
index e463ef316..e4750833f 100644
--- a/src/main/java/appeng/bootstrap/IModelRegistry.java
+++ b/src/main/java/appeng/bootstrap/IModelRegistry.java
@@ -29,7 +29,4 @@ public interface IModelRegistry
 {
 	void registerItemVariants( Item item, ResourceLocation... names );
 
-	void setCustomModelResourceLocation( Item item, int metadata, ModelResourceLocation model );
-
-	// FIXME void setCustomMeshDefinition( Item item, ItemMeshDefinition meshDefinition );
 }
diff --git a/src/main/java/appeng/bootstrap/ItemRendering.java b/src/main/java/appeng/bootstrap/ItemRendering.java
index a65b23d31..fcd4dc0b2 100644
--- a/src/main/java/appeng/bootstrap/ItemRendering.java
+++ b/src/main/java/appeng/bootstrap/ItemRendering.java
@@ -20,29 +20,16 @@ package appeng.bootstrap;
 
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
-import com.google.common.collect.ImmutableMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.color.IItemColor;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.components.ItemColorComponent;
-import appeng.bootstrap.components.ItemMeshDefinitionComponent;
-import appeng.bootstrap.components.ItemModelComponent;
 import appeng.bootstrap.components.ItemVariantsComponent;
 
 
@@ -52,36 +39,9 @@ class ItemRendering implements IItemRendering
 	@OnlyIn( Dist.CLIENT )
 	private IItemColor itemColor;
 
-//  FIXME
-//	@OnlyIn( Dist.CLIENT )
-//	private ItemMeshDefinition itemMeshDefinition;
-
-	@OnlyIn( Dist.CLIENT )
-	private Map<Integer, ModelResourceLocation> itemModels = new HashMap<>();
-
 	@OnlyIn( Dist.CLIENT )
 	private Set<ResourceLocation> variants = new HashSet<>();
 
-	@OnlyIn( Dist.CLIENT )
-	private Map<String, IUnbakedModel> builtInModels = new HashMap<>();
-
-// FIXME
-//	@Override
-//	@OnlyIn( Dist.CLIENT )
-//	public IItemRendering meshDefinition( ItemMeshDefinition meshDefinition )
-//	{
-//		this.itemMeshDefinition = meshDefinition;
-//		return this;
-//	}
-
-	@Override
-	@OnlyIn( Dist.CLIENT )
-	public IItemRendering model( int meta, ModelResourceLocation model )
-	{
-		this.itemModels.put( meta, model );
-		return this;
-	}
-
 	@Override
 	public IItemRendering variants( Collection<ResourceLocation> resources )
 	{
@@ -97,65 +57,14 @@ class ItemRendering implements IItemRendering
 		return this;
 	}
 
-	@Override
-	public IItemRendering builtInModel( String name, IUnbakedModel model )
-	{
-		this.builtInModels.put( name, model );
-		return this;
-	}
-
 	void apply( FeatureFactory factory, Item item )
 	{
-//FIXME		if( this.itemMeshDefinition != null )
-//FIXME		{
-//FIXME			factory.addBootstrapComponent( new ItemMeshDefinitionComponent( item, this.itemMeshDefinition ) );
-//FIXME		}
-
-		if( !this.itemModels.isEmpty() )
-		{
-			factory.addBootstrapComponent( new ItemModelComponent( item, this.itemModels ) );
-		}
-
 		Set<ResourceLocation> resources = new HashSet<>( this.variants );
 
-		// Register a default item model if neither items by meta nor an item mesh definition exist
-		if( /* FIXME this.itemMeshDefinition == null  && */ this.itemModels.isEmpty() )
-		{
-//			ModelResourceLocation model;
-//
-//			// For block items, the default will try to use the default state of the associated block
-//			if( item instanceof BlockItem )
-//			{
-//				Block block = ( (BlockItem) item ).getBlock();
-//
-//				// We can only do this once the blocks are actually registered...
-//				model = new ModelResourceLocation(
-//						new ResourceLocation(
-//								block.getRegistryName().getNamespace(),
-//								"block/" + block.getRegistryName().getPath()
-//						)
-//						, "inventory" );
-//			}
-//			else
-//			{
-//				model = new ModelResourceLocation( item.getRegistryName(), "inventory" );
-//			}
-//			factory.addBootstrapComponent( new ItemModelComponent( item, ImmutableMap.of( 0, model ) ) );
-		}
-
-		// TODO : 1.12
-		this.builtInModels.forEach( factory::addBuiltInModel );
-
 		if( !resources.isEmpty() )
 		{
 			factory.addBootstrapComponent( new ItemVariantsComponent( item, resources ) );
 		}
-		// FIXME else if( this.itemMeshDefinition != null )
-		// FIXME {
-		// FIXME 	// Adding an empty variant list here will prevent Vanilla from trying to load the default item model in this
-		// FIXME 	// case
-		// FIXME 	factory.addBootstrapComponent( new ItemVariantsComponent( item, Collections.emptyList() ) );
-		// FIXME }
 
 		if( this.itemColor != null )
 		{
diff --git a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java
deleted file mode 100644
index d9bce58fb..000000000
--- a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.bootstrap.components;
-
-
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.Item;
-import net.minecraftforge.api.distmarker.Dist;
-
-import appeng.bootstrap.IModelRegistry;
-
-
-/**
- * Registers the models that should by used for an item, including the ability to
- * distinguish by meta.
- */
-public class ItemModelComponent implements IModelRegistrationComponent
-{
-
-	private final Item item;
-
-	private final Map<Integer, ModelResourceLocation> modelsByMeta;
-
-	public ItemModelComponent( @Nonnull Item item, @Nonnull Map<Integer, ModelResourceLocation> modelsByMeta )
-	{
-		this.item = item;
-		this.modelsByMeta = modelsByMeta;
-	}
-
-	@Override
-	public void modelRegistration( Dist dist, IModelRegistry registry )
-	{
-		this.modelsByMeta.forEach( ( meta, model ) ->
-		{
-			registry.setCustomModelResourceLocation( this.item, meta, model );
-		} );
-	}
-
-}
diff --git a/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java
new file mode 100644
index 000000000..776313d26
--- /dev/null
+++ b/src/main/java/appeng/core/AERecipeType.java
@@ -0,0 +1,19 @@
+package appeng.core;
+
+import appeng.recipes.handlers.GrinderRecipe;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.IRecipeType;
+import net.minecraft.util.ResourceLocation;
+
+public class AERecipeType<T extends IRecipe<?>> implements IRecipeType<T> {
+    private final String id;
+
+    public AERecipeType(ResourceLocation registryName) {
+        this.id = registryName.toString();
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}
diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java
index d1e2f16ab..9f9c75a9b 100644
--- a/src/main/java/appeng/core/AppEng.java
+++ b/src/main/java/appeng/core/AppEng.java
@@ -30,6 +30,7 @@ import appeng.bootstrap.components.IClientSetupComponent;
 import appeng.bootstrap.components.IInitComponent;
 import appeng.bootstrap.components.IPostInitComponent;
 import appeng.bootstrap.components.ItemColorComponent;
+import appeng.capabilities.Capabilities;
 import appeng.client.ClientHelper;
 import appeng.client.render.DummyFluidItemModel;
 import appeng.client.render.SimpleModelLoader;
@@ -162,6 +163,7 @@ public final class AppEng
 		definitions.getRegistry().getBootstrapComponents( IInitComponent.class ).forEachRemaining(IInitComponent::initialize);
 		definitions.getRegistry().getBootstrapComponents( IPostInitComponent.class ).forEachRemaining(IPostInitComponent::postInitialize);
 
+		Capabilities.register();
 		Registration.setupInternalRegistries();
 		Registration.postInit();
 
diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
index 9aa3c6b50..f0e674081 100644
--- a/src/main/java/appeng/core/Registration.java
+++ b/src/main/java/appeng/core/Registration.java
@@ -22,7 +22,6 @@ package appeng.core;
 import appeng.api.AEApi;
 import appeng.api.config.Upgrades;
 import appeng.api.definitions.IBlocks;
-import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IItems;
 import appeng.api.definitions.IParts;
 import appeng.api.features.IRegistryContainer;
@@ -36,9 +35,9 @@ import appeng.api.networking.security.ISecurityGrid;
 import appeng.api.networking.spatial.ISpatialCache;
 import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.networking.ticking.ITickManager;
-import appeng.bootstrap.ICriterionTriggerRegistry;
 import appeng.bootstrap.IModelRegistry;
 import appeng.bootstrap.components.*;
+import appeng.capabilities.Capabilities;
 import appeng.client.gui.implementations.GuiCellWorkbench;
 import appeng.client.gui.implementations.GuiChest;
 import appeng.client.gui.implementations.GuiCondenser;
@@ -72,7 +71,6 @@ import appeng.client.gui.implementations.GuiUpgradeable;
 import appeng.client.gui.implementations.GuiVibrationChamber;
 import appeng.client.gui.implementations.GuiWireless;
 import appeng.client.gui.implementations.GuiWirelessTerm;
-import appeng.client.render.cablebus.CableBusModel;
 import appeng.client.render.effects.*;
 import appeng.client.render.model.BiometricCardModel;
 import appeng.client.render.model.DriveModel;
@@ -96,20 +94,19 @@ import appeng.fluids.registries.BasicFluidCellGuiHandler;
 import appeng.me.cache.*;
 import appeng.recipes.conditions.FeaturesEnabled;
 import appeng.recipes.game.DisassembleRecipe;
+import appeng.recipes.handlers.GrinderRecipe;
+import appeng.recipes.handlers.GrinderRecipeSerializer;
 import appeng.server.AECommand;
 import appeng.tile.AEBaseTile;
 import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.ICriterionInstance;
-import net.minecraft.advancements.ICriterionTrigger;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScreenManager;
-import net.minecraft.client.renderer.ItemModelMesher;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.entity.EntityType;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.Item;
 import net.minecraft.item.crafting.IRecipeSerializer;
+import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
@@ -118,9 +115,9 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.*;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.crafting.CraftingHelper;
+import net.minecraftforge.common.crafting.conditions.IConditionSerializer;
 import net.minecraftforge.common.extensions.IForgeContainerType;
 import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.loading.FMLEnvironment;
@@ -128,8 +125,6 @@ import net.minecraftforge.fml.network.IContainerFactory;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.IForgeRegistry;
 
-import java.lang.reflect.Method;
-
 
 final class Registration
 {
@@ -143,23 +138,7 @@ final class Registration
 //	int storageDimensionID;
 //	Biome storageBiome;
 	AdvancementTriggers advancementTriggers;
-//
-//	void preInitialize( final FMLPreInitializationEvent event )
-//	{
-//		Capabilities.register();
-//
-//		final Api api = AEApi.instance();
-//		final IRecipeHandlerRegistry recipeRegistry = api.registries().recipes();
-//		this.registerCraftHandlers( recipeRegistry );
-//
-//		MinecraftForge.EVENT_BUS.register( OreDictionaryHandler.INSTANCE );
-//
-//		ApiDefinitions definitions = api.definitions();
-//
-//		// Register
-//		definitions.getRegistry().getBootstrapComponents( IPreInitComponent.class ).forEachRemaining( b -> b.preInitialize( event.getSide() ) );
-//	}
-//
+
 //	private void registerSpatialBiome( IForgeRegistry<Biome> registry )
 //	{
 //		if( !AEConfig.instance().isFeatureEnabled( AEFeature.SPATIAL_IO ) )
@@ -209,11 +188,6 @@ final class Registration
 //		this.storageDimensionID = config.getStorageDimensionID();
 //
 //		DimensionManager.registerDimension( this.storageDimensionID, this.storageDimensionType );
-//	}
-//
-//	private void registerCraftHandlers( final IRecipeHandlerRegistry registry )
-//	{
-//		registry.addNewSubItemResolver( new AEItemResolver() );
 //	}
 
 	public static void setupInternalRegistries()
@@ -264,15 +238,9 @@ final class Registration
 		final IModelRegistry registry = new IModelRegistry() {
 			@Override
 			public void registerItemVariants(Item item, ResourceLocation... names) {
-
+// FIXME REMOVE OR IMPL
 			}
 
-			@Override
-			public void setCustomModelResourceLocation(Item item, int metadata, ModelResourceLocation model) {
-				// FIXME: this does not actually work
-				ItemModelMesher mesher = Minecraft.getInstance().getItemRenderer().getItemModelMesher();
-				mesher.register(item, model);
-			}
 		};
 		final Dist dist = FMLEnvironment.dist;
 		definitions.getRegistry().getBootstrapComponents( IModelRegistrationComponent.class ).forEachRemaining(b -> b.modelRegistration( dist, registry ) );
@@ -611,7 +579,6 @@ final class Registration
 		ContainerOpener.addOpener(type, opener);
 		return type;
 	}
-
 	public void registerRecipeSerializers( RegistryEvent.Register<IRecipeSerializer<?>> event )
 	{
 		IForgeRegistry<IRecipeSerializer<?>> r = event.getRegistry();
@@ -619,8 +586,11 @@ final class Registration
 		// TODO: Do not use the internal API
 		final ApiDefinitions definitions = Api.INSTANCE.definitions();
 
+		GrinderRecipe.TYPE = new AERecipeType<>(GrinderRecipeSerializer.INSTANCE.getRegistryName());
+
 		r.registerAll(
-				DisassembleRecipe.SERIALIZER
+				DisassembleRecipe.SERIALIZER,
+				GrinderRecipeSerializer.INSTANCE
 //				FacadeRecipe.getSerializer( (ItemFacade) definitions.items().facade().item() ) FIXME reimplement facades
 //				this.factories.put( new ResourceLocation( AppEng.MOD_ID, "inscriber" ), new InscriberHandler() ); FIXME re-implement machine recipes
 //				this.factories.put( new ResourceLocation( AppEng.MOD_ID, "smelt" ), new SmeltingHandler() );
diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java
index 22787123a..e00f7460e 100644
--- a/src/main/java/appeng/core/api/definitions/ApiItems.java
+++ b/src/main/java/appeng/core/api/definitions/ApiItems.java
@@ -310,6 +310,10 @@ public final class ApiItems implements IItems
 	private static AEColoredItemDefinition createPaintBalls(FeatureFactory registry, String idSuffix, boolean lumen) {
 		ColoredItemDefinition colors = new ColoredItemDefinition();
 		for (AEColor color : AEColor.values()) {
+			if (color == AEColor.TRANSPARENT) {
+				continue; // Fluix paintballs don't exist
+			}
+
 			String id = color.registryPrefix + idSuffix;
 			IItemDefinition paintBall = registry.item(id, props -> new ItemPaintBall(props, color, lumen))
 					.features(AEFeature.PAINT_BALLS)
diff --git a/src/main/java/appeng/bootstrap/components/IPreInitComponent.java b/src/main/java/appeng/integration/IIntegrationModule.java
similarity index 76%
rename from src/main/java/appeng/bootstrap/components/IPreInitComponent.java
rename to src/main/java/appeng/integration/IIntegrationModule.java
index ea4285c19..89f9fdd66 100644
--- a/src/main/java/appeng/bootstrap/components/IPreInitComponent.java
+++ b/src/main/java/appeng/integration/IIntegrationModule.java
@@ -16,16 +16,23 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.bootstrap.components;
+package appeng.integration;
 
 
-import net.minecraftforge.api.distmarker.Dist;
-
-import appeng.bootstrap.IBootstrapComponent;
-
-
-@FunctionalInterface
-public interface IPreInitComponent extends IBootstrapComponent
+public interface IIntegrationModule
 {
-	void preInitialize( Dist dist );
+
+	default boolean isEnabled()
+	{
+		return true;
+	}
+
+	class Stub implements IIntegrationModule
+	{
+		@Override
+		public boolean isEnabled()
+		{
+			return false;
+		}
+	}
 }
diff --git a/src/main/java/appeng/integration/abstraction/IJEI.java b/src/main/java/appeng/integration/abstraction/IJEI.java
new file mode 100644
index 000000000..7f934ebae
--- /dev/null
+++ b/src/main/java/appeng/integration/abstraction/IJEI.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.abstraction;
+
+
+import appeng.integration.IIntegrationModule;
+
+
+/**
+ * Abstracts access to the JEI API functionality.
+ */
+public interface IJEI extends IIntegrationModule
+{
+
+	default String getSearchText()
+	{
+		return "";
+	}
+
+	default void setSearchText( String searchText )
+	{
+	}
+
+	class Stub extends IIntegrationModule.Stub implements IJEI
+	{
+	}
+}
diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java
new file mode 100644
index 000000000..e3141203b
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java
@@ -0,0 +1,213 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.api.AEApi;
+import appeng.api.config.CondenserOutput;
+import appeng.api.definitions.IMaterials;
+import appeng.api.implementations.items.IStorageComponent;
+import appeng.core.Api;
+import appeng.core.AppEng;
+import appeng.tile.misc.TileCondenser;
+import com.google.common.base.Splitter;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.drawable.IDrawableAnimated;
+import mezz.jei.api.gui.drawable.IDrawableStatic;
+import mezz.jei.api.gui.ingredient.IGuiItemStackGroup;
+import mezz.jei.api.helpers.IGuiHelper;
+import mezz.jei.api.ingredients.IIngredients;
+import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.client.gui.HoverChecker;
+
+import java.util.*;
+
+
+class CondenserCategory implements IRecipeCategory<CondenserOutput>
+{
+
+	public static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "condenser");
+
+	private final String localizedName;
+
+	private final IDrawable background;
+
+	private final IDrawable iconTrash;
+
+	private final IDrawableAnimated progress;
+
+	private final IDrawable iconButton;
+
+	private final IDrawable icon;
+
+	private final HoverChecker buttonHoverChecker;
+
+	private final Map<CondenserOutput, IDrawable> buttonIcons;
+
+	public CondenserCategory( IGuiHelper guiHelper )
+	{
+		this.localizedName = I18n.format( "gui.appliedenergistics2.Condenser" );
+		this.icon = guiHelper.createDrawableIngredient(Api.INSTANCE.definitions().blocks().condenser().stack(1));
+
+		ResourceLocation location = new ResourceLocation( AppEng.MOD_ID, "textures/guis/condenser.png" );
+		this.background = guiHelper.createDrawable( location, 50, 25, 94, 48 );
+
+		ResourceLocation statesLocation = new ResourceLocation( AppEng.MOD_ID, "textures/guis/states.png" );
+		this.iconTrash = guiHelper.drawableBuilder( statesLocation, 241, 81, 14, 14 )
+				.addPadding(28, 0, 2, 0)
+				.build();
+		this.iconButton = guiHelper.drawableBuilder( statesLocation, 240, 240, 16, 16 )
+				.addPadding(28, 0, 78, 0)
+				.build();
+
+		IDrawableStatic progressDrawable = guiHelper.drawableBuilder( location, 178, 25, 6, 18 )
+				.addPadding(0, 0, 70, 0)
+				.build();
+		this.progress = guiHelper.createAnimatedDrawable( progressDrawable, 40, IDrawableAnimated.StartDirection.BOTTOM, false );
+
+		this.buttonIcons = new EnumMap<>(CondenserOutput.class);
+
+		this.buttonIcons.put(CondenserOutput.MATTER_BALLS, guiHelper.drawableBuilder( statesLocation, 16, 112, 14, 14 ).addPadding(28, 0, 78, 0).build());
+		this.buttonIcons.put(CondenserOutput.SINGULARITY, guiHelper.drawableBuilder( statesLocation, 32, 112, 14, 14).addPadding(28, 0, 78, 0).build());
+		this.buttonHoverChecker = new HoverChecker( 28, 28 + 16, 78, 78 + 16, 0 );
+	}
+
+	private ItemStack getOutput( CondenserOutput recipe )
+	{
+		switch( recipe )
+		{
+			case MATTER_BALLS:
+				return Api.INSTANCE.definitions().materials().matterBall().stack(1);
+			case SINGULARITY:
+				return Api.INSTANCE.definitions().materials().singularity().stack(1);
+			default:
+				return ItemStack.EMPTY;
+		}
+	}
+
+	@Override
+	public ResourceLocation getUid()
+	{
+		return CondenserCategory.UID;
+	}
+
+	@Override
+	public Class<? extends CondenserOutput> getRecipeClass() {
+		return CondenserOutput.class;
+	}
+
+	@Override
+	public String getTitle()
+	{
+		return this.localizedName;
+	}
+
+	@Override
+	public IDrawable getBackground()
+	{
+		return this.background;
+	}
+
+	@Override
+	public IDrawable getIcon() {
+		return icon;
+	}
+
+	@Override
+	public void setIngredients(CondenserOutput recipe, IIngredients ingredients) {
+		ingredients.setOutput(VanillaTypes.ITEM, getOutput(recipe) );
+	}
+
+	@Override
+	public void draw(CondenserOutput recipe, double mouseX, double mouseY) {
+		this.progress.draw();
+		this.iconTrash.draw();
+		this.iconButton.draw();
+
+		IDrawable buttonIcon = this.buttonIcons.get(recipe);
+		if (buttonIcon != null) {
+			buttonIcon.draw();
+		}
+	}
+
+	@Override
+	public void setRecipe(IRecipeLayout recipeLayout, CondenserOutput output, IIngredients ingredients )
+	{
+		IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
+		itemStacks.init( 0, false, 54, 26 );
+
+		// Get all storage cells and cycle them through a fake input slot
+		itemStacks.init( 1, true, 50, 0 );
+		itemStacks.set( 1, this.getViableStorageComponents( output ) );
+
+		// This only sets the output
+		itemStacks.set( ingredients );
+	}
+
+	private List<ItemStack> getViableStorageComponents(CondenserOutput condenserOutput )
+	{
+		IMaterials materials = AEApi.instance().definitions().materials();
+		List<ItemStack> viableComponents = new ArrayList<>();
+		materials.cell1kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) );
+		materials.cell4kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) );
+		materials.cell16kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) );
+		materials.cell64kPart().maybeStack( 1 ).ifPresent( itemStack -> this.addViableComponent( condenserOutput, viableComponents, itemStack ) );
+		return viableComponents;
+	}
+
+	private void addViableComponent(CondenserOutput condenserOutput, List<ItemStack> viableComponents, ItemStack itemStack )
+	{
+		IStorageComponent comp = (IStorageComponent) itemStack.getItem();
+		int storage = comp.getBytes( itemStack ) * TileCondenser.BYTE_MULTIPLIER;
+		if( storage >= condenserOutput.requiredPower )
+		{
+			viableComponents.add( itemStack );
+		}
+	}
+
+	@Override
+	public List<String> getTooltipStrings(CondenserOutput output, double mouseX, double mouseY) {
+
+		if( this.buttonHoverChecker.checkHover( (int) mouseX, (int) mouseY ) )
+		{
+			String key;
+
+			switch( output )
+			{
+				case MATTER_BALLS:
+					key = "gui.tooltips.appliedenergistics2.MatterBalls";
+					break;
+				case SINGULARITY:
+					key = "gui.tooltips.appliedenergistics2.Singularity";
+					break;
+				default:
+					return Collections.emptyList();
+			}
+
+			return Splitter.on( "\\n" ).splitToList( I18n.format( key, output.requiredPower ) );
+		}
+		return Collections.emptyList();
+	}
+
+}
diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java
new file mode 100644
index 000000000..70b40c091
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java
@@ -0,0 +1,149 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.core.Api;
+import appeng.core.AppEng;
+import appeng.recipes.handlers.GrinderOptionalResult;
+import appeng.recipes.handlers.GrinderRecipe;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.ingredient.IGuiItemStackGroup;
+import mezz.jei.api.helpers.IGuiHelper;
+import mezz.jei.api.ingredients.IIngredients;
+import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+class GrinderRecipeCategory implements IRecipeCategory<GrinderRecipe>
+{
+
+	public static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "grinder");
+
+	private final String localizedName;
+
+	private final IDrawable background;
+
+	private final IDrawable icon;
+
+	public GrinderRecipeCategory( IGuiHelper guiHelper )
+	{
+		this.localizedName = I18n.format( "tile.appliedenergistics2.grindstone.name" );
+
+		ResourceLocation location = new ResourceLocation( AppEng.MOD_ID, "textures/guis/grinder.png" );
+		this.background = guiHelper.createDrawable( location, 11, 16, 154, 70 );
+
+		this.icon = guiHelper.createDrawableIngredient(Api.INSTANCE.definitions().blocks().grindstone().stack(1));
+	}
+
+	@Override
+	public ResourceLocation getUid()
+	{
+		return GrinderRecipeCategory.UID;
+	}
+
+	@Override
+	public String getTitle()
+	{
+		return this.localizedName;
+	}
+
+	@Override
+	public IDrawable getBackground()
+	{
+		return this.background;
+	}
+
+	@Override
+	public void setRecipe(IRecipeLayout recipeLayout, GrinderRecipe recipe, IIngredients ingredients )
+	{
+		IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
+
+		itemStacks.init( 0, true, 0, 0 );
+		itemStacks.init( 1, false, 100, 46 );
+		itemStacks.init( 2, false, 118, 46 );
+		itemStacks.init( 3, false, 136, 46 );
+
+		itemStacks.set( ingredients );
+	}
+
+	@Override
+	public Class<? extends GrinderRecipe> getRecipeClass() {
+		return GrinderRecipe.class;
+	}
+
+	@Override
+	public IDrawable getIcon() {
+		return icon;
+	}
+
+	@Override
+	public void setIngredients(GrinderRecipe recipe, IIngredients ingredients) {
+		ingredients.setInputIngredients(Collections.singletonList(recipe.getIngredient()));
+		List<ItemStack> outputs = new ArrayList<>( 3 );
+		outputs.add( recipe.getRecipeOutput() );
+		for (GrinderOptionalResult optionalResult : recipe.getOptionalResults()) {
+			outputs.add(optionalResult.getResult());
+		}
+		ingredients.setOutputs( VanillaTypes.ITEM, outputs );
+	}
+
+// FIXME USE SPECIAL INGREDIENT TYPE
+// FIXME	@Override
+// FIXME	public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
+// FIXME	{
+// FIXME
+// FIXME		FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
+// FIXME
+// FIXME		int x = 118;
+// FIXME
+// FIXME		final float scale = 0.85f;
+// FIXME		final float invScale = 1 / scale;
+// FIXME		GlStateManager.scale( scale, scale, 1 );
+// FIXME
+// FIXME		if( this.recipe.getOptionalOutput() != null )
+// FIXME		{
+// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getOptionalChance() * 100 ) );
+// FIXME			float width = fr.getStringWidth( text ) * scale;
+// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+// FIXME			x += 18;
+// FIXME		}
+// FIXME
+// FIXME		if( this.recipe.getSecondOptionalOutput() != null )
+// FIXME		{
+// FIXME			String text = String.format( "%d%%", (int) ( this.recipe.getSecondOptionalChance() * 100 ) );
+// FIXME			float width = fr.getStringWidth( text ) * scale;
+// FIXME			int xScaled = Math.round( ( x + ( 18 - width ) / 2 ) * invScale );
+// FIXME			fr.drawString( text, xScaled, (int) ( 65 * invScale ), Color.gray.getRGB() );
+// FIXME		}
+// FIXME
+// FIXME		GlStateManager.scale( invScale, invScale, 1 );
+// FIXME	}
+
+}
diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
new file mode 100644
index 000000000..0da266a18
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
@@ -0,0 +1,127 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.core.Api;
+import appeng.core.AppEng;
+import appeng.recipes.handlers.InscriberRecipe;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.gui.*;
+import mezz.jei.api.gui.drawable.IDrawable;
+import mezz.jei.api.gui.drawable.IDrawableAnimated;
+import mezz.jei.api.gui.drawable.IDrawableStatic;
+import mezz.jei.api.gui.ingredient.IGuiItemStackGroup;
+import mezz.jei.api.helpers.IGuiHelper;
+import mezz.jei.api.ingredients.IIngredients;
+import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
+
+class InscriberRecipeCategory implements IRecipeCategory<InscriberRecipe>
+{
+
+	private static final int SLOT_INPUT_TOP = 0;
+	private static final int SLOT_INPUT_MIDDLE = 1;
+	private static final int SLOT_INPUT_BOTTOM = 2;
+	private static final int SLOT_OUTPUT = 3;
+
+	static final ResourceLocation UID = new ResourceLocation(AppEng.MOD_ID, "appliedenergistics2.inscriber");
+
+	private final IDrawable background;
+
+	private final String localizedName;
+
+	private final IDrawableAnimated progress;
+
+	private final IDrawable icon;
+
+	public InscriberRecipeCategory( IGuiHelper guiHelper )
+	{
+		ResourceLocation location = new ResourceLocation( AppEng.MOD_ID, "textures/guis/inscriber.png" );
+		this.background = guiHelper.createDrawable( location, 44, 15, 97, 64 );
+		this.localizedName = I18n.format( "tile.appliedenergistics2.inscriber.name" );
+
+		IDrawableStatic progressDrawable = guiHelper.drawableBuilder( location, 135, 177, 6, 18 )
+				.addPadding(24, 0, 91, 0)
+				.build();
+		this.progress = guiHelper.createAnimatedDrawable( progressDrawable, 40, IDrawableAnimated.StartDirection.BOTTOM, false );
+
+		this.icon = guiHelper.createDrawableIngredient(Api.INSTANCE.definitions().blocks().inscriber().stack(1));
+	}
+
+	@Override
+	public ResourceLocation getUid()
+	{
+		return UID;
+	}
+
+	@Override
+	public String getTitle()
+	{
+		return this.localizedName;
+	}
+
+	@Override
+	public IDrawable getBackground()
+	{
+		return this.background;
+	}
+
+	@Override
+	public void setRecipe(IRecipeLayout recipeLayout, InscriberRecipe recipeWrapper, IIngredients ingredients )
+	{
+		IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
+
+		itemStacks.init( SLOT_INPUT_TOP, true, 0, 0 );
+		itemStacks.init( SLOT_INPUT_MIDDLE, true, 18, 23 );
+		itemStacks.init( SLOT_INPUT_BOTTOM, true, 0, 46 );
+		itemStacks.init( SLOT_OUTPUT, false, 68, 24 );
+
+		itemStacks.set( ingredients );
+	}
+
+	@Override
+	public Class<? extends InscriberRecipe> getRecipeClass() {
+		return InscriberRecipe.class;
+	}
+
+	@Override
+	public IDrawable getIcon() {
+		return this.icon;
+	}
+
+	@Override
+	public void setIngredients(InscriberRecipe recipe, IIngredients ingredients) {
+
+// FIXME		List<List<ItemStack>> inputSlots = new ArrayList<>( 3 );
+// FIXME		inputSlots.add( Collections.singletonList( recipe.getTopOptional() ) );
+// FIXME		inputSlots.add( recipe.getInputs() );
+// FIXME		inputSlots.add( Collections.singletonList( recipe.getBottomOptional() ) );
+// FIXME		ingredients.setInputLists(VanillaTypes.ITEM, inputSlots );
+
+		ingredients.setOutput( VanillaTypes.ITEM, recipe.getOutput() );
+	}
+
+	@Override
+	public void draw(InscriberRecipe recipe, double mouseX, double mouseY) {
+		this.progress.draw();
+	}
+}
diff --git a/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java b/src/main/java/appeng/integration/modules/jei/JEIModule.java
similarity index 50%
rename from src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java
rename to src/main/java/appeng/integration/modules/jei/JEIModule.java
index bc26cf4f2..a20314f25 100644
--- a/src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java
+++ b/src/main/java/appeng/integration/modules/jei/JEIModule.java
@@ -16,37 +16,43 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.bootstrap.components;
+package appeng.integration.modules.jei;
 
 
-import com.google.common.base.Preconditions;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import appeng.integration.abstraction.IJEI;
 
-import java.util.HashMap;
-import java.util.Map;
 
-@OnlyIn( Dist.CLIENT )
-public class BuiltInModelComponent implements IPreInitComponent
+public class JEIModule implements IJEI
 {
 
-	private final Map<String, IUnbakedModel> builtInModels = new HashMap<>();
+	private IJEI jei = new IJEI.Stub();
 
-	private boolean hasInitialized = false;
-
-	public void addModel( String path, IUnbakedModel model )
+	public void setJei( IJEI jei )
 	{
-		Preconditions.checkState( !this.hasInitialized );
-		this.builtInModels.put( path, model );
+		this.jei = jei;
+	}
+
+	public IJEI getJei()
+	{
+		return this.jei;
 	}
 
 	@Override
-	public void preInitialize( Dist dist )
+	public String getSearchText()
 	{
-		this.hasInitialized = true;
-//
-//		BuiltInModelLoader loader = new BuiltInModelLoader( this.builtInModels );
-//		ModelLoaderRegistry.registerLoader( loader );
+		return this.jei.getSearchText();
 	}
+
+	@Override
+	public void setSearchText( String searchText )
+	{
+		this.jei.setSearchText( searchText );
+	}
+
+	@Override
+	public boolean isEnabled()
+	{
+		return this.jei.isEnabled();
+	}
+
 }
diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java
new file mode 100644
index 000000000..e2263a66b
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java
@@ -0,0 +1,190 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.api.AEApi;
+import appeng.api.config.CondenserOutput;
+import appeng.api.definitions.IDefinitions;
+import appeng.api.definitions.IItemDefinition;
+import appeng.api.definitions.IMaterials;
+import appeng.api.features.AEFeature;
+import appeng.container.implementations.ContainerCraftingTerm;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.core.AEConfig;
+import appeng.core.AppEng;
+import appeng.core.localization.GuiText;
+import appeng.recipes.handlers.GrinderRecipe;
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.IModPlugin;
+import mezz.jei.api.JeiPlugin;
+import mezz.jei.api.constants.VanillaRecipeCategoryUid;
+import mezz.jei.api.constants.VanillaTypes;
+import mezz.jei.api.registration.*;
+import mezz.jei.api.runtime.IJeiRuntime;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.RecipeManager;
+import net.minecraft.util.ResourceLocation;
+
+import java.util.Optional;
+
+
+@JeiPlugin
+public class JEIPlugin implements IModPlugin
+{
+	private static final ResourceLocation ID = new ResourceLocation(AppEng.MOD_ID, "core");
+
+	@Override
+	public ResourceLocation getPluginUid() {
+		return ID;
+	}
+
+	@Override
+	public void registerItemSubtypes( ISubtypeRegistration subtypeRegistry )
+	{
+		final Optional<Item> maybeFacade = AEApi.instance().definitions().items().facade().maybeItem();
+		maybeFacade.ifPresent( subtypeRegistry::useNbtForSubtypes );
+	}
+
+	@Override
+	public void registerCategories( IRecipeCategoryRegistration registry )
+	{
+		registry.addRecipeCategories( new GrinderRecipeCategory( registry.getJeiHelpers().getGuiHelper() ),
+		 new CondenserCategory( registry.getJeiHelpers().getGuiHelper() ),
+		 new InscriberRecipeCategory( registry.getJeiHelpers().getGuiHelper() ) );
+	}
+
+	@Override
+	public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
+		// Allow recipe transfer from JEI to crafting and pattern terminal
+		registration
+				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ),
+						VanillaRecipeCategoryUid.CRAFTING );
+		registration
+				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
+						VanillaRecipeCategoryUid.CRAFTING );
+	}
+
+	@Override
+	public void registerRecipes(IRecipeRegistration registration) {
+
+		IDefinitions definitions = AEApi.instance().definitions();
+
+//	FIXME	 Optional<Item> itemFacade = definitions.items().facade().maybeItem();
+//	FIXME	 Optional<ItemStack> cableAnchor = definitions.parts().cableAnchor().maybeStack( 1 );
+//	FIXME	 if( itemFacade.isPresent() && cableAnchor.isPresent() && AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_FACADE_CRAFTING ) )
+//	FIXME	 {
+//	FIXME	 	registration.addRecipeRegistryPlugin( new FacadeRegistryPlugin( (ItemFacade) itemFacade.get(), cableAnchor.get() ) );
+//	FIXME	 }
+
+		ItemStack condenser = definitions.blocks().condenser().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+		if(!condenser.isEmpty()) {
+			ItemStack matterBall = definitions.materials().matterBall().maybeStack(1).orElse(ItemStack.EMPTY);
+			if (!matterBall.isEmpty()) {
+				registration.addRecipes(ImmutableList.of(CondenserOutput.MATTER_BALLS), CondenserCategory.UID);
+			}
+			ItemStack singularity = definitions.materials().singularity().maybeStack(1).orElse(ItemStack.EMPTY);
+			if (!singularity.isEmpty()) {
+				registration.addRecipes(ImmutableList.of(CondenserOutput.SINGULARITY), CondenserCategory.UID);
+			}
+		}
+
+		RecipeManager recipeManager = Minecraft.getInstance().world.getRecipeManager();
+		registration.addRecipes(recipeManager.getRecipes(GrinderRecipe.TYPE).values(), GrinderRecipeCategory.UID);
+		// FIXME registration.addRecipes( recipeManager.getRecipes(InscriberRecipe.TYPE), InscriberRecipeCategory.UID );
+		registration.addRecipes(ImmutableList.of(CondenserOutput.MATTER_BALLS, CondenserOutput.SINGULARITY), CondenserCategory.UID);
+	}
+
+	@Override
+	public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
+		IDefinitions definitions = AEApi.instance().definitions();
+
+		ItemStack grindstone = definitions.blocks().grindstone().maybeStack( 1 ).orElse( ItemStack.EMPTY );
+		if( !grindstone.isEmpty() )
+		{
+			registration.addRecipeCatalyst( grindstone, GrinderRecipeCategory.UID );
+		}
+
+		definitions.blocks().condenser().maybeStack( 1 ).ifPresent(condenser -> {
+			registration.addRecipeCatalyst(condenser, CondenserCategory.UID);
+		});
+
+		// Register the inscriber as the crafting item for the inscription category
+		definitions.blocks().inscriber().maybeStack( 1 ).ifPresent( inscriber ->
+		{
+			registration.addRecipeCatalyst( inscriber, InscriberRecipeCategory.UID );
+		} );
+
+	}
+
+	private void registerDescriptions(IDefinitions definitions, IRecipeRegistration registry )
+	{
+		IMaterials materials = definitions.materials();
+
+		final String message;
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.CERTUS_QUARTZ_WORLD_GEN ) )
+		{
+			message = GuiText.ChargedQuartz.getLocal() + "\n\n" + GuiText.ChargedQuartzFind.getLocal();
+		}
+		else
+		{
+			message = GuiText.ChargedQuartzFind.getLocal();
+		}
+		this.addDescription( registry, materials.certusQuartzCrystalCharged(), message );
+
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.METEORITE_WORLD_GEN ) )
+		{
+			this.addDescription( registry, materials.logicProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() );
+			this.addDescription( registry, materials.calcProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() );
+			this.addDescription( registry, materials.engProcessorPress(), GuiText.inWorldCraftingPresses.getLocal() );
+		}
+
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_FLUIX ) )
+		{
+			this.addDescription( registry, materials.fluixCrystal(), GuiText.inWorldFluix.getLocal() );
+		}
+
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_SINGULARITY ) )
+		{
+			this.addDescription( registry, materials.qESingularity(), GuiText.inWorldSingularity.getLocal() );
+		}
+
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.IN_WORLD_PURIFICATION ) )
+		{
+			this.addDescription( registry, materials.purifiedCertusQuartzCrystal(), GuiText.inWorldPurificationCertus.getLocal() );
+			this.addDescription( registry, materials.purifiedNetherQuartzCrystal(), GuiText.inWorldPurificationNether.getLocal() );
+			this.addDescription( registry, materials.purifiedFluixCrystal(), GuiText.inWorldPurificationFluix.getLocal() );
+		}
+
+	}
+
+	private void addDescription(IRecipeRegistration registry, IItemDefinition itemDefinition, String message )
+	{
+		itemDefinition.maybeStack( 1 ).ifPresent( itemStack -> registry.addIngredientInfo( itemStack, VanillaTypes.ITEM, message ) );
+	}
+
+	@Override
+	public void onRuntimeAvailable( IJeiRuntime jeiRuntime )
+	{
+// FIXME JEIModule jeiModule = (JEIModule) Integrations.jei();
+// FIXME jeiModule.setJei( new JeiRuntimeAdapter( jeiRuntime ) );
+	}
+}
diff --git a/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java b/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java
new file mode 100644
index 000000000..25ffbc162
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java
@@ -0,0 +1,53 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.integration.abstraction.IJEI;
+import com.google.common.base.Strings;
+import mezz.jei.api.runtime.IJeiRuntime;
+
+class JeiRuntimeAdapter implements IJEI
+{
+
+	private final IJeiRuntime runtime;
+
+	JeiRuntimeAdapter( IJeiRuntime jeiRuntime )
+	{
+		this.runtime = jeiRuntime;
+	}
+
+	@Override
+	public boolean isEnabled()
+	{
+		return true;
+	}
+
+	@Override
+	public String getSearchText()
+	{
+		return Strings.nullToEmpty( this.runtime.getIngredientFilter().getFilterText() );
+	}
+
+	@Override
+	public void setSearchText( String searchText )
+	{
+		this.runtime.getIngredientFilter().setFilterText( Strings.nullToEmpty( searchText ) );
+	}
+}
diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
new file mode 100644
index 000000000..aca900b17
--- /dev/null
+++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
@@ -0,0 +1,131 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.jei;
+
+
+import appeng.container.slot.SlotCraftingMatrix;
+import appeng.container.slot.SlotFakeCraftingMatrix;
+import appeng.core.AELog;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketJEIRecipe;
+import appeng.util.Platform;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.gui.ingredient.IGuiIngredient;
+import mezz.jei.api.recipe.transfer.IRecipeTransferError;
+import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.ListNBT;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandler<T>
+{
+
+	private final Class<T> containerClass;
+
+	RecipeTransferHandler( Class<T> containerClass )
+	{
+		this.containerClass = containerClass;
+	}
+
+	@Override
+	public Class<T> getContainerClass()
+	{
+		return this.containerClass;
+	}
+
+	@Nullable
+	@Override
+	public IRecipeTransferError transferRecipe(T container, IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer, boolean doTransfer) {
+		if( !doTransfer )
+		{
+			return null;
+		}
+
+		Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks().getGuiIngredients();
+
+		final CompoundNBT recipe = new CompoundNBT();
+
+		int slotIndex = 0;
+		for( Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet() )
+		{
+			IGuiIngredient<ItemStack> ingredient = ingredientEntry.getValue();
+			if( !ingredient.isInput() )
+			{
+				continue;
+			}
+
+			for( final Slot slot : container.inventorySlots )
+			{
+				if( slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix)
+				{
+					if( slot.getSlotIndex() == slotIndex )
+					{
+						final ListNBT tags = new ListNBT();
+						final List<ItemStack> list = new ArrayList<>();
+						final ItemStack displayed = ingredient.getDisplayedIngredient();
+
+						// prefer currently displayed item
+						if( displayed != null && !displayed.isEmpty() )
+						{
+							list.add( displayed );
+						}
+
+						// prefer pure crystals.
+						for( ItemStack stack : ingredient.getAllIngredients() )
+						{
+							if( Platform.isRecipePrioritized( stack ) )
+							{
+								list.add( 0, stack );
+							}
+							else
+							{
+								list.add( stack );
+							}
+						}
+
+						for( final ItemStack is : list )
+						{
+							final CompoundNBT tag = new CompoundNBT();
+							is.write( tag );
+							tags.add( tag );
+						}
+
+						recipe.put( "#" + slot.getSlotIndex(), tags );
+						break;
+					}
+				}
+			}
+
+			slotIndex++;
+		}
+
+		NetworkHandler.instance().sendToServer( new PacketJEIRecipe( recipe ) );
+
+		return null;
+	}
+}
diff --git a/src/main/java/appeng/recipes/handlers/GrinderHandler.java b/src/main/java/appeng/recipes/handlers/GrinderHandler.java
deleted file mode 100644
index dc6f8f0d6..000000000
--- a/src/main/java/appeng/recipes/handlers/GrinderHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package appeng.recipes.handlers;
-
-
-import com.google.gson.JsonObject;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.JSONUtils;
-import net.minecraftforge.common.crafting.CraftingHelper;
-import net.minecraftforge.common.crafting.JsonContext;
-
-import appeng.api.AEApi;
-import appeng.api.features.IGrinderRecipeBuilder;
-import appeng.api.features.IGrinderRegistry;
-import appeng.recipes.IAERecipeFactory;
-import appeng.recipes.factories.recipes.PartRecipeFactory;
-
-
-public class GrinderHandler implements IAERecipeFactory
-{
-
-	@Override
-	public void register( JsonObject json, JsonContext ctx )
-	{
-		// TODO only primary for now
-
-		JsonObject result = JSONUtils.getJsonObject( json, "result" );
-		ItemStack primary = PartRecipeFactory.getResult( result, ctx, "primary" );
-		ItemStack[] input = CraftingHelper.getIngredient( json.get( "input" ), ctx ).getMatchingStacks();
-
-		int turns = 5;
-		if( json.has( "turns" ) )
-		{
-			turns = JSONUtils.getInt( json, "turns" );
-		}
-
-		final IGrinderRegistry reg = AEApi.instance().registries().grinder();
-		for( int i = 0; i < input.length; ++i )
-		{
-			final IGrinderRecipeBuilder builder = reg.builder();
-
-			builder.withOutput( primary );
-			builder.withInput( input[i] );
-			builder.withTurns( turns );
-
-			reg.addRecipe( builder.build() );
-		}
-	}
-}
diff --git a/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java b/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java
new file mode 100644
index 000000000..bb10c43d2
--- /dev/null
+++ b/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java
@@ -0,0 +1,27 @@
+package appeng.recipes.handlers;
+
+import net.minecraft.item.ItemStack;
+
+/**
+ * Describes an optional result of a grinder recipe.
+ */
+public class GrinderOptionalResult {
+    private final float chance;
+    private final ItemStack result;
+
+    public GrinderOptionalResult(float chance, ItemStack result) {
+        this.chance = chance;
+        this.result = result;
+    }
+
+    /**
+     * Chance to occur from 0 (0%) to 1 (100%).
+     */
+    public float getChance() {
+        return chance;
+    }
+
+    public ItemStack getResult() {
+        return result;
+    }
+}
diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipe.java b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java
new file mode 100644
index 000000000..7bed904ca
--- /dev/null
+++ b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java
@@ -0,0 +1,86 @@
+package appeng.recipes.handlers;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.IRecipeSerializer;
+import net.minecraft.item.crafting.IRecipeType;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+public class GrinderRecipe implements IRecipe<IInventory> {
+
+    public static IRecipeType<GrinderRecipe> TYPE;
+
+    private final ResourceLocation id;
+    private final String group;
+    private final Ingredient ingredient;
+    private final ItemStack result;
+    private final List<GrinderOptionalResult> optionalResults;
+    private final int turns;
+
+    public GrinderRecipe(ResourceLocation id, String group, Ingredient ingredient, ItemStack result, int turns, List<GrinderOptionalResult> optionalResults) {
+        this.id = id;
+        this.group = group;
+        this.ingredient = ingredient;
+        this.result = result;
+        this.turns = turns;
+        this.optionalResults = ImmutableList.copyOf(optionalResults);
+    }
+    @Override
+    public boolean matches(IInventory inv, World worldIn) {
+        return this.ingredient.test(inv.getStackInSlot(0));
+    }
+
+    @Override
+    public ItemStack getCraftingResult(IInventory inv) {
+        // FIXME: What about secondary output
+        return this.result.copy();
+    }
+
+    @Override
+    public boolean canFit(int width, int height) {
+        return true;
+    }
+
+    @Override
+    public ItemStack getRecipeOutput() {
+        return result;
+    }
+
+    @Override
+    public ResourceLocation getId() {
+        return id;
+    }
+
+    @Override
+    public IRecipeSerializer<?> getSerializer() {
+        return GrinderRecipeSerializer.INSTANCE;
+    }
+
+    @Override
+    public IRecipeType<?> getType() {
+        return TYPE;
+    }
+
+    public Ingredient getIngredient() {
+        return ingredient;
+    }
+
+    @Override
+    public NonNullList<Ingredient> getIngredients() {
+        NonNullList<Ingredient> nonnulllist = NonNullList.create();
+        nonnulllist.add(this.ingredient);
+        return nonnulllist;
+    }
+
+    public List<GrinderOptionalResult> getOptionalResults() {
+        return optionalResults;
+    }
+
+}
diff --git a/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
new file mode 100644
index 000000000..aa72a7f83
--- /dev/null
+++ b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
@@ -0,0 +1,69 @@
+package appeng.recipes.handlers;
+
+import appeng.core.AppEng;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipeSerializer;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.item.crafting.ShapedRecipe;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.JSONUtils;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.registries.ForgeRegistryEntry;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class GrinderRecipeSerializer extends ForgeRegistryEntry<IRecipeSerializer<?>> implements IRecipeSerializer<GrinderRecipe> {
+
+    public static final GrinderRecipeSerializer INSTANCE = new GrinderRecipeSerializer();
+
+    static {
+        INSTANCE.setRegistryName(AppEng.MOD_ID, "grinder");
+    }
+
+    private GrinderRecipeSerializer() {
+    }
+
+    @Override
+    public GrinderRecipe read(ResourceLocation recipeId, JsonObject json) {
+        String group = JSONUtils.getString(json, "group", "");
+        Ingredient ingredient = Ingredient.deserialize(JSONUtils.getJsonObject(json, "input"));
+
+        JsonObject result = JSONUtils.getJsonObject(json, "result");
+        ItemStack primaryResult = ShapedRecipe.deserializeItem(JSONUtils.getJsonObject(result, "primary"));
+        JsonArray optionalResultsJson = JSONUtils.getJsonArray(result, "optional", null);
+        List<GrinderOptionalResult> optionalResults = Collections.emptyList();
+        if (optionalResultsJson != null) {
+            optionalResults = new ArrayList<>(optionalResultsJson.size());
+            for (JsonElement optionalResultJson : optionalResultsJson) {
+                if (!optionalResultJson.isJsonObject()) {
+                    throw new IllegalStateException("Entry in optional result list should be an object.");
+                }
+                ItemStack optionalResultItem = ShapedRecipe.deserializeItem(optionalResultJson.getAsJsonObject());
+                float optionalChance = JSONUtils.getFloat(optionalResultJson.getAsJsonObject(), "chance", 1.0f);
+                optionalResults.add(new GrinderOptionalResult(optionalChance, optionalResultItem));
+            }
+        }
+
+        int turns = JSONUtils.getInt(json, "turns", 8);
+
+        return new GrinderRecipe(recipeId, group, ingredient, primaryResult, turns, optionalResults);
+    }
+
+    @Nullable
+    @Override
+    public GrinderRecipe read(ResourceLocation recipeId, PacketBuffer buffer) {
+        return null;
+    }
+
+    @Override
+    public void write(PacketBuffer buffer, GrinderRecipe recipe) {
+
+    }
+
+}
diff --git a/src/main/java/appeng/recipes/handlers/InscriberHandler.java b/src/main/java/appeng/recipes/handlers/InscriberHandler.java
index 89a048d62..bac0dea1b 100644
--- a/src/main/java/appeng/recipes/handlers/InscriberHandler.java
+++ b/src/main/java/appeng/recipes/handlers/InscriberHandler.java
@@ -2,70 +2,55 @@
 package appeng.recipes.handlers;
 
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.google.gson.JsonObject;
 
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.JSONUtils;
-import net.minecraftforge.common.crafting.CraftingHelper;
-import net.minecraftforge.common.crafting.JsonContext;
 
-import appeng.api.AEApi;
-import appeng.api.features.IInscriberRecipeBuilder;
-import appeng.api.features.IInscriberRegistry;
-import appeng.api.features.InscriberProcessType;
-import appeng.recipes.IAERecipeFactory;
-import appeng.recipes.factories.recipes.PartRecipeFactory;
-
-
-public class InscriberHandler implements IAERecipeFactory
+public class InscriberHandler
 {
 
-	@Override
-	public void register( JsonObject json, JsonContext ctx )
-	{
-		ItemStack result = PartRecipeFactory.getResult( json, ctx );
-		String mode = JSONUtils.getString( json, "mode" );
-
-		JsonObject ingredients = JSONUtils.getJsonObject( json, "ingredients" );
-
-		List<ItemStack> middle = Arrays.asList( CraftingHelper.getIngredient( ingredients.get( "middle" ), ctx ).getMatchingStacks() );
-		ItemStack[] top = new ItemStack[] { null };
-		if( ingredients.has( "top" ) )
-		{
-			top = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "top" ), ctx ).getMatchingStacks();
-		}
-
-		ItemStack[] bottom = new ItemStack[] { null };
-		if( ingredients.has( "bottom" ) )
-		{
-			bottom = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "bottom" ), ctx ).getMatchingStacks();
-		}
-
-		final IInscriberRegistry reg = AEApi.instance().registries().inscriber();
-		for( int i = 0; i < top.length; ++i )
-		{
-			for( int j = 0; j < bottom.length; ++j )
-			{
-				final IInscriberRecipeBuilder builder = reg.builder();
-				builder.withOutput( result );
-				builder.withProcessType( "press".equals( mode ) ? InscriberProcessType.PRESS : InscriberProcessType.INSCRIBE );
-				builder.withInputs( middle );
-
-				if( top[i] != null )
-				{
-					builder.withTopOptional( top[i] );
-				}
-				if( bottom[j] != null )
-				{
-					builder.withBottomOptional( bottom[j] );
-				}
-
-				reg.addRecipe( builder.build() );
-			}
-		}
-	}
-
+//	@Override
+//	public void register( JsonObject json, JsonContext ctx )
+//	{
+//		ItemStack result = PartRecipeFactory.getResult( json, ctx );
+//		String mode = JSONUtils.getString( json, "mode" );
+//
+//		JsonObject ingredients = JSONUtils.getJsonObject( json, "ingredients" );
+//
+//		List<ItemStack> middle = Arrays.asList( CraftingHelper.getIngredient( ingredients.get( "middle" ), ctx ).getMatchingStacks() );
+//		ItemStack[] top = new ItemStack[] { null };
+//		if( ingredients.has( "top" ) )
+//		{
+//			top = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "top" ), ctx ).getMatchingStacks();
+//		}
+//
+//		ItemStack[] bottom = new ItemStack[] { null };
+//		if( ingredients.has( "bottom" ) )
+//		{
+//			bottom = CraftingHelper.getIngredient( JSONUtils.getJsonObject( ingredients, "bottom" ), ctx ).getMatchingStacks();
+//		}
+//
+//		final IInscriberRegistry reg = AEApi.instance().registries().inscriber();
+//		for( int i = 0; i < top.length; ++i )
+//		{
+//			for( int j = 0; j < bottom.length; ++j )
+//			{
+//				final IInscriberRecipeBuilder builder = reg.builder();
+//				builder.withOutput( result );
+//				builder.withProcessType( "press".equals( mode ) ? InscriberProcessType.PRESS : InscriberProcessType.INSCRIBE );
+//				builder.withInputs( middle );
+//
+//				if( top[i] != null )
+//				{
+//					builder.withTopOptional( top[i] );
+//				}
+//				if( bottom[j] != null )
+//				{
+//					builder.withBottomOptional( bottom[j] );
+//				}
+//
+//				reg.addRecipe( builder.build() );
+//			}
+//		}
+//	}
+//
 }
diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java
new file mode 100644
index 000000000..d9184a11f
--- /dev/null
+++ b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java
@@ -0,0 +1,90 @@
+package appeng.recipes.handlers;
+
+import appeng.api.features.InscriberProcessType;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.IRecipeSerializer;
+import net.minecraft.item.crafting.IRecipeType;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+public class InscriberRecipe implements IRecipe<IInventory> {
+
+    public static IRecipeType<InscriberRecipe> TYPE;
+
+    private final ResourceLocation id;
+    private final String group;
+
+    private List<Ingredient> inputs;
+    private ItemStack output;
+    private ItemStack topOptional;
+    private ItemStack bottomOptional;
+    private InscriberProcessType type;
+
+    public InscriberRecipe(ResourceLocation id, String group, List<Ingredient> inputs, ItemStack output, ItemStack topOptional, ItemStack bottomOptional, InscriberProcessType type) {
+        this.id = id;
+        this.group = group;
+        this.inputs = inputs;
+        this.output = output;
+        this.topOptional = topOptional;
+        this.bottomOptional = bottomOptional;
+        this.type = type;
+    }
+
+    @Override
+    public boolean matches(IInventory inv, World worldIn) {
+        return false;
+    }
+
+    @Override
+    public ItemStack getCraftingResult(IInventory inv) {
+        return null;
+    }
+
+    @Override
+    public boolean canFit(int width, int height) {
+        return false;
+    }
+
+    @Override
+    public ItemStack getRecipeOutput() {
+        return null;
+    }
+
+    @Override
+    public ResourceLocation getId() {
+        return null;
+    }
+
+    @Override
+    public IRecipeSerializer<?> getSerializer() {
+        return null;
+    }
+
+    @Override
+    public IRecipeType<?> getType() {
+        return TYPE;
+    }
+
+    public List<Ingredient> getInputs() {
+        return inputs;
+    }
+
+    public ItemStack getOutput() {
+        return output;
+    }
+
+    public ItemStack getTopOptional() {
+        return topOptional;
+    }
+
+    public ItemStack getBottomOptional() {
+        return bottomOptional;
+    }
+
+}
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index 913c27043..a0d02aac6 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -22,6 +22,7 @@ package appeng.util;
 import appeng.api.AEApi;
 import appeng.api.config.*;
 import appeng.api.definitions.IItemDefinition;
+import appeng.api.definitions.IMaterials;
 import appeng.api.features.AEFeature;
 import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.api.implementations.items.IAEWrench;
@@ -1562,15 +1563,15 @@ public class Platform
 //	// p.addStat( achievement, 1 );
 //	// }
 //	// }
-//
-//	public static boolean isRecipePrioritized( final ItemStack what )
-//	{
-//		final IMaterials materials = AEApi.instance().definitions().materials();
-//
-//		boolean isPurified = materials.purifiedCertusQuartzCrystal().isSameAs( what );
-//		isPurified |= materials.purifiedFluixCrystal().isSameAs( what );
-//		isPurified |= materials.purifiedNetherQuartzCrystal().isSameAs( what );
-//
-//		return isPurified;
-//	}
+
+	public static boolean isRecipePrioritized( final ItemStack what )
+	{
+		final IMaterials materials = AEApi.instance().definitions().materials();
+
+		boolean isPurified = materials.purifiedCertusQuartzCrystal().isSameAs( what );
+		isPurified |= materials.purifiedFluixCrystal().isSameAs( what );
+		isPurified |= materials.purifiedNetherQuartzCrystal().isSameAs( what );
+
+		return isPurified;
+	}
 }
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
index 26df3a933..0f2bc595c 100644
--- a/src/main/resources/META-INF/accesstransformer.cfg
+++ b/src/main/resources/META-INF/accesstransformer.cfg
@@ -10,3 +10,6 @@ protected net.minecraft.client.particle.RedstoneParticle <init>(Lnet/minecraft/w
 
 # We need to change yPos of existing slots to resize the container
 public-f net.minecraft.inventory.container.Slot field_75221_f # yPos
+
+# For JEI registration
+public net.minecraft.item.crafting.RecipeManager func_215366_a(Lnet/minecraft/item/crafting/IRecipeType;)Ljava/util/Map; # getRecipes
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json
index 8c87024d9..f7ac3902e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json
@@ -1,7 +1,6 @@
 {
   "result": {
-    "item": "minecraft:quartz_block",
-    "data": 0
+    "item": "minecraft:quartz_block"
   },
   "type": "minecraft:crafting_shaped",
   "pattern": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json
index e34b5bea4..d968d5cb3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json
@@ -12,7 +12,7 @@
       "item": "minecraft:iron_ingot"
     },
     "a": {
-      "item": "appliedenergistics2:certus_quartz_crystal_charged"
+      "item": "appliedenergistics2:charged_certus_quartz_crystal"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json
deleted file mode 100644
index 20bdfd3ff..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_chiseled_quartz.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:chiseled_quartz_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:chiseled_quartz_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json
deleted file mode 100644
index 1a2e2a8b2..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_fluix.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:fluix_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:fluix_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json
deleted file mode 100644
index 40d8d3a9b..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:quartz_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:quartz_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json
deleted file mode 100644
index 576fef98e..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_quartz_pillar.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:quartz_pillar_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:quartz_pillar"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json
deleted file mode 100644
index 61353d15d..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json
deleted file mode 100644
index a51ab64c7..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_brick.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_brick_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_brick"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json
deleted file mode 100644
index 7bf9a32bb..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_sky_stone_small_brick.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_small_brick_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_small_brick"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json
deleted file mode 100644
index 91c066b29..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/slabs_smooth_sky_stone.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:smooth_sky_stone_slab",
-    "data": 0,
-    "count": 6
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:smooth_sky_stone_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json
deleted file mode 100644
index 76d5aa374..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_chiseled_quartz.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:chiseled_quartz_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:chiseled_quartz_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json
deleted file mode 100644
index 5bc294a79..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_fluix.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:fluix_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:fluix_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json
deleted file mode 100644
index 7f4450556..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:quartz_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:quartz_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json
deleted file mode 100644
index f3e6f8b89..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_quartz_pillar.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:quartz_pillar_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:quartz_pillar"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json
deleted file mode 100644
index e705f8e4b..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json
deleted file mode 100644
index deefb630b..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_brick.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_brick_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_brick"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json
deleted file mode 100644
index 718083387..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_sky_stone_small_brick.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:sky_stone_small_brick_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:sky_stone_small_brick"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json
deleted file mode 100644
index 6aed8ddef..000000000
--- a/src/main/resources/data/appliedenergistics2/recipes/decorative/stairs_smooth_sky_stone.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "result": {
-    "item": "appliedenergistics2:smooth_sky_stone_stairs",
-    "count": 4
-  },
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "a  ",
-    "aa ",
-    "aaa"
-  ],
-  "key": {
-    "a": {
-      "item": "appliedenergistics2:smooth_sky_stone_block"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json
index 2812a2a19..ff89b55ef 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json
@@ -5,8 +5,7 @@
   },
   "result": {
     "primary": {
-      "item": "minecraft:dye",
-      "data": 15,
+      "item": "minecraft:bone_meal",
       "count": 4
     }
   },
diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json
index b58c80904..6b9ba2520 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json
@@ -5,7 +5,7 @@
   },
   "result": {
     "primary": {
-      "part": "material.fluix_dust"
+      "item": "appliedenergistics2:fluix_dust"
     }
   },
   "turns": 8
diff --git a/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json
index 7e295430a..7581da816 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json
@@ -5,7 +5,7 @@
   },
   "result": {
     "primary": {
-      "part": "material.sky_dust"
+      "item": "appliedenergistics2:sky_dust"
     }
   },
   "turns": 8
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
index b1a37d238..3cb416200 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "press",
   "result": {
-    "part": "material.engineering_processor"
+    "item": "appliedenergistics2:engineering_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json
index d721957ec..2d67494fe 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.calculation_processor_press"
+    "item": "appliedenergistics2:calculation_processor_press"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
index efb65082f..6ef4bea3a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.calculation_processor_print"
+    "item": "appliedenergistics2:calculation_processor_print"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
index 201d14725..c0659d392 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "press",
   "result": {
-    "part": "material.calculation_processor"
+    "item": "appliedenergistics2:calculation_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json
index be407bcbf..759e3b73a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.engineering_processor_press"
+    "item": "appliedenergistics2:engineering_processor_press"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
index 9bb1408e9..0ccd03c7e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.engineering_processor_print"
+    "item": "appliedenergistics2:engineering_processor_print"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
index 84cf09e53..8a9d9136d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "press",
   "result": {
-    "part": "material.logic_processor"
+    "item": "appliedenergistics2:logic_processor"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json
index 92b1d48e6..b82af1b90 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.logic_processor_press"
+    "item": "appliedenergistics2:logic_processor_press"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
index 5fc934c6d..6855dd3e7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.logic_processor_print"
+    "item": "appliedenergistics2:logic_processor_print"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json
index bd2d37f0f..b00268f41 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.silicon_press"
+    "item": "appliedenergistics2:silicon_press"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
index 468084a42..0f69c19ef 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json
@@ -2,7 +2,7 @@
   "type": "appliedenergistics2:inscriber",
   "mode": "inscribe",
   "result": {
-    "part": "material.silicon_print"
+    "item": "appliedenergistics2:silicon_print"
   },
   "ingredients": {
     "top": {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json
index a684b14dc..87f9869a5 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json
@@ -1,16 +1,15 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.advanced_card"
+      "type": "appliedenergistics2:feature",
+      "features": ["ADVANCED_CARDS"]
     }
   ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.advanced_card",
+    "item": "appliedenergistics2:advanced_card",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "ab ",
     "cdb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json
index 05386cdba..a63a9f72e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json
@@ -1,16 +1,15 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.annihilation_core"
+      "type": "appliedenergistics2:feature",
+      "features": ["CORES"]
     }
   ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.annihilation_core",
+    "item": "appliedenergistics2:annihilation_core",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "abc"
   ],
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json
index 2b41bb760..be636003a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json
@@ -1,16 +1,15 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.basic_card"
+      "type": "appliedenergistics2:feature",
+      "features": ["BASIC_CARDS"]
     }
   ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.basic_card",
+    "item": "appliedenergistics2:basic_card",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "ab ",
     "cdb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json
index d849a3869..87e5099b9 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_capacity"
+      "type": "appliedenergistics2:feature",
+      "features": ["BASIC_CARDS"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_capacity"
+    "item": "appliedenergistics2:capacity_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:crystals/certus"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json
index 71087ad4e..5da23984a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_crafting"
+      "type": "appliedenergistics2:feature",
+      "features": ["ADVANCED_CARDS", "CRAFTING_CPU"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_crafting"
+    "item": "appliedenergistics2:crafting_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:workbench"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json
index 896868cf1..f8b0e9119 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_fuzzy"
+      "type": "appliedenergistics2:feature",
+      "features": ["ADVANCED_CARDS"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_fuzzy"
+    "item": "appliedenergistics2:fuzzy_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:advanced_card"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json
index 0e2714026..9147305f2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_inverter"
+      "type": "appliedenergistics2:feature",
+      "features": ["ADVANCED_CARDS"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_inverter"
+    "item": "appliedenergistics2:inverter_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:redstone_torch"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json
index 8473aab11..ceef2da0f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_redstone"
+      "type": "appliedenergistics2:feature",
+      "features": ["BASIC_CARDS"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_redstone"
+    "item": "appliedenergistics2:redstone_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:redstone_torch"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json
index a154f9b17..f3bbd660f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.card_speed"
+      "type": "appliedenergistics2:feature",
+      "features": ["ADVANCED_CARDS"]
     }
   ],
   "result": {
-    "item": "appliedenergistics2:card_speed"
+    "item": "appliedenergistics2:speed_card"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:advanced_card"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json
index 98bf62fc8..d1a9caf90 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json
@@ -1,16 +1,15 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.formation_core"
+      "type": "appliedenergistics2:feature",
+      "features": ["CORES"]
     }
   ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.formation_core",
+    "item": "appliedenergistics2:formation_core",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "abc"
   ],
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json
index a027dd33e..04f196255 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json
@@ -1,16 +1,9 @@
 {
-  "conditions": [
-    {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.certus_quartz_crystal"
-    }
-  ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.certus_quartz_crystal",
+    "item": "appliedenergistics2:certus_quartz_crystal",
     "count": 4
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:chiseled_quartz_block"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json
index d51cbff7e..cb33c59ff 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json
@@ -1,16 +1,9 @@
 {
-  "conditions": [
-    {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.certus_quartz_crystal"
-    }
-  ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.certus_quartz_crystal",
+    "item": "appliedenergistics2:certus_quartz_crystal",
     "count": 4
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:quartz_block"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json
index 9dcc686e4..abe9f1b3e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json
@@ -1,16 +1,9 @@
 {
-  "conditions": [
-    {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.certus_quartz_crystal"
-    }
-  ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.certus_quartz_crystal",
+    "item": "appliedenergistics2:certus_quartz_crystal",
     "count": 4
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:quartz_pillar"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json
index d8619ce8e..14f9556c2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json
@@ -1,16 +1,9 @@
 {
-  "conditions": [
-    {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.fluix_crystal"
-    }
-  ],
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.fluix_crystal",
+    "item": "appliedenergistics2:fluix_crystal",
     "count": 4
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:fluix_block"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json
index 313eb46b5..3ce72a30f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json
@@ -1,14 +1,8 @@
 {
-  "conditions": [
-    {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.fluix_pearl"
-    }
-  ],
   "result": {
     "item": "appliedenergistics2:fluix_pearl"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json
index 025619584..86948516a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json
@@ -1,14 +1,14 @@
 {
   "conditions": [
     {
-      "type": "appliedenergistics2:material_exists",
-      "material": "material.wooden_gear"
+      "type": "appliedenergistics2:feature",
+      "features": ["GRIND_STONE"]
     }
   ],
   "result": {
     "item": "appliedenergistics2:wooden_gear"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " a ",
     "a a",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json
index aceb4b09d..ce7b0d73d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json
@@ -13,7 +13,7 @@
       "tag": "forge:ingots/iron"
     },
     "b": {
-      "item": "appliedenergistics2:certus_quartz_crystal_charged"
+      "item": "appliedenergistics2:charged_certus_quartz_crystal"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json
index d507a0ac1..aed21e889 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "crystal_seed.certus",
+    "item": "appliedenergistics2:certus_crystal_seed",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "forge:sand"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json
index a5bbf30cc..102b00f9f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "crystal_seed.fluix",
+    "item": "appliedenergistics2:fluix_crystal_seed",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "forge:sand"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json
index ba90b27ec..de232c31d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "crystal_seed.nether",
+    "item": "appliedenergistics2:nether_crystal_seed",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "forge:sand"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json
index 72e342a42..2b97f2a72 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "b": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "d": {
       "item": "appliedenergistics2:fluix_block"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json
index ed6d40762..e30539002 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cable_fluid_interface"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:fluid_interface"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json
index 4caf5e0a7..a575f6026 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cable_interface"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:interface"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json
index 3cfae4d4e..2d44fde9c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json
@@ -22,7 +22,7 @@
       "item": "appliedenergistics2:logic_processor"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json
index 850a4232f..5883cb258 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "e": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "a": {
       "tag": "forge:ingots/iron"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
index 69dfc9108..3c1201b80 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json
@@ -22,7 +22,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json
index df7f5d181..af5d87644 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json
@@ -22,7 +22,7 @@
       "item": "appliedenergistics2:io_port"
     },
     "b": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json
index e0213bec2..261d23b61 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json
@@ -16,7 +16,7 @@
       "tag": "appliedenergistics2:dusts/fluix"
     },
     "b": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "d": {
       "tag": "appliedenergistics2:crystals/fluix"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json
index cf2d2650e..5170bbea3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json
@@ -19,7 +19,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "e": {
       "tag": "appliedenergistics2:crystals/fluix"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json
index 772aef4e8..8522ab87c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json
index 1ef02da3b..769d1993c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.black",
+    "item": "appliedenergistics2:black_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/black"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json
index 9127314d5..3c8a69f8b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.blue",
+    "item": "appliedenergistics2:blue_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json
index 69a38c348..07f4d2cca 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.brown",
+    "item": "appliedenergistics2:brown_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/brown"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json
index bd8fd3a05..fafa52100 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.cyan",
+    "item": "appliedenergistics2:cyan_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/cyan"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json
index f96b95a4e..925642ad2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json
@@ -1,14 +1,14 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_covered"
+    "item": "appliedenergistics2:fluix_covered_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:wool"
     },
     {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json
index ac82ffa31..1765671b3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_covered"
+    "item": "appliedenergistics2:fluix_covered_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:covered_cable"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json
index be676c022..2285417d2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.gray",
+    "item": "appliedenergistics2:gray_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/gray"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json
index ed2903065..763e022b2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.green",
+    "item": "appliedenergistics2:green_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/green"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json
index e98b3e053..148881282 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.light_blue",
+    "item": "appliedenergistics2:light_blue_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/light_blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json
index d6c58a9a9..903a50a1f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.light_gray",
+    "item": "appliedenergistics2:light_gray_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/light_gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json
index 7eb331b99..41813ea78 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.lime",
+    "item": "appliedenergistics2:lime_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/lime"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json
index ad4f2d2f7..49035423e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.magenta",
+    "item": "appliedenergistics2:magenta_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/magenta"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json
index 022266c00..304401f89 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.orange",
+    "item": "appliedenergistics2:orange_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/orange"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json
index d97286e33..1d24353bc 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.pink",
+    "item": "appliedenergistics2:pink_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/pink"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json
index ab2723d42..522aa8c08 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.purple",
+    "item": "appliedenergistics2:purple_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/purple"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json
index 4fcdebc08..11948cd89 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.red",
+    "item": "appliedenergistics2:red_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/red"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json
index 1268ef1d0..47faff4cd 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.white",
+    "item": "appliedenergistics2:white_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     "b": {
       "tag": "forge:dyes/white"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json
index 40970ab0b..9a06d5cdf 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_covered.yellow",
+    "item": "appliedenergistics2:yellow_covered_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/yellow"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json
index 239bde93d..63da1e203 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.black",
+    "item": "appliedenergistics2:black_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/black"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json
index 2d54a70d7..6e065218a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.blue",
+    "item": "appliedenergistics2:blue_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json
index 133fe16f0..67548a599 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.brown",
+    "item": "appliedenergistics2:brown_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/brown"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json
index 532328f33..73e4bfc2d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.cyan",
+    "item": "appliedenergistics2:cyan_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/cyan"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json
index e36bd6f35..617fe49d7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json
@@ -1,20 +1,20 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_dense_covered"
+    "item": "appliedenergistics2:fluix_covered_dense_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json
index 53d0e2e41..41f9dc024 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_dense_covered"
+    "item": "appliedenergistics2:fluix_covered_dense_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:covered_dense_cable"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json
index f6b072174..d445f9be2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.gray",
+    "item": "appliedenergistics2:gray_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json
index a5543bc48..578ebabf0 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.green",
+    "item": "appliedenergistics2:green_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/green"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json
index 75a363a03..aae0c0674 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.light_blue",
+    "item": "appliedenergistics2:light_blue_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/light_blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json
index f2c1bfe42..906d602f4 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.light_gray",
+    "item": "appliedenergistics2:light_gray_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/light_gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json
index 5c9233aff..ce58d6783 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.lime",
+    "item": "appliedenergistics2:lime_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/lime"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json
index 006c2e8cb..385c62e3c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.magenta",
+    "item": "appliedenergistics2:magenta_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/magenta"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json
index 058672059..dc9ab7078 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.orange",
+    "item": "appliedenergistics2:orange_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/orange"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json
index ec5602ac8..ad5a7b395 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.pink",
+    "item": "appliedenergistics2:pink_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/pink"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json
index ce719d209..af979fe9a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.purple",
+    "item": "appliedenergistics2:purple_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/purple"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json
index 64fcd92f8..511be6671 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.red",
+    "item": "appliedenergistics2:red_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/red"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json
index 3b90f1757..ff729b6c7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.white",
+    "item": "appliedenergistics2:white_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/white"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json
index 7ee09ef45..3b2398090 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_covered.yellow",
+    "item": "appliedenergistics2:yellow_covered_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/yellow"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json
index 6d23b6e7e..aa2097340 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.black",
+    "item": "appliedenergistics2:black_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/black"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json
index c950c1aeb..f3bd77632 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.blue",
+    "item": "appliedenergistics2:blue_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json
index eeceb363b..68d40e1bd 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.brown",
+    "item": "appliedenergistics2:brown_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/brown"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json
index 424ed4c06..36c8e77a4 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.cyan",
+    "item": "appliedenergistics2:cyan_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/cyan"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json
index 034af7d9e..de0011ecb 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json
@@ -1,17 +1,17 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_dense_smart"
+    "item": "appliedenergistics2:fluix_smart_dense_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:fluix_cable_dense_covered"
+      "item": "appliedenergistics2:fluix_covered_dense_cable"
     },
     {
       "tag": "forge:dusts/redstone"
     },
     {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json
index e86b05ca2..290b50488 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_dense_smart"
+    "item": "appliedenergistics2:fluix_smart_dense_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:smart_dense_cable"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json
index ed78fa413..2e2af7580 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.gray",
+    "item": "appliedenergistics2:gray_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json
index 4a7598c57..610467b90 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.green",
+    "item": "appliedenergistics2:green_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/green"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json
index 2a981cb2d..c01571205 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.light_blue",
+    "item": "appliedenergistics2:light_blue_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/light_blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json
index 1f4495abd..dde4cca0f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.light_gray",
+    "item": "appliedenergistics2:light_gray_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/light_gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json
index 83fc7549e..e79453438 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.lime",
+    "item": "appliedenergistics2:lime_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/lime"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json
index 2a5da0fa7..12b34ac57 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.magenta",
+    "item": "appliedenergistics2:magenta_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/magenta"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json
index 70d2d824c..36c45d1bd 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.orange",
+    "item": "appliedenergistics2:orange_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/orange"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json
index 31e7c2d38..791b3f1c7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.pink",
+    "item": "appliedenergistics2:pink_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/pink"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json
index 26312b453..c5e9db867 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.purple",
+    "item": "appliedenergistics2:purple_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/purple"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json
index d040ed2b2..bd33b08aa 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.red",
+    "item": "appliedenergistics2:red_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/red"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json
index c96d2cc8a..b553be209 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.white",
+    "item": "appliedenergistics2:white_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     },
     "b": {
       "tag": "forge:dyes/white"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json
index 20c133260..8dd47dc55 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_dense_smart.yellow",
+    "item": "appliedenergistics2:yellow_smart_dense_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/yellow"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_dense_smart"
+      "item": "appliedenergistics2:fluix_smart_dense_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json
index 36e100143..440f5bb9b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.black",
+    "item": "appliedenergistics2:black_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/black"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json
index 76c2beade..7595a33bd 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.blue",
+    "item": "appliedenergistics2:blue_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json
index a8b3dc285..3ba2baa6f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.brown",
+    "item": "appliedenergistics2:brown_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/brown"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json
index 385ebd9e2..f9ded4159 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.cyan",
+    "item": "appliedenergistics2:cyan_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/cyan"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json
index c7ae5c7a0..8f2f31548 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.fluix",
+    "item": "appliedenergistics2:fluix_glass_cable",
     "count": 4
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:quartz_fiber"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json
index 4c40dccd8..38db66c30 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_glass"
+    "item": "appliedenergistics2:fluix_glass_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:glass_cable"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json
index 71b2f2947..34e441e8f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.gray",
+    "item": "appliedenergistics2:gray_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json
index 4b3b866ed..c44c58620 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.green",
+    "item": "appliedenergistics2:green_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/green"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json
index 7f7001a23..d1ad552ed 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.light_blue",
+    "item": "appliedenergistics2:light_blue_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/light_blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json
index 028592760..7748e616c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.light_gray",
+    "item": "appliedenergistics2:light_gray_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/light_gray"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json
index 48706f633..d4b8a2d97 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.lime",
+    "item": "appliedenergistics2:lime_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/lime"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json
index d771d7e1d..110d50a05 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.magenta",
+    "item": "appliedenergistics2:magenta_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/magenta"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json
index 72e546231..8a4f54686 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.orange",
+    "item": "appliedenergistics2:orange_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/orange"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json
index e023b417e..3ef7c3cda 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.pink",
+    "item": "appliedenergistics2:pink_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/pink"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json
index 142915c91..04b5a3466 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.purple",
+    "item": "appliedenergistics2:purple_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/purple"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json
index 03a2a1b9a..d0b6d8fd0 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.red",
+    "item": "appliedenergistics2:red_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/red"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json
index eda5449bd..43041ed5d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.white",
+    "item": "appliedenergistics2:white_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/white"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json
index b4f5c241a..0db861c11 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_glass.yellow",
+    "item": "appliedenergistics2:yellow_glass_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "tag": "forge:dyes/yellow"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json
index 96d05be10..d70f2c245 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.black",
+    "item": "appliedenergistics2:black_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/black"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json
index 9f1945186..f4d91966c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.blue",
+    "item": "appliedenergistics2:blue_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     },
     "b": {
       "tag": "forge:dyes/blue"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json
index 40287d3d8..d2e298a67 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.brown",
+    "item": "appliedenergistics2:brown_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/brown"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json
index e0747f8d0..2881dc524 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.cyan",
+    "item": "appliedenergistics2:cyan_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/cyan"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json
index 22b77df4b..c759de7ec 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json
@@ -1,17 +1,17 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_smart"
+    "item": "appliedenergistics2:fluix_smart_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
-      "item": "appliedenergistics2:fluix_cable_covered"
+      "item": "appliedenergistics2:fluix_covered_cable"
     },
     {
       "tag": "forge:dusts/redstone"
     },
     {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json
index e290caa22..986fc3dd6 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:fluix_cable_smart"
+    "item": "appliedenergistics2:fluix_smart_cable"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:smart_cable"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json
index a9cedf9fb..f12236149 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.gray",
+    "item": "appliedenergistics2:gray_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/gray"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json
index 66689b7a0..8a3243329 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.green",
+    "item": "appliedenergistics2:green_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/green"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json
index 25c159c7d..ebaf511ad 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.light_blue",
+    "item": "appliedenergistics2:light_blue_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/light_blue"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json
index 46bdca383..fa0467a98 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.light_gray",
+    "item": "appliedenergistics2:light_gray_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/light_gray"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json
index edcfb886b..a9e545ea2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.lime",
+    "item": "appliedenergistics2:lime_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     },
     "b": {
       "tag": "forge:dyes/lime"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json
index 265478a1e..fc9e3a556 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.magenta",
+    "item": "appliedenergistics2:magenta_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/magenta"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json
index 18be6f2b5..68aa1e436 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.orange",
+    "item": "appliedenergistics2:orange_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/orange"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json
index 83a490bc1..667cc380f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.pink",
+    "item": "appliedenergistics2:pink_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/pink"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json
index 794543f05..061ff547c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.purple",
+    "item": "appliedenergistics2:purple_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/purple"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json
index e0c9c9b7a..44161a345 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.red",
+    "item": "appliedenergistics2:red_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     },
     "b": {
       "tag": "forge:dyes/red"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json
index 5266dfacc..f768a5166 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.white",
+    "item": "appliedenergistics2:white_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/white"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json
index 577c443f8..4998ad26a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "cable_smart.yellow",
+    "item": "appliedenergistics2:yellow_smart_cable",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "tag": "forge:dyes/yellow"
     },
     "a": {
-      "item": "appliedenergistics2:fluix_cable_smart"
+      "item": "appliedenergistics2:fluix_smart_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json
index e55e3f4f2..809ff59a1 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:empty_storage_cell"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "b b",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
index 9a9e6e994..1b68feb99 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_cell16k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
@@ -13,8 +13,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "a": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     },
     "c": {
       "item": "appliedenergistics2:fluid_cell4k_part"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
index 7cd1def4b..d83a8b7f3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_cell1k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
@@ -10,8 +10,7 @@
   ],
   "key": {
     "a": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     },
     "b": {
       "tag": "appliedenergistics2:crystals/certus"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
index 3de771665..4d57dbc7e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_cell4k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
@@ -13,8 +13,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "a": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     },
     "c": {
       "item": "appliedenergistics2:fluid_cell1k_part"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
index 81a1cf9e4..7ebab5175 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_cell64k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
@@ -13,8 +13,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "a": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     },
     "c": {
       "item": "appliedenergistics2:fluid_cell16k_part"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
index d0e31e59e..289d058b3 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell2_spatial_part"
+    "item": "appliedenergistics2:spatial_cell2_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     },
     "b": {
       "item": "appliedenergistics2:fluix_pearl"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
index 5e0931e3f..b2d268097 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell16_spatial_part"
+    "item": "appliedenergistics2:spatial_cell16_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
@@ -13,10 +13,10 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "b": {
-      "item": "appliedenergistics2:cell2_spatial_part"
+      "item": "appliedenergistics2:spatial_cell2_part"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
index 9bb8c0f6d..716cb5c44 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json
@@ -1,8 +1,8 @@
 {
   "result": {
-    "item": "appliedenergistics2:cell128_spatial_part"
+    "item": "appliedenergistics2:spatial_cell128_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
@@ -13,10 +13,10 @@
       "item": "appliedenergistics2:engineering_processor"
     },
     "b": {
-      "item": "appliedenergistics2:cell16_spatial_part"
+      "item": "appliedenergistics2:spatial_cell16_part"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
index cbd58274e..e2bad9803 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell128_spatial_part"
+      "item": "appliedenergistics2:spatial_cell128_part"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
index 407420fe7..58beceb34 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell128_spatial_part"
+      "item": "appliedenergistics2:spatial_cell128_part"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
index 0fc006cf9..ab542c507 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json
@@ -16,7 +16,7 @@
       "tag": "forge:ingots/iron"
     },
     "c": {
-      "item": "appliedenergistics2:cell16_spatial_part"
+      "item": "appliedenergistics2:spatial_cell16_part"
     },
     "b": {
       "tag": "forge:dusts/redstone"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
index 34a8baed1..fb8d137ff 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell16_spatial_part"
+      "item": "appliedenergistics2:spatial_cell16_part"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
index 3c8363758..3037ec011 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json
@@ -19,7 +19,7 @@
       "tag": "forge:dusts/redstone"
     },
     "c": {
-      "item": "appliedenergistics2:cell2_spatial_part"
+      "item": "appliedenergistics2:spatial_cell2_part"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
index 6b3ad406d..279641cab 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json
@@ -8,7 +8,7 @@
       "item": "appliedenergistics2:empty_storage_cell"
     },
     {
-      "item": "appliedenergistics2:cell2_spatial_part"
+      "item": "appliedenergistics2:spatial_cell2_part"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
index 8cdfe88de..7da542dde 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cell16k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
@@ -19,7 +19,7 @@
       "item": "appliedenergistics2:cell4k_part"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
index a43f358d4..b053193fc 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cell1k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
index bb4713acd..f9bcf1f3b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cell4k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
index 634e3fbad..6a28b94fe 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:cell64k_part"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "cdc",
@@ -19,7 +19,7 @@
       "item": "appliedenergistics2:quartz_glass"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json
index 16ef87097..16f700b45 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json
@@ -16,7 +16,7 @@
       "item": "appliedenergistics2:logic_processor"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json
index 253263144..ec6eaeb75 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:blank_pattern"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "bcb",
@@ -19,7 +19,7 @@
       "tag": "appliedenergistics2:crystals/certus"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json
index db1292e69..f4661fe7d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json
@@ -1,7 +1,7 @@
 {
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "result": {
-    "part": "part.cable_anchor",
+    "item": "appliedenergistics2:cable_anchor",
     "count": 3
   },
   "ingredients": [
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json
index 511f5c8f4..ae80b3d42 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:export_bus"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     " c "
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json
index 5ae986fdb..7a8aa4100 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_export_bus"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aba",
     "lcl"
@@ -18,8 +18,7 @@
       "item": "minecraft:piston"
     },
     "l": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json
index 6bb2694ab..d8cfeda03 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_level_emitter"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:redstone_torch"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json
index 7a3be807b..41ee5d111 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:import_bus"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " a ",
     "bcb"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json
index f67c66901..1283fb68f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_import_bus"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "lal",
     "bcb"
@@ -18,8 +18,7 @@
       "item": "appliedenergistics2:annihilation_core"
     },
     "l": {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json
index c4ae0bbc7..f119de30d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:level_emitter"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:redstone_torch"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json
index 39764da47..512219a83 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:conversion_monitor"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:formation_core"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json
index 561694416..c543214ea 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:storage_monitor"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:level_emitter"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json
index 6e7418177..c4c625dff 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:dark_monitor"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:monitor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json
index 92b7bc961..68cfc6e4e 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:monitor"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:semi_dark_monitor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json
index 679c17f34..51e1eb350 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "part.semi_dark_monitor",
+    "item": "appliedenergistics2:semi_dark_monitor",
     "count": 3
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " ab",
     "cdb",
@@ -21,7 +20,7 @@
       "tag": "forge:dusts/redstone"
     },
     "a": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json
index dbc4861fd..57c50e506 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:semi_dark_monitor"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:dark_monitor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json
index 07320da36..c644da01c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:annihilation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "bcb"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json
index 3dddb9609..4d564658a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:annihilation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "ab",
     "cb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json
index 166933559..85827af0c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_annihilation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "ddd",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json
index 7d994dc1c..3a6be5d68 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_annihilation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "adb",
     "cdb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json
index a3494d255..0908b01e9 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:identity_annihilation_plane"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:annihilation_plane"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json
index cef5335c8..edc85cd98 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:formation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "bcb"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json
index 260ba8480..ef4b21807 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:formation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "ab",
     "cb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json
index 6c8b0bf3f..1beeab6c1 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_formation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "adb",
     "cdb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json
index 3055db61c..a75c9f2a5 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_formation_plane"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "ddd",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json
index 65fe6ec2f..547b37ed4 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "part.quartz_fiber",
+    "item": "appliedenergistics2:quartz_fiber",
     "count": 3
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "bbb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json
index 907fac7f2..303d5566d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:storage_bus"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:sticky_piston"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json
index 77c478f6f..39412d938 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:fluid_storage_bus"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "minecraft:sticky_piston"
@@ -14,8 +14,7 @@
       "item": "minecraft:piston"
     },
     {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json
index aa6da0203..450742b10 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:terminal"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:formation_core"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json
index 57ffec2ee..75892a991 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:crafting_terminal"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:terminal"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json
index d6cea8f14..f565fd463 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json
@@ -2,14 +2,13 @@
   "result": {
     "item": "appliedenergistics2:fluid_terminal"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:terminal"
     },
     {
-      "item": "minecraft:dye",
-      "data": 4
+      "item": "minecraft:lapis_lazuli"
     },
     {
       "item": "appliedenergistics2:logic_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json
index c6e16825a..78cf8384d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:interface_terminal"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "tag": "appliedenergistics2:illuminated_panel"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json
index e98f53a2c..a3c6a86fd 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:pattern_terminal"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:engineering_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json
index 709be6e43..311b57a6b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:toggle_bus"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " a ",
     "bcb",
@@ -16,7 +16,7 @@
       "tag": "forge:dusts/redstone"
     },
     "b": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json
index 3a3bb3468..d2d7f9b6b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:toggle_bus"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:inverted_toggle_bus"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json
index b4fc21da7..7a5bf9824 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:inverted_toggle_bus"
   },
-  "type": "appliedenergistics2:part_shapeless",
+  "type": "minecraft:crafting_shapeless",
   "ingredients": [
     {
       "item": "appliedenergistics2:toggle_bus"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json
index 746109e20..c2eb9875f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:me_p2p_tunnel"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " a ",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json
index 02b699012..f8bd31ea2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json
@@ -13,7 +13,7 @@
       "item": "appliedenergistics2:wireless_receiver"
     },
     "c": {
-      "item": "appliedenergistics2:fluix_cable_glass"
+      "item": "appliedenergistics2:fluix_glass_cable"
     },
     "b": {
       "item": "appliedenergistics2:calculation_processor"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json
index 6b61ba93b..7b218d6da 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "material.wireless_booster",
+    "item": "appliedenergistics2:wireless_booster",
     "count": 2
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "abc",
     "ddd"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json
index 72ae791df..90e685285 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json
@@ -2,7 +2,7 @@
   "result": {
     "item": "appliedenergistics2:wireless_receiver"
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     " a ",
     "bcb",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json
index 0a416dd43..aaaa5714f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json
@@ -1,7 +1,7 @@
 {
   "type": "appliedenergistics2:smelt",
   "result": {
-    "part": "material.silicon"
+    "item": "appliedenergistics2:silicon"
   },
   "input": [
     {
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json
index 125f6e4ae..38a413e5c 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json
@@ -13,7 +13,7 @@
       "tag": "forge:ingots/iron"
     },
     "a": {
-      "item": "appliedenergistics2:certus_quartz_crystal_charged"
+      "item": "appliedenergistics2:charged_certus_quartz_crystal"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json
index a4fb382f5..6e91baeff 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.black",
+    "item": "appliedenergistics2:black_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json
index b74f77360..0883562b0 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.blue",
+    "item": "appliedenergistics2:blue_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json
index 2b78a585e..8b471f9e7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.brown",
+    "item": "appliedenergistics2:brown_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json
index 7aa20a7ae..94087d3a7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.cyan",
+    "item": "appliedenergistics2:cyan_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json
index 9b57df4c2..6e7c9b8f7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.gray",
+    "item": "appliedenergistics2:gray_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json
index 4eeacb9eb..de8ea5499 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.green",
+    "item": "appliedenergistics2:green_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json
index 44dced005..e558ec593 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.light_blue",
+    "item": "appliedenergistics2:light_blue_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json
index 62f20d7b5..55d676410 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.light_gray",
+    "item": "appliedenergistics2:light_gray_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json
index 2e1701a06..7398cc951 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.lime",
+    "item": "appliedenergistics2:lime_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json
index aca406dd8..5bd38ce94 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.black",
+    "item": "appliedenergistics2:black_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:black_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json
index e31d2d178..de4e3f62d 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.blue",
+    "item": "appliedenergistics2:blue_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:blue_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json
index b32c0bedf..3487b0206 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.brown",
+    "item": "appliedenergistics2:brown_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:brown_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json
index 95b1b52bf..1047dd766 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.cyan",
+    "item": "appliedenergistics2:cyan_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:cyan_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json
index 2aa08e4f5..c96648be5 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.gray",
+    "item": "appliedenergistics2:gray_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:gray_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json
index 5e0e70108..d721681ce 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.green",
+    "item": "appliedenergistics2:green_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:green_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json
index 7ed6fe261..d87503dc7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.light_blue",
+    "item": "appliedenergistics2:light_blue_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:light_blue_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json
index edb5e6dc5..17cd0e978 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.light_gray",
+    "item": "appliedenergistics2:light_gray_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:light_gray_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json
index c8be29c45..11cbf451b 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.lime",
+    "item": "appliedenergistics2:lime_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:lime_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json
index f82d655df..32eae4e27 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.magenta",
+    "item": "appliedenergistics2:magenta_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:magenta_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json
index c1661c70e..70c1eaa18 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.orange",
+    "item": "appliedenergistics2:orange_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -12,7 +11,7 @@
   ],
   "key": {
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     },
     "a": {
       "item": "appliedenergistics2:orange_paint_ball"
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json
index 7c6d9d33e..790601ecc 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.pink",
+    "item": "appliedenergistics2:pink_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:pink_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json
index 85aaaeb15..d0bb94e3f 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.purple",
+    "item": "appliedenergistics2:purple_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:purple_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json
index 86be8fe2c..3027bd490 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.red",
+    "item": "appliedenergistics2:red_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:red_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json
index 1d36c8c4d..d8e277418 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.white",
+    "item": "appliedenergistics2:white_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:white_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json
index bacc0d3ce..e349431eb 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "lumen_paint_ball.yellow",
+    "item": "appliedenergistics2:yellow_lumen_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
@@ -15,7 +14,7 @@
       "item": "appliedenergistics2:yellow_paint_ball"
     },
     "b": {
-      "tag": "forge:dust/glowstone"
+      "tag": "forge:dusts/glowstone"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json
index baca5647b..38d123789 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.magenta",
+    "item": "appliedenergistics2:magenta_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json
index ebccdf3c8..18fcb6fc2 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.orange",
+    "item": "appliedenergistics2:orange_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json
index 6f55a3b2a..287a23212 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.pink",
+    "item": "appliedenergistics2:pink_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json
index 46bb50f06..a2887b8d7 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.purple",
+    "item": "appliedenergistics2:purple_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json
index f5dcf3934..6d9c86e14 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.red",
+    "item": "appliedenergistics2:red_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json
index 8a83b85f4..7b71401ba 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.white",
+    "item": "appliedenergistics2:white_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json
index bc5b307b2..bc71e273a 100644
--- a/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json
+++ b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json
@@ -1,10 +1,9 @@
 {
   "result": {
-    "type": "appliedenergistics2:part",
-    "part": "paint_ball.yellow",
+    "item": "appliedenergistics2:yellow_paint_ball",
     "count": 8
   },
-  "type": "appliedenergistics2:part_shaped",
+  "type": "minecraft:crafting_shaped",
   "pattern": [
     "aaa",
     "aba",
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json
new file mode 100644
index 000000000..8c239b4b9
--- /dev/null
+++ b/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "appliedenergistics2:white_covered_cable",
+    "appliedenergistics2:orange_covered_cable",
+    "appliedenergistics2:magenta_covered_cable",
+    "appliedenergistics2:light_blue_covered_cable",
+    "appliedenergistics2:yellow_covered_cable",
+    "appliedenergistics2:lime_covered_cable",
+    "appliedenergistics2:pink_covered_cable",
+    "appliedenergistics2:gray_covered_cable",
+    "appliedenergistics2:light_gray_covered_cable",
+    "appliedenergistics2:cyan_covered_cable",
+    "appliedenergistics2:purple_covered_cable",
+    "appliedenergistics2:blue_covered_cable",
+    "appliedenergistics2:brown_covered_cable",
+    "appliedenergistics2:green_covered_cable",
+    "appliedenergistics2:red_covered_cable",
+    "appliedenergistics2:black_covered_cable",
+    "appliedenergistics2:fluix_covered_cable"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json
new file mode 100644
index 000000000..e9f042255
--- /dev/null
+++ b/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "appliedenergistics2:white_covered_dense_cable",
+    "appliedenergistics2:orange_covered_dense_cable",
+    "appliedenergistics2:magenta_covered_dense_cable",
+    "appliedenergistics2:light_blue_covered_dense_cable",
+    "appliedenergistics2:yellow_covered_dense_cable",
+    "appliedenergistics2:lime_covered_dense_cable",
+    "appliedenergistics2:pink_covered_dense_cable",
+    "appliedenergistics2:gray_covered_dense_cable",
+    "appliedenergistics2:light_gray_covered_dense_cable",
+    "appliedenergistics2:cyan_covered_dense_cable",
+    "appliedenergistics2:purple_covered_dense_cable",
+    "appliedenergistics2:blue_covered_dense_cable",
+    "appliedenergistics2:brown_covered_dense_cable",
+    "appliedenergistics2:green_covered_dense_cable",
+    "appliedenergistics2:red_covered_dense_cable",
+    "appliedenergistics2:black_covered_dense_cable",
+    "appliedenergistics2:fluix_covered_dense_cable"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json
index d6649e775..f72d209df 100644
--- a/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json
+++ b/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json
@@ -1,4 +1,3 @@
 {
-  "values": [
-  ]
+  "values": []
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/glass.json b/src/main/resources/data/appliedenergistics2/tags/items/glass.json
index a62d59539..31e49d020 100644
--- a/src/main/resources/data/appliedenergistics2/tags/items/glass.json
+++ b/src/main/resources/data/appliedenergistics2/tags/items/glass.json
@@ -1,5 +1,5 @@
 {
-  "values":  [
+  "values": [
     "minecraft:glass",
     "#forge:glass"
   ]
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json
new file mode 100644
index 000000000..22bc8d549
--- /dev/null
+++ b/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "appliedenergistics2:white_glass_cable",
+    "appliedenergistics2:orange_glass_cable",
+    "appliedenergistics2:magenta_glass_cable",
+    "appliedenergistics2:light_blue_glass_cable",
+    "appliedenergistics2:yellow_glass_cable",
+    "appliedenergistics2:lime_glass_cable",
+    "appliedenergistics2:pink_glass_cable",
+    "appliedenergistics2:gray_glass_cable",
+    "appliedenergistics2:light_gray_glass_cable",
+    "appliedenergistics2:cyan_glass_cable",
+    "appliedenergistics2:purple_glass_cable",
+    "appliedenergistics2:blue_glass_cable",
+    "appliedenergistics2:brown_glass_cable",
+    "appliedenergistics2:green_glass_cable",
+    "appliedenergistics2:red_glass_cable",
+    "appliedenergistics2:black_glass_cable",
+    "appliedenergistics2:fluix_glass_cable"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json b/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json
index b366a51f9..a353be234 100644
--- a/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json
+++ b/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json
@@ -1,5 +1,5 @@
 {
-    "values": [
-        "appliedenergistics2:nether_quartz_dust"
-    ]
+  "values": [
+    "appliedenergistics2:nether_quartz_dust"
+  ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json
new file mode 100644
index 000000000..f1e86f2a1
--- /dev/null
+++ b/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "appliedenergistics2:white_smart_cable",
+    "appliedenergistics2:orange_smart_cable",
+    "appliedenergistics2:magenta_smart_cable",
+    "appliedenergistics2:light_blue_smart_cable",
+    "appliedenergistics2:yellow_smart_cable",
+    "appliedenergistics2:lime_smart_cable",
+    "appliedenergistics2:pink_smart_cable",
+    "appliedenergistics2:gray_smart_cable",
+    "appliedenergistics2:light_gray_smart_cable",
+    "appliedenergistics2:cyan_smart_cable",
+    "appliedenergistics2:purple_smart_cable",
+    "appliedenergistics2:blue_smart_cable",
+    "appliedenergistics2:brown_smart_cable",
+    "appliedenergistics2:green_smart_cable",
+    "appliedenergistics2:red_smart_cable",
+    "appliedenergistics2:black_smart_cable",
+    "appliedenergistics2:fluix_smart_cable"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json
new file mode 100644
index 000000000..10789f0fa
--- /dev/null
+++ b/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json
@@ -0,0 +1,21 @@
+{
+  "values": [
+    "appliedenergistics2:white_smart_dense_cable",
+    "appliedenergistics2:orange_smart_dense_cable",
+    "appliedenergistics2:magenta_smart_dense_cable",
+    "appliedenergistics2:light_blue_smart_dense_cable",
+    "appliedenergistics2:yellow_smart_dense_cable",
+    "appliedenergistics2:lime_smart_dense_cable",
+    "appliedenergistics2:pink_smart_dense_cable",
+    "appliedenergistics2:gray_smart_dense_cable",
+    "appliedenergistics2:light_gray_smart_dense_cable",
+    "appliedenergistics2:cyan_smart_dense_cable",
+    "appliedenergistics2:purple_smart_dense_cable",
+    "appliedenergistics2:blue_smart_dense_cable",
+    "appliedenergistics2:brown_smart_dense_cable",
+    "appliedenergistics2:green_smart_dense_cable",
+    "appliedenergistics2:red_smart_dense_cable",
+    "appliedenergistics2:black_smart_dense_cable",
+    "appliedenergistics2:fluix_smart_dense_cable"
+  ]
+}
\ No newline at end of file