From 84fa5a38e0ac996778a8465a33739e33d118c705 Mon Sep 17 00:00:00 2001
From: yueh <yueh@orod.de>
Date: Sat, 15 Aug 2015 17:19:56 +0200
Subject: [PATCH] Reorganizes the recipes in a more reasonable way.

The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.

It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.

"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.

This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.

Fixes #1791
Reverts #1635
---
 src/main/java/appeng/core/RecipeLoader.java   |   3 +-
 .../recipes/loader/RecipeResourceCopier.java  |  60 ++++-
 .../appliedenergistics2/recipes/README.html   |   1 +
 .../recipes/aliases.recipe                    |   2 +
 .../recipes/crafting.recipe                   |  69 -----
 .../recipes/decorative/certus.recipe          |   8 +
 .../recipes/decorative/crystals.recipe        |  30 +++
 .../recipes/decorative/fixtures.recipe        |   7 +
 .../recipes/decorative/index.recipe           |   7 +
 .../recipes/decorative/quartzglass.recipe     |   9 +
 .../recipes/decorative/skystone.recipe        |  11 +
 .../recipes/{ => decorative}/slabs.recipe     |   0
 .../recipes/{ => decorative}/stairs.recipe    |   0
 .../recipes/dyes_covered.recipe               |  96 -------
 .../recipes/dyes_dense.recipe                 |  96 -------
 .../recipes/dyes_glass.recipe                 |  96 -------
 .../recipes/dyes_smart.recipe                 |  96 -------
 .../appliedenergistics2/recipes/groups.recipe |  21 ++
 .../recipes/hightech.recipe                   |  14 --
 .../appliedenergistics2/recipes/index.recipe  |  69 +----
 .../recipes/materials/cards.recipe            |  35 +++
 .../recipes/materials/circuits.recipe         |  15 ++
 .../recipes/materials/cores.recipe            |   7 +
 .../recipes/materials/index.recipe            |   5 +
 .../recipes/materials/presses.recipe          |  15 ++
 .../recipes/materials/processors.recipe       |  11 +
 .../recipes/misc/chests.recipe                |  11 +
 .../recipes/misc/deconstruction.recipe        |  15 ++
 .../recipes/misc/fluixpearl.recipe            |   5 +
 .../recipes/misc/grindstone.recipe            |  17 ++
 .../recipes/misc/index.recipe                 |   8 +
 .../recipes/misc/meteors.recipe               |   5 +
 .../recipes/misc/seeds.recipe                 |   3 +
 .../recipes/misc/tinytnt.recipe               |   4 +
 .../recipes/misc/vanilla.recipe               |  21 ++
 .../network/blocks/cellworkbench.recipe       |   5 +
 .../recipes/network/blocks/controller.recipe  |   5 +
 .../network/blocks/crystal-processing.recipe  |  11 +
 .../recipes/network/blocks/energy.recipe      |  23 ++
 .../recipes/network/blocks/index.recipe       |  11 +
 .../recipes/network/blocks/inscribers.recipe  |   5 +
 .../recipes/network/blocks/interfaces.recipe  |  13 +
 .../recipes/network/blocks/io.recipe          |  11 +
 .../recipes/network/blocks/quantum.recipe     |  13 +
 .../recipes/network/blocks/security.recipe    |   5 +
 .../recipes/network/blocks/spatial-io.recipe  |  11 +
 .../recipes/network/blocks/storage.recipe     |  11 +
 .../recipes/network/cables/covered.recipe     | 104 ++++++++
 .../recipes/network/cables/dense.recipe       | 104 ++++++++
 .../recipes/network/cables/glass.recipe       | 103 ++++++++
 .../recipes/network/cables/index.recipe       |   4 +
 .../recipes/network/cables/smart.recipe       | 104 ++++++++
 .../recipes/network/cells/empty.recipe        |   5 +
 .../recipes/network/cells/index.recipe        |   6 +
 .../network/cells/spatial-componets.recipe    |  17 ++
 .../recipes/network/cells/spatial.recipe      |  26 ++
 .../network/cells/storage-components.recipe   |  23 ++
 .../recipes/network/cells/storage.recipe      |  35 +++
 .../recipes/network/cells/view.recipe         |   8 +
 .../recipes/network/crafting/assembler.recipe |   5 +
 .../recipes/network/crafting/cpu.recipe       |  37 +++
 .../recipes/network/crafting/index.recipe     |   3 +
 .../recipes/network/crafting/patterns.recipe  |   5 +
 .../recipes/network/index.recipe              |   6 +
 .../recipes/network/parts/cable-anchor.recipe |   3 +
 .../recipes/network/parts/emitters.recipe     |   3 +
 .../recipes/network/parts/index.recipe        |  10 +
 .../recipes/network/parts/io-buses.recipe     |  13 +
 .../recipes/network/parts/monitors.recipe     |   7 +
 .../recipes/network/parts/panels.recipe       |  17 ++
 .../recipes/network/parts/planes.recipe       |  25 ++
 .../recipes/network/parts/quartz-fiber.recipe |   5 +
 .../recipes/network/parts/terminals.recipe    |  15 ++
 .../recipes/network/parts/toggle-buses.recipe |  13 +
 .../recipes/network/parts/tunnels.recipe      |   5 +
 .../recipes/network/wireless.recipe           |  22 ++
 .../appliedenergistics2/recipes/new.recipe    | 189 --------------
 .../recipes/oredict.recipe                    |  29 +++
 .../recipes/paint_balls.recipe                | 195 --------------
 .../appliedenergistics2/recipes/port.recipe   | 238 ------------------
 .../recipes/process.recipe                    | 232 -----------------
 .../recipes/processing/factorization.recipe   |   9 +
 .../recipes/processing/grind.recipe           |   4 +
 .../recipes/processing/hydraulicraft.recipe   |   9 +
 .../recipes/processing/ic2.recipe             |   9 +
 .../recipes/processing/index.recipe           |   8 +
 .../recipes/processing/mekanism.recipe        |   9 +
 .../recipes/processing/rotarycraft.recipe     |   9 +
 .../recipes/processing/te.recipe              |   9 +
 .../recipes/processing/vanilla.recipe         |   8 +
 .../recipes/storagecells.recipe               | 133 ----------
 .../appliedenergistics2/recipes/tools.recipe  |  88 -------
 .../recipes/tools/certus-quartz.recipe        |  41 +++
 .../recipes/tools/index.recipe                |   6 +
 .../recipes/tools/matter-cannon.recipe        |   5 +
 .../recipes/tools/misctools.recipe            |  11 +
 .../recipes/tools/nether-quartz.recipe        |  41 +++
 .../recipes/tools/network.recipe              |  23 ++
 .../recipes/tools/paintballs.recipe           | 191 ++++++++++++++
 .../recipes/unsorted.recipe                   |  22 --
 .../recipes/vanilla_enhance.recipe            |  12 -
 101 files changed, 1613 insertions(+), 1646 deletions(-)
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/aliases.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/crafting.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe
 rename src/main/resources/assets/appliedenergistics2/recipes/{ => decorative}/slabs.recipe (100%)
 rename src/main/resources/assets/appliedenergistics2/recipes/{ => decorative}/stairs.recipe (100%)
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/dyes_covered.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/dyes_dense.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/dyes_glass.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/dyes_smart.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/groups.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/hightech.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cables/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-componets.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/new.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/paint_balls.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/port.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/process.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/storagecells.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe
 create mode 100644 src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/unsorted.recipe
 delete mode 100644 src/main/resources/assets/appliedenergistics2/recipes/vanilla_enhance.recipe

diff --git a/src/main/java/appeng/core/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java
index b49336026..c7235cc5f 100644
--- a/src/main/java/appeng/core/RecipeLoader.java
+++ b/src/main/java/appeng/core/RecipeLoader.java
@@ -22,6 +22,7 @@ package appeng.core;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+
 import javax.annotation.Nonnull;
 
 import org.apache.commons.io.FileUtils;
@@ -68,7 +69,7 @@ public class RecipeLoader implements Runnable
 		final File readmeGenDest = new File( generatedRecipesDir, "README.html" );
 		final File readmeUserDest = new File( userRecipesDir, "README.html" );
 
-		// generates generated and user recipes dir
+        // generates generated and user recipes dir
 		// will clean the generated every time to keep it up to date
 		// copies over the recipes in the jar over to the generated folder
 		// copies over the readmes
diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java
index b2e5ff119..94fd5fee9 100644
--- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java
+++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java
@@ -88,22 +88,60 @@ public class RecipeResourceCopier
 		Preconditions.checkNotNull( destination );
 		Preconditions.checkArgument( destination.isDirectory() );
 
-		final String[] listing = this.getResourceListing( this.getClass(), this.root );
+		this.copyTo( destination, this.root );
+	}
+
+	/**
+	 * @see {RecipeResourceCopier#copyTo(File)}
+	 *
+	 * @param destination destination folder to which the recipes are copied to
+	 * @param directory the folder to copy.
+	 *
+	 * @throws URISyntaxException {@see #getResourceListing}
+	 * @throws IOException {@see #getResourceListing} and if copying the detected resource to file is not possible
+	 */
+	private void copyTo( File destination, String directory ) throws URISyntaxException, IOException
+	{
+		assert destination != null;
+		assert directory != null;
+
+		final String[] listing = this.getResourceListing( this.getClass(), directory );
 		for( String list : listing )
 		{
 			if( list.endsWith( ".recipe" ) || list.endsWith( ".html" ) )
 			{
-				final InputStream inStream = this.getClass().getResourceAsStream( '/' + this.root + list );
-				final File outFile = new File( destination, list );
-				if( !outFile.exists() )
-				{
-					if( inStream != null )
-					{
-						FileUtils.copyInputStreamToFile( inStream, outFile );
-						inStream.close();
-					}
-				}
+				this.copyFile( destination, directory, list );
 			}
+			else if( !list.contains( "." ) )
+			{
+				final File subDirectory = new File( destination, list );
+				FileUtils.forceMkdir( subDirectory );
+				this.copyTo( subDirectory, directory + list + "/" );
+			}
+		}
+	}
+
+	/**
+	 * Copies a single file inside a folder to the destination.
+	 *
+	 * @param destination folder to which the file is copied to
+	 * @param directory the directory containing the file
+	 * @param fileName the fily to copy
+	 *
+	 * @throws IOException if copying the file is not possible
+	 */
+	private void copyFile( File destination, String directory, String fileName ) throws IOException
+	{
+		assert destination != null;
+		assert fileName != null;
+
+		final InputStream inStream = this.getClass().getResourceAsStream( '/' + directory + fileName );
+		final File outFile = new File( destination, fileName );
+
+		if( !outFile.exists() && inStream != null )
+		{
+			FileUtils.copyInputStreamToFile( inStream, outFile );
+			inStream.close();
 		}
 	}
 
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/README.html b/src/main/resources/assets/appliedenergistics2/recipes/README.html
index 6266574c3..662caf1ce 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/README.html
+++ b/src/main/resources/assets/appliedenergistics2/recipes/README.html
@@ -328,6 +328,7 @@
         <h4 id="import">Import</h4>
         <ul>
             <li>lets you load an additional recipe file</li>
+            <li>this works with subdirectories, but the path needs to be always a relative path to the root recipe directory</li>
             <li>
                 AE2: import all recipes for stairs<br />
                 <code>import = stairs.recipe</code>
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/aliases.recipe b/src/main/resources/assets/appliedenergistics2/recipes/aliases.recipe
new file mode 100644
index 000000000..614a6fe7a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/aliases.recipe
@@ -0,0 +1,2 @@
+alias=mc -> minecraft
+alias=ae2 -> appliedenergistics2
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/crafting.recipe b/src/main/resources/assets/appliedenergistics2/recipes/crafting.recipe
deleted file mode 100644
index 968e1b06d..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/crafting.recipe
+++ /dev/null
@@ -1,69 +0,0 @@
-
-shaped=
-	ae2:BlockQuartzGlass mc:glowstone_dust ae2:BlockQuartzGlass,
-	mc:glowstone_dust certusCrystal mc:glowstone_dust,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemMaterial.BlankPattern
-
-shapeless=
-	ae2:ItemMaterial.BasicCard mc:crafting_table
-	-> ae2:ItemMaterial.CardCrafting
-
-shaped=
-	ae2:ItemMaterial.FormationCore mc:iron_ingot _,
-	mc:iron_ingot ae2:ItemMaterial.Cell4kPart _,
-	_ _ ae2:BlockEnergyCell
-	-> ae2:ToolColorApplicator
-
-shapeless=
-	monitor interface ae2:ItemMaterial.EngProcessor
-	-> ae2:ItemPart.InterfaceTerminal
-
-shapeless=
-	ae2:ItemPart.CraftingTerminal ae2:ItemMaterial.EngProcessor
-	-> ae2:ItemPart.PatternTerminal
-
-shaped=
-	mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
-	ae2:ItemMaterial.AnnihilationCore mc:crafting_table ae2:ItemMaterial.FormationCore,
-	mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
-	-> ae2:BlockMolecularAssembler
-
-shaped=
-	mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
-	cable ae2:ItemMaterial.LogicProcessor cable,
-	mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot
-	-> ae2:BlockCraftingUnit:0
-
-# co processor
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemMaterial.EngProcessor
-	-> ae2:BlockCraftingUnit:1
-
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemPart.StorageMonitor
-	-> ae2:BlockCraftingMonitor
-
-# various storage sizes
-
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemMaterial.Cell1kPart
-	-> ae2:BlockCraftingStorage:0
-
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemMaterial.Cell4kPart
-	-> ae2:BlockCraftingStorage:1
-
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemMaterial.Cell16kPart
-	-> ae2:BlockCraftingStorage:2
-
-shapeless=
-	ae2:BlockCraftingUnit:0
-	ae2:ItemMaterial.Cell64kPart
-	-> ae2:BlockCraftingStorage:3
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe
new file mode 100644
index 000000000..d69310275
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe
@@ -0,0 +1,8 @@
+shaped=
+    ae2:BlockQuartz,
+    ae2:BlockQuartz
+    -> 2 ae2:BlockQuartzPillar
+
+shaped=
+    ae2:BlockQuartz ae2:BlockQuartz
+    -> 2 ae2:BlockQuartzChiseled
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe
new file mode 100644
index 000000000..69e3b1c83
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe
@@ -0,0 +1,30 @@
+# Raw Storage Blocks
+shaped=
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz
+    -> ae2:BlockQuartz
+
+shaped=
+    oredictionary:crystalFluix oredictionary:crystalFluix,
+    oredictionary:crystalFluix oredictionary:crystalFluix
+    -> ae2:BlockFluix
+
+
+# Pure Storage Blocks
+shaped=
+    ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal,
+    ae2:ItemMaterial.PurifiedNetherQuartzCrystal _ ae2:ItemMaterial.PurifiedNetherQuartzCrystal,
+    ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal
+    -> mc:quartz_block
+
+shaped=
+    ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal,
+    ae2:ItemMaterial.PurifiedCertusQuartzCrystal _ ae2:ItemMaterial.PurifiedCertusQuartzCrystal,
+    ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal
+    -> ae2:BlockQuartz
+
+shaped=
+    ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal,
+    ae2:ItemMaterial.PurifiedFluixCrystal _ ae2:ItemMaterial.PurifiedFluixCrystal,
+    ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal
+    -> ae2:BlockFluix
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe
new file mode 100644
index 000000000..8ced21195
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe
@@ -0,0 +1,7 @@
+shaped=
+    ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot
+    -> 2 ae2:BlockQuartzTorch
+
+shaped=
+    netherCrystal mc:iron_ingot
+    -> ae2:BlockLightDetector
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe
new file mode 100644
index 000000000..5b79d2a13
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe
@@ -0,0 +1,7 @@
+import=decorative/certus.recipe
+import=decorative/crystals.recipe
+import=decorative/fixtures.recipe
+import=decorative/quartzglass.recipe
+import=decorative/skystone.recipe
+import=decorative/slabs.recipe
+import=decorative/stairs.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe
new file mode 100644
index 000000000..89c2230c7
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe
@@ -0,0 +1,9 @@
+shaped=
+    dustQuartz glass dustQuartz,
+    glass dustQuartz glass,
+    dustQuartz glass dustQuartz
+    -> 4 ae2:BlockQuartzGlass
+
+shaped=
+    mc:glowstone_dust ae2:BlockQuartzGlass mc:glowstone_dust
+    -> ae2:BlockQuartzLamp
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe
new file mode 100644
index 000000000..d55ee054e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe
@@ -0,0 +1,11 @@
+smelt=
+    ae2:BlockSkyStone -> ae2:BlockSkyStone:1
+
+shapeless=
+    ae2:BlockSkyStone:1 -> ae2:BlockSkyStone:2
+    
+shapeless=
+    ae2:BlockSkyStone:2 -> ae2:BlockSkyStone:3
+
+shapeless=
+    ae2:BlockSkyStone:3 -> ae2:BlockSkyStone:1
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe
rename to src/main/resources/assets/appliedenergistics2/recipes/decorative/slabs.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe
rename to src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/dyes_covered.recipe b/src/main/resources/assets/appliedenergistics2/recipes/dyes_covered.recipe
deleted file mode 100644
index f3a351b27..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/dyes_covered.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeWhite ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.White
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeBlack ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Black
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeRed ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Red
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeGreen ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Green
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeBrown ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Brown
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeBlue ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Blue
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyePurple ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Purple
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeCyan ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Cyan
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeLightGray ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.LightGray
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeGray ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Gray
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyePink ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Pink
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeLime ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Lime
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeYellow ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Yellow
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeLightBlue ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.LightBlue
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeMagenta ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Magenta
-
-shaped=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered,
-	ae2:CableCovered oredictionary:dyeOrange ae2:CableCovered,
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered
-	-> 8 ae2:CableCovered.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/dyes_dense.recipe b/src/main/resources/assets/appliedenergistics2/recipes/dyes_dense.recipe
deleted file mode 100644
index e43934d66..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/dyes_dense.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeWhite ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.White
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeBlack ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Black
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeRed ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Red
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeGreen ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Green
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeBrown ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Brown
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeBlue ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Blue
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyePurple ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Purple
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeCyan ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Cyan
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeLightGray ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.LightGray
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeGray ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Gray
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyePink ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Pink
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeLime ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Lime
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeYellow ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Yellow
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeLightBlue ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.LightBlue
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeMagenta ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Magenta
-
-shaped=
-	ae2:CableDense ae2:CableDense ae2:CableDense,
-	ae2:CableDense oredictionary:dyeOrange ae2:CableDense,
-	ae2:CableDense ae2:CableDense ae2:CableDense
-	-> 8 ae2:CableDense.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/dyes_glass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/dyes_glass.recipe
deleted file mode 100644
index e91156df1..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/dyes_glass.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeWhite ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.White
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeBlack ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Black
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeRed ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Red
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeGreen ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Green
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeBrown ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Brown
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeBlue ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Blue
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyePurple ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Purple
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeCyan ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Cyan
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeLightGray ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.LightGray
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeGray ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Gray
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyePink ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Pink
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeLime ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Lime
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeYellow ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Yellow
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeLightBlue ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.LightBlue
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeMagenta ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Magenta
-
-shaped=
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass,
-	ae2:CableGlass oredictionary:dyeOrange ae2:CableGlass,
-	ae2:CableGlass ae2:CableGlass ae2:CableGlass
-	-> 8 ae2:CableGlass.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/dyes_smart.recipe b/src/main/resources/assets/appliedenergistics2/recipes/dyes_smart.recipe
deleted file mode 100644
index 8735083cb..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/dyes_smart.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeWhite ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.White
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeBlack ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Black
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeRed ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Red
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeGreen ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Green
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeBrown ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Brown
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeBlue ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Blue
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyePurple ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Purple
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeCyan ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Cyan
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeLightGray ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.LightGray
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeGray ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Gray
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyePink ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Pink
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeLime ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Lime
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeYellow ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Yellow
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeLightBlue ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.LightBlue
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeMagenta ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Magenta
-
-shaped=
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart,
-	ae2:CableSmart oredictionary:dyeOrange ae2:CableSmart,
-	ae2:CableSmart ae2:CableSmart ae2:CableSmart
-	-> 8 ae2:CableSmart.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe
new file mode 100644
index 000000000..7addf37d5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe
@@ -0,0 +1,21 @@
+group= oredictionary:itemIlluminatedPanel -> monitor
+group= ae2:BlockInterface ae2:ItemPart.Interface -> interface
+
+group= ae2:ToolCertusQuartzCuttingKnife:* ae2:ToolNetherQuartzCuttingKnife:* -> knife
+group= ae2:ToolCertusQuartzWrench ae2:ToolNetherQuartzWrench -> wrench
+
+group= ae2:CableGlass ae2:CableCovered ae2:CableSmart -> cable
+group= ae2:CableDense -> densecable
+
+group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots
+group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder
+
+group=oredictionary:blockGlass oredictionary:glass mc:glass -> glass
+group=oredictionary:wool  mc:wool:* -> wool
+
+group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged -> crystalQuartz
+group=oredictionary:dustCertusQuartz oredictionary:dustNetherQuartz -> dustQuartz
+
+group=oredictionary:crystalCertusQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged ae2:ItemMaterial.PurifiedCertusQuartzCrystal -> certusCrystal
+group=oredictionary:crystalNetherQuartz ae2:ItemMaterial.PurifiedNetherQuartzCrystal -> netherCrystal
+group=oredictionary:crystalFluix ae2:ItemMaterial.PurifiedFluixCrystal -> fluixCrystal
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/hightech.recipe b/src/main/resources/assets/appliedenergistics2/recipes/hightech.recipe
deleted file mode 100644
index 33aed1bc1..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/hightech.recipe
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Quantum Link Chamber
-shaped=
-	ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass,
-	ae2:ItemMaterial.FluixPearl _ ae2:ItemMaterial.FluixPearl,
-	ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass,
-	-> ae2:BlockQuantumLinkChamber
-
-# Quantum Ring
-shaped=
-	mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
-	ae2:ItemMaterial.EngProcessor ae2:BlockEnergyCell densecable,
-	mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
-	-> ae2:BlockQuantumRing
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe
index 83c9eecb6..253dbcb0b 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe
+++ b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe
@@ -1,39 +1,3 @@
-
-alias=mc -> minecraft
-alias=ae2 -> appliedenergistics2
-
-# Forge Ore Dictionary
-# logWood, slabWood, stairWood, treeSapling, treeLeaves,
-# oreGold, oreIron, oreLapis, oreDiamond, oreRedstone, oreEmerald, oreQuartz, oreCoal,
-# stone, cobblestone, record, stickWood, plankWood,
-# dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite
-
-# AE2 Ore Dictionary
-ore=ae2:ItemMaterial.CertusQuartzCrystal -> crystalCertusQuartz
-ore=ae2:ItemMaterial.FluixCrystal -> crystalFluix
-ore=ae2:ItemMaterial.PurifiedFluixCrystal -> crystalPureFluix
-ore=mc:quartz -> crystalNetherQuartz
-ore=mc:wool:* -> blockWool
-ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay
-ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz
-ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz
-ore=ae2:ItemMaterial.FluixDust -> dustFluix
-ore=ae2:OreQuartz -> oreCertusQuartz
-ore=ae2:OreQuartzCharged -> oreCertusQuartz
-
-group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots
-group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder
-
-group=oredictionary:blockGlass oredictionary:glass mc:glass -> glass
-group=oredictionary:wool  mc:wool:* -> wool
-
-group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged -> crystalQuartz
-group=oredictionary:dustCertusQuartz oredictionary:dustNetherQuartz -> dustQuartz
-
-group=oredictionary:crystalCertusQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged ae2:ItemMaterial.PurifiedCertusQuartzCrystal -> certusCrystal
-group=oredictionary:crystalNetherQuartz ae2:ItemMaterial.PurifiedNetherQuartzCrystal -> netherCrystal
-group=oredictionary:crystalFluix ae2:ItemMaterial.PurifiedFluixCrystal -> fluixCrystal
-
 # Crash on Issues
 crash=false
 
@@ -47,26 +11,15 @@ ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel
 ore= ae2:ItemPart.Monitor -> itemIlluminatedPanel
 ore= ae2:ItemPart.DarkMonitor -> itemIlluminatedPanel
 
-group= oredictionary:itemIlluminatedPanel -> monitor
-group= ae2:BlockInterface ae2:ItemPart.Interface -> interface
+# Important, keep in this order
+import=aliases.recipe
+import=oredict.recipe
+import=groups.recipe
 
-group= ae2:ToolCertusQuartzCuttingKnife:* ae2:ToolNetherQuartzCuttingKnife:* -> knife
-group= ae2:ToolCertusQuartzWrench ae2:ToolNetherQuartzWrench -> wrench
-
-group= ae2:CableGlass ae2:CableCovered ae2:CableSmart -> cable
-group= ae2:CableDense -> densecable
-
-import=tools.recipe
-import=process.recipe
-import=storagecells.recipe
-import=port.recipe
-import=new.recipe
-import=dyes_glass.recipe
-import=dyes_covered.recipe
-import=dyes_smart.recipe
-import=dyes_dense.recipe
-import=paint_balls.recipe
-import=crafting.recipe
-import=vanilla_enhance.recipe
-import=stairs.recipe
-import=slabs.recipe
+# All actual recipes
+import=decorative/index.recipe
+import=materials/index.recipe
+import=misc/index.recipe
+import=network/index.recipe
+import=processing/index.recipe
+import=tools/index.recipe
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe
new file mode 100644
index 000000000..b6119c1b0
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe
@@ -0,0 +1,35 @@
+shaped=
+    mc:gold_ingot mc:iron_ingot _,
+    mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
+    mc:gold_ingot mc:iron_ingot _
+    -> 2 ae2:ItemMaterial.BasicCard
+    
+shaped=
+    oredictionary:gemDiamond mc:iron_ingot _,
+    mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
+    oredictionary:gemDiamond mc:iron_ingot _
+    -> 2 ae2:ItemMaterial.AdvCard
+
+shapeless=
+    ae2:ItemMaterial.BasicCard certusCrystal
+    -> ae2:ItemMaterial.CardCapacity
+
+shapeless=
+    ae2:ItemMaterial.BasicCard mc:redstone_torch
+    -> ae2:ItemMaterial.CardRedstone
+
+shapeless=
+    ae2:ItemMaterial.AdvCard wool
+    -> ae2:ItemMaterial.CardFuzzy
+
+shapeless=
+    ae2:ItemMaterial.AdvCard mc:redstone_torch
+    -> ae2:ItemMaterial.CardInverter
+
+shapeless=
+    ae2:ItemMaterial.AdvCard fluixCrystal
+    -> ae2:ItemMaterial.CardSpeed
+    
+shapeless=
+    ae2:ItemMaterial.BasicCard mc:crafting_table
+    -> ae2:ItemMaterial.CardCrafting
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe
new file mode 100644
index 000000000..5d21c3228
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/circuits.recipe
@@ -0,0 +1,15 @@
+inscribe=
+    mc:gold_ingot ae2:ItemMaterial.LogicProcessorPress
+    -> ae2:ItemMaterial.LogicProcessorPrint
+
+inscribe=
+    ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.CalcProcessorPress
+    -> ae2:ItemMaterial.CalcProcessorPrint
+
+inscribe=
+    oredictionary:gemDiamond ae2:ItemMaterial.EngProcessorPress
+    -> ae2:ItemMaterial.EngProcessorPrint
+
+inscribe=
+    oredictionary:itemSilicon ae2:ItemMaterial.SiliconPress
+    -> ae2:ItemMaterial.SiliconPrint
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe
new file mode 100644
index 000000000..389f97d22
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe
@@ -0,0 +1,7 @@
+shaped=
+    netherCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor
+    -> 2 ae2:ItemMaterial.AnnihilationCore
+
+shaped=
+    certusCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor
+    -> 2 ae2:ItemMaterial.FormationCore
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe
new file mode 100644
index 000000000..2f989adc2
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe
@@ -0,0 +1,5 @@
+import=materials/cards.recipe
+import=materials/circuits.recipe
+import=materials/cores.recipe
+import=materials/presses.recipe
+import=materials/processors.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe
new file mode 100644
index 000000000..a18b83711
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/presses.recipe
@@ -0,0 +1,15 @@
+inscribe=
+    mc:iron_block ae2:ItemMaterial.LogicProcessorPress
+    -> ae2:ItemMaterial.LogicProcessorPress
+
+inscribe=
+    mc:iron_block ae2:ItemMaterial.CalcProcessorPress
+    -> ae2:ItemMaterial.CalcProcessorPress
+
+inscribe=
+    mc:iron_block ae2:ItemMaterial.EngProcessorPress
+    -> ae2:ItemMaterial.EngProcessorPress
+
+inscribe=
+    mc:iron_block ae2:ItemMaterial.SiliconPress
+    -> ae2:ItemMaterial.SiliconPress
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe
new file mode 100644
index 000000000..c9e7c9b5c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/processors.recipe
@@ -0,0 +1,11 @@
+press=
+    mc:redstone ae2:ItemMaterial.LogicProcessorPrint ae2:ItemMaterial.SiliconPrint
+    -> ae2:ItemMaterial.LogicProcessor
+
+press=
+    mc:redstone ae2:ItemMaterial.CalcProcessorPrint ae2:ItemMaterial.SiliconPrint
+    -> ae2:ItemMaterial.CalcProcessor
+
+press=
+    mc:redstone ae2:ItemMaterial.EngProcessorPrint ae2:ItemMaterial.SiliconPrint
+    -> ae2:ItemMaterial.EngProcessor
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe
new file mode 100644
index 000000000..4ef1abbfe
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe
@@ -0,0 +1,11 @@
+shaped=
+    ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone,
+    ae2:BlockSkyStone _	ae2:BlockSkyStone,
+    ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone
+    -> ae2:BlockSkyChest
+
+shaped=
+    ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1,
+    ae2:BlockSkyStone:1 _ ae2:BlockSkyStone:1,
+    ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1
+    -> ae2:BlockSkyChest:1
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe
new file mode 100644
index 000000000..024ce79b4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe
@@ -0,0 +1,15 @@
+shapeless=
+    ae2:BlockQuartz
+    -> 4 ae2:ItemMaterial.CertusQuartzCrystal
+
+shapeless=
+    ae2:BlockQuartzPillar
+    -> 4 ae2:ItemMaterial.CertusQuartzCrystal
+
+shapeless=
+    ae2:BlockQuartzChiseled
+    -> 4 ae2:ItemMaterial.CertusQuartzCrystal
+
+shapeless=
+    ae2:BlockFluix
+    -> 4 ae2:ItemMaterial.FluixCrystal
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe
new file mode 100644
index 000000000..da2d97c45
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe
@@ -0,0 +1,5 @@
+shaped=
+    oredictionary:dustFluix fluixCrystal oredictionary:dustFluix,
+    fluixCrystal mc:ender_pearl fluixCrystal,
+    oredictionary:dustFluix fluixCrystal oredictionary:dustFluix
+    -> ae2:ItemMaterial.FluixPearl
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe
new file mode 100644
index 000000000..61ffae648
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/grindstone.recipe
@@ -0,0 +1,17 @@
+shaped=
+    _ oredictionary:stickWood _,
+    oredictionary:stickWood _ oredictionary:stickWood,
+    _ oredictionary:stickWood _
+    -> ae2:ItemMaterial.WoodenGear
+    
+shaped=
+    oredictionary:stickWood oredictionary:stickWood oredictionary:stickWood,
+    _ _ oredictionary:stickWood,
+    _ _ oredictionary:stickWood
+    -> ae2:BlockCrank
+
+shaped=
+    oredictionary:stone oredictionary:gearWood oredictionary:stone,
+    crystalQuartz oredictionary:stone crystalQuartz,
+    oredictionary:cobblestone crystalQuartz oredictionary:cobblestone
+    -> ae2:BlockGrinder
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe
new file mode 100644
index 000000000..59927195d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe
@@ -0,0 +1,8 @@
+import=misc/chests.recipe
+import=misc/deconstruction.recipe
+import=misc/fluixpearl.recipe
+import=misc/grindstone.recipe
+import=misc/meteors.recipe
+import=misc/tinytnt.recipe
+import=misc/seeds.recipe
+import=misc/vanilla.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe
new file mode 100644
index 000000000..46dcadc65
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe
@@ -0,0 +1,5 @@
+shaped=
+    _ mc:iron_ingot _,
+    mc:iron_ingot ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot,
+    _ mc:iron_ingot _
+    -> ae2:BlockSkyCompass
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe
new file mode 100644
index 000000000..8f9019f81
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe
@@ -0,0 +1,3 @@
+shapeless= mc:sand oredictionary:dustNetherQuartz	-> 2 ae2:ItemCrystalSeed.Nether
+shapeless= mc:sand oredictionary:dustCertusQuartz	-> 2 ae2:ItemCrystalSeed.Certus
+shapeless= mc:sand oredictionary:dustFluix			-> 2 ae2:ItemCrystalSeed.Fluix
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe
new file mode 100644
index 000000000..3b2fd9f28
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe
@@ -0,0 +1,4 @@
+shaped=
+    dustQuartz mc:gunpowder,
+    mc:gunpowder dustQuartz
+    -> ae2:BlockTinyTNT
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe
new file mode 100644
index 000000000..8d22650e0
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/vanilla.recipe
@@ -0,0 +1,21 @@
+shaped=
+    glass glass glass,
+    netherCrystal netherCrystal netherCrystal,
+    mc:wooden_slab:* mc:wooden_slab:* mc:wooden_slab:*
+    -> mc:daylight_detector
+
+shaped=
+    _ mc:redstone_torch _,
+    mc:redstone_torch netherCrystal mc:redstone_torch,
+    oredictionary:stone oredictionary:stone oredictionary:stone
+    -> mc:comparator
+    
+shaped=
+    ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget,
+    ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget,
+    ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget
+    -> mc:iron_ingot
+
+shapeless=
+    mc:iron_ingot
+    -> 9 ae2:ItemMaterial.IronNugget
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe
new file mode 100644
index 000000000..6dda769b9
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe
@@ -0,0 +1,5 @@
+shaped=
+    wool ae2:ItemMaterial.CalcProcessor wool,
+    mc:iron_ingot mc:chest mc:iron_ingot,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:BlockCellWorkbench
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe
new file mode 100644
index 000000000..2956d24ff
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe
@@ -0,0 +1,5 @@
+shaped=
+    ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1,
+    ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.PurifiedFluixCrystal,
+    ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1
+    -> ae2:BlockController
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe
new file mode 100644
index 000000000..ae1ff5e1a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe
@@ -0,0 +1,11 @@
+shaped=
+    mc:iron_ingot cable mc:iron_ingot,
+    ae2:BlockQuartzGlass  ae2:BlockFluix ae2:BlockQuartzGlass,
+    mc:iron_ingot cable mc:iron_ingot
+    -> ae2:BlockQuartzGrowthAccelerator
+
+shaped=
+    mc:iron_ingot fluixCrystal mc:iron_ingot,
+    mc:iron_ingot _ _,
+    mc:iron_ingot fluixCrystal mc:iron_ingot
+    -> ae2:BlockCharger
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe
new file mode 100644
index 000000000..5fc088870
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe
@@ -0,0 +1,23 @@
+shaped=
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot,
+    mc:iron_ingot mc:furnace mc:iron_ingot,
+    mc:iron_ingot ae2:BlockEnergyAcceptor mc:iron_ingot
+    -> ae2:BlockVibrationChamber
+
+shaped=
+    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
+    ae2:BlockQuartzGlass  fluixCrystal ae2:BlockQuartzGlass,
+    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
+    -> ae2:BlockEnergyAcceptor
+    
+shaped=
+    certusCrystal oredictionary:dustFluix certusCrystal,
+    oredictionary:dustFluix ae2:BlockQuartzGlass oredictionary:dustFluix,
+    certusCrystal oredictionary:dustFluix certusCrystal
+    -> ae2:BlockEnergyCell
+
+shaped=
+    ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell,
+    ae2:BlockEnergyCell ae2:ItemMaterial.CalcProcessor ae2:BlockEnergyCell,
+    ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell
+    -> ae2:BlockDenseEnergyCell
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe
new file mode 100644
index 000000000..6174d5014
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe
@@ -0,0 +1,11 @@
+import=network/blocks/cellworkbench.recipe
+import=network/blocks/controller.recipe
+import=network/blocks/crystal-processing.recipe
+import=network/blocks/energy.recipe
+import=network/blocks/inscribers.recipe
+import=network/blocks/interfaces.recipe
+import=network/blocks/io.recipe
+import=network/blocks/quantum.recipe
+import=network/blocks/security.recipe
+import=network/blocks/spatial-io.recipe
+import=network/blocks/storage.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe
new file mode 100644
index 000000000..ac555c548
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe
@@ -0,0 +1,5 @@
+shaped=
+    mc:iron_ingot mc:sticky_piston mc:iron_ingot,
+    fluixCrystal _ mc:iron_ingot,
+    mc:iron_ingot mc:sticky_piston mc:iron_ingot
+    -> ae2:BlockInscriber
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe
new file mode 100644
index 000000000..cd46b29be
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe
@@ -0,0 +1,13 @@
+shapeless=
+    ae2:ItemPart.Interface
+    -> ae2:BlockInterface
+
+shapeless=
+    ae2:BlockInterface
+    -> ae2:ItemPart.Interface
+
+shaped=
+    mc:iron_ingot glass mc:iron_ingot,
+    ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore,
+    mc:iron_ingot glass mc:iron_ingot
+    -> ae2:BlockInterface
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe
new file mode 100644
index 000000000..e1f809c74
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe
@@ -0,0 +1,11 @@
+shaped=
+    mc:iron_ingot glass mc:iron_ingot,
+    glass oredictionary:dustFluix glass,
+    mc:iron_ingot glass mc:iron_ingot
+    -> ae2:BlockCondenser
+
+shaped=
+    glass glass glass,
+    ae2:BlockDrive cable ae2:BlockDrive,
+    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot
+    -> ae2:BlockIOPort
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe
new file mode 100644
index 000000000..9495da6d4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe
@@ -0,0 +1,13 @@
+# Quantum Link Chamber
+shaped=
+    ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass,
+    ae2:ItemMaterial.FluixPearl _ ae2:ItemMaterial.FluixPearl,
+    ae2:BlockQuartzGlass ae2:ItemMaterial.FluixPearl ae2:BlockQuartzGlass,
+    -> ae2:BlockQuantumLinkChamber
+
+# Quantum Ring
+shaped=
+    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
+    ae2:ItemMaterial.EngProcessor ae2:BlockEnergyCell densecable,
+    mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot,
+    -> ae2:BlockQuantumRing
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe
new file mode 100644
index 000000000..7ec92781a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe
@@ -0,0 +1,5 @@
+shaped=
+    mc:iron_ingot ae2:BlockChest mc:iron_ingot,
+    cable ae2:ItemMaterial.Cell16kPart cable,
+    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    -> ae2:BlockSecurity
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe
new file mode 100644
index 000000000..b80b7456d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe
@@ -0,0 +1,11 @@
+shaped=
+    glass glass glass,
+    cable ae2:BlockIOPort cable,
+    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    -> ae2:BlockSpatialIOPort
+
+shaped=
+    ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass,
+    oredictionary:dustFluix fluixCrystal oredictionary:dustFluix,
+    ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass
+    -> ae2:BlockSpatialPylon
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe
new file mode 100644
index 000000000..dbbc50a35
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe
@@ -0,0 +1,11 @@
+shaped=
+    glass ae2:ItemPart.Terminal glass,
+    cable _ cable,
+    mc:iron_ingot fluixCrystal mc:iron_ingot,
+    -> ae2:BlockChest
+
+shaped=
+    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot,
+    cable _ cable,
+    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
+    -> ae2:BlockDrive
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe
new file mode 100644
index 000000000..1e1b5bbca
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe
@@ -0,0 +1,104 @@
+shapeless=
+    ae2:CableGlass
+    wool
+    -> ae2:CableCovered.Fluix
+
+shapeless=
+    ae2:CableCovered mc:water_bucket
+    -> ae2:CableCovered.Fluix
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeWhite ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.White
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeBlack ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Black
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeRed ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Red
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeGreen ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Green
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeBrown ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Brown
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeBlue ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Blue
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyePurple ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Purple
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeCyan ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Cyan
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeLightGray ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.LightGray
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeGray ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Gray
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyePink ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Pink
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeLime ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Lime
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeYellow ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Yellow
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeLightBlue ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.LightBlue
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeMagenta ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Magenta
+
+shaped=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered,
+    ae2:CableCovered oredictionary:dyeOrange ae2:CableCovered,
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered
+    -> 8 ae2:CableCovered.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe
new file mode 100644
index 000000000..bd2cc7919
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe
@@ -0,0 +1,104 @@
+shapeless=
+    ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered 
+    mc:redstone mc:glowstone_dust
+    -> ae2:CableDense.Fluix
+
+shapeless=
+    ae2:CableDense mc:water_bucket
+    -> ae2:CableDense.Fluix
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeWhite ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.White
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeBlack ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Black
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeRed ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Red
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeGreen ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Green
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeBrown ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Brown
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeBlue ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Blue
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyePurple ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Purple
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeCyan ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Cyan
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeLightGray ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.LightGray
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeGray ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Gray
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyePink ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Pink
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeLime ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Lime
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeYellow ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Yellow
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeLightBlue ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.LightBlue
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeMagenta ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Magenta
+
+shaped=
+    ae2:CableDense ae2:CableDense ae2:CableDense,
+    ae2:CableDense oredictionary:dyeOrange ae2:CableDense,
+    ae2:CableDense ae2:CableDense ae2:CableDense
+    -> 8 ae2:CableDense.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe
new file mode 100644
index 000000000..8fdecd928
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe
@@ -0,0 +1,103 @@
+shapeless=
+    ae2:ItemPart.QuartzFiber fluixCrystal fluixCrystal
+    -> 4 ae2:CableGlass.Fluix
+
+shapeless=
+    ae2:CableGlass mc:water_bucket
+    -> ae2:CableGlass.Fluix
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeWhite ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.White
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeBlack ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Black
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeRed ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Red
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeGreen ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Green
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeBrown ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Brown
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeBlue ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Blue
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyePurple ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Purple
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeCyan ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Cyan
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeLightGray ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.LightGray
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeGray ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Gray
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyePink ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Pink
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeLime ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Lime
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeYellow ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Yellow
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeLightBlue ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.LightBlue
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeMagenta ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Magenta
+
+shaped=
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass,
+    ae2:CableGlass oredictionary:dyeOrange ae2:CableGlass,
+    ae2:CableGlass ae2:CableGlass ae2:CableGlass
+    -> 8 ae2:CableGlass.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/index.recipe
new file mode 100644
index 000000000..00752ce95
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/index.recipe
@@ -0,0 +1,4 @@
+import=network/cables/covered.recipe
+import=network/cables/dense.recipe
+import=network/cables/glass.recipe
+import=network/cables/smart.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe
new file mode 100644
index 000000000..4d2e2a1a1
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe
@@ -0,0 +1,104 @@
+shapeless=
+    ae2:CableCovered
+    mc:redstone mc:glowstone_dust
+    -> ae2:CableSmart.Fluix
+
+shapeless=
+    ae2:CableSmart mc:water_bucket
+    -> ae2:CableSmart.Fluix
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeWhite ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.White
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeBlack ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Black
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeRed ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Red
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeGreen ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Green
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeBrown ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Brown
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeBlue ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Blue
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyePurple ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Purple
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeCyan ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Cyan
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeLightGray ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.LightGray
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeGray ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Gray
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyePink ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Pink
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeLime ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Lime
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeYellow ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Yellow
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeLightBlue ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.LightBlue
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeMagenta ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Magenta
+
+shaped=
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart,
+    ae2:CableSmart oredictionary:dyeOrange ae2:CableSmart,
+    ae2:CableSmart ae2:CableSmart ae2:CableSmart
+    -> 8 ae2:CableSmart.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe
new file mode 100644
index 000000000..9bd573de7
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe
@@ -0,0 +1,5 @@
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone _ mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemMaterial.EmptyStorageCell
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe
new file mode 100644
index 000000000..74c55d8e4
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe
@@ -0,0 +1,6 @@
+import=network/cells/empty.recipe
+import=network/cells/spatial-components.recipe
+import=network/cells/spatial.recipe
+import=network/cells/storage-components.recipe
+import=network/cells/storage.recipe
+import=network/cells/view.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-componets.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-componets.recipe
new file mode 100644
index 000000000..cd9597a70
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-componets.recipe
@@ -0,0 +1,17 @@
+shaped=
+    mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust,
+    ae2:ItemMaterial.FluixPearl ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.FluixPearl,
+    mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust
+    -> ae2:ItemMaterial.Cell2SpatialPart
+
+shaped=
+    mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust,
+    ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell2SpatialPart,
+    mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust
+    -> ae2:ItemMaterial.Cell16SpatialPart
+
+shaped=
+    mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust,
+    ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell16SpatialPart,
+    mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust
+    -> ae2:ItemMaterial.Cell128SpatialPart
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe
new file mode 100644
index 000000000..af13bcf68
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe
@@ -0,0 +1,26 @@
+shapeless=
+    ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.2Cubed
+
+shapeless=
+    ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.16Cubed
+
+shapeless=
+    ae2:ItemMaterial.Cell128SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.128Cubed
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell2SpatialPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemSpatialStorageCell.2Cubed
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell16SpatialPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemSpatialStorageCell.16Cubed
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell128SpatialPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemSpatialStorageCell.128Cubed
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe
new file mode 100644
index 000000000..7a5e0e224
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe
@@ -0,0 +1,23 @@
+shaped=
+    mc:redstone certusCrystal mc:redstone,
+    certusCrystal ae2:ItemMaterial.LogicProcessor certusCrystal,
+    mc:redstone certusCrystal mc:redstone
+    -> ae2:ItemMaterial.Cell1kPart
+
+shaped=
+    mc:redstone ae2:ItemMaterial.CalcProcessor mc:redstone,
+    ae2:ItemMaterial.Cell1kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell1kPart,
+    mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone
+    -> ae2:ItemMaterial.Cell4kPart
+
+shaped=
+    mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
+    ae2:ItemMaterial.Cell4kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell4kPart,
+    mc:glowstone_dust ae2:ItemMaterial.Cell4kPart mc:glowstone_dust
+    -> ae2:ItemMaterial.Cell16kPart
+
+shaped=
+    mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
+    ae2:ItemMaterial.Cell16kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell16kPart,
+    mc:glowstone_dust ae2:ItemMaterial.Cell16kPart mc:glowstone_dust
+    -> ae2:ItemMaterial.Cell64kPart
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe
new file mode 100644
index 000000000..dc468784c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe
@@ -0,0 +1,35 @@
+shapeless=
+    ae2:ItemMaterial.Cell1kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.1k
+
+shapeless=
+    ae2:ItemMaterial.Cell4kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.4k
+
+shapeless=
+    ae2:ItemMaterial.Cell16kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.16k
+
+shapeless=
+    ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k
+    
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemBasicStorageCell.1k
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell4kPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemBasicStorageCell.4k
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell16kPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemBasicStorageCell.16k
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone ae2:ItemMaterial.Cell64kPart mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemBasicStorageCell.64k
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe
new file mode 100644
index 000000000..f8a1ac029
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe
@@ -0,0 +1,8 @@
+shapeless=
+    certusCrystal ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemViewCell
+
+shaped=
+    ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
+    mc:redstone certusCrystal mc:redstone,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemViewCell
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe
new file mode 100644
index 000000000..59a2a06c5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/assembler.recipe
@@ -0,0 +1,5 @@
+shaped=
+    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
+    ae2:ItemMaterial.AnnihilationCore mc:crafting_table ae2:ItemMaterial.FormationCore,
+    mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
+    -> ae2:BlockMolecularAssembler
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe
new file mode 100644
index 000000000..f10e5298c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe
@@ -0,0 +1,37 @@
+shaped=
+    mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
+    cable ae2:ItemMaterial.LogicProcessor cable,
+    mc:iron_ingot ae2:ItemMaterial.CalcProcessor mc:iron_ingot
+    -> ae2:BlockCraftingUnit:0
+
+# co processor
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemMaterial.EngProcessor
+    -> ae2:BlockCraftingUnit:1
+
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemPart.StorageMonitor
+    -> ae2:BlockCraftingMonitor
+
+# various storage sizes
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemMaterial.Cell1kPart
+    -> ae2:BlockCraftingStorage:0
+
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemMaterial.Cell4kPart
+    -> ae2:BlockCraftingStorage:1
+
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemMaterial.Cell16kPart
+    -> ae2:BlockCraftingStorage:2
+
+shapeless=
+    ae2:BlockCraftingUnit:0
+    ae2:ItemMaterial.Cell64kPart
+    -> ae2:BlockCraftingStorage:3
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe
new file mode 100644
index 000000000..2d4f10d0b
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe
@@ -0,0 +1,3 @@
+import=network/crafting/assembler.recipe
+import=network/crafting/cpu.recipe
+import=network/crafting/patterns.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe
new file mode 100644
index 000000000..f3f94a32a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe
@@ -0,0 +1,5 @@
+shaped=
+    ae2:BlockQuartzGlass mc:glowstone_dust ae2:BlockQuartzGlass,
+    mc:glowstone_dust certusCrystal mc:glowstone_dust,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot
+    -> ae2:ItemMaterial.BlankPattern
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe
new file mode 100644
index 000000000..22cdf1319
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe
@@ -0,0 +1,6 @@
+import=network/blocks/index.recipe
+import=network/cables/index.recipe
+import=network/cells/index.recipe
+import=network/crafting/index.recipe
+import=network/parts/index.recipe
+import=network/wireless.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe
new file mode 100644
index 000000000..589b886bf
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe
@@ -0,0 +1,3 @@
+shapeless=
+    metalIngots knife
+    -> 3 ae2:ItemPart.CableAnchor
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe
new file mode 100644
index 000000000..d337cf4c1
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe
@@ -0,0 +1,3 @@
+shapeless=
+    ae2:ItemMaterial.CalcProcessor mc:redstone_torch
+    -> ae2:ItemPart.LevelEmitter
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe
new file mode 100644
index 000000000..1f8093c3c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe
@@ -0,0 +1,10 @@
+import=network/parts/cable-anchor.recipe
+import=network/parts/emitters.recipe
+import=network/parts/io-buses.recipe
+import=network/parts/monitors.recipe
+import=network/parts/panels.recipe
+import=network/parts/planes.recipe
+import=network/parts/quartz-fiber.recipe
+import=network/parts/terminals.recipe
+import=network/parts/toggle-buses.recipe
+import=network/parts/tunnels.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe
new file mode 100644
index 000000000..07edba823
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe
@@ -0,0 +1,13 @@
+shaped=
+    mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot,
+    _ mc:piston _
+    -> ae2:ItemPart.ExportBus
+
+shaped=
+    _ ae2:ItemMaterial.AnnihilationCore _,
+    mc:iron_ingot mc:sticky_piston mc:iron_ingot
+    -> ae2:ItemPart.ImportBus
+    
+shapeless=
+    interface mc:sticky_piston mc:piston
+    -> ae2:ItemPart.StorageBus
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe
new file mode 100644
index 000000000..f6504bcbe
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe
@@ -0,0 +1,7 @@
+shapeless=
+    ae2:ItemPart.LevelEmitter monitor
+    -> ae2:ItemPart.StorageMonitor
+
+shapeless=
+    ae2:ItemMaterial.AnnihilationCore ae2:ItemPart.StorageMonitor ae2:ItemMaterial.FormationCore
+    -> ae2:ItemPart.ConversionMonitor
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe
new file mode 100644
index 000000000..0a3c1f750
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe
@@ -0,0 +1,17 @@
+shaped=
+    _ mc:glowstone_dust ae2:BlockQuartzGlass,
+    mc:iron_ingot mc:redstone ae2:BlockQuartzGlass,
+    _ mc:glowstone_dust ae2:BlockQuartzGlass
+    -> 3 ae2:ItemPart.SemiDarkMonitor
+
+shapeless=
+    ae2:ItemPart.DarkMonitor
+    -> ae2:ItemPart.SemiDarkMonitor
+
+shapeless=
+    ae2:ItemPart.SemiDarkMonitor
+    -> ae2:ItemPart.Monitor
+
+shapeless=
+    ae2:ItemPart.Monitor
+    -> ae2:ItemPart.DarkMonitor
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe
new file mode 100644
index 000000000..0e68981f3
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe
@@ -0,0 +1,25 @@
+shaped=
+    fluixCrystal fluixCrystal fluixCrystal,
+    mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot
+    -> ae2:ItemPart.FormationPlane
+
+shaped=
+    fluixCrystal fluixCrystal fluixCrystal,
+    mc:iron_ingot ae2:ItemMaterial.AnnihilationCore mc:iron_ingot
+    -> ae2:ItemPart.AnnihilationPlane
+
+shaped=
+    mc:iron_ingot fluixCrystal,
+    ae2:ItemMaterial.AnnihilationCore fluixCrystal,
+    mc:iron_ingot fluixCrystal
+    -> ae2:ItemPart.AnnihilationPlane
+
+shaped=
+    mc:iron_ingot fluixCrystal,
+    ae2:ItemMaterial.FormationCore fluixCrystal,
+    mc:iron_ingot fluixCrystal
+    -> ae2:ItemPart.FormationPlane
+
+shapeless=
+    ae2:ItemPart.AnnihilationPlane ae2:ItemMaterial.FluixPearl
+    -> ae2:ItemPart.IdentityAnnihilationPlane
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe
new file mode 100644
index 000000000..67994b01d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe
@@ -0,0 +1,5 @@
+shaped=
+    glass glass glass,
+    dustQuartz dustQuartz dustQuartz,
+    glass glass glass
+    -> 3 ae2:ItemPart.QuartzFiber
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe
new file mode 100644
index 000000000..51f0b7b68
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe
@@ -0,0 +1,15 @@
+shapeless=
+    monitor ae2:ItemMaterial.FormationCore ae2:ItemMaterial.AnnihilationCore ae2:ItemMaterial.LogicProcessor
+    -> ae2:ItemPart.Terminal
+
+shapeless=
+    ae2:ItemPart.Terminal mc:crafting_table ae2:ItemMaterial.CalcProcessor
+    -> ae2:ItemPart.CraftingTerminal
+
+shapeless=
+    monitor interface ae2:ItemMaterial.EngProcessor
+    -> ae2:ItemPart.InterfaceTerminal
+
+shapeless=
+    ae2:ItemPart.CraftingTerminal ae2:ItemMaterial.EngProcessor
+    -> ae2:ItemPart.PatternTerminal
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe
new file mode 100644
index 000000000..b56689be7
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe
@@ -0,0 +1,13 @@
+shaped=
+    _ mc:redstone _,
+    cable mc:lever cable,
+    _ mc:redstone _
+    -> ae2:ItemPart.ToggleBus
+
+shapeless=
+    ae2:ItemPart.ToggleBus
+    -> ae2:ItemPart.InvertedToggleBus
+
+shapeless=
+    ae2:ItemPart.InvertedToggleBus
+    -> ae2:ItemPart.ToggleBus
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe
new file mode 100644
index 000000000..5a878c065
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe
@@ -0,0 +1,5 @@
+shaped=
+    _ mc:iron_ingot _,
+    mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot,
+    fluixCrystal fluixCrystal fluixCrystal
+    -> ae2:ItemPart.P2PTunnelME
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe
new file mode 100644
index 000000000..df898ee6c
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe
@@ -0,0 +1,22 @@
+shaped=
+    _ ae2:ItemMaterial.FluixPearl _,
+    mc:iron_ingot ae2:ItemPart.QuartzFiber mc:iron_ingot,
+    _ mc:iron_ingot _
+    -> ae2:ItemMaterial.Wireless
+
+shaped=
+    ae2:ItemMaterial.Wireless,
+    ae2:ItemMaterial.CalcProcessor,
+    cable
+    -> ae2:BlockWireless
+
+shaped=
+    ae2:ItemMaterial.Wireless,
+    ae2:ItemPart.Terminal,
+    ae2:BlockDenseEnergyCell
+    -> ae2:ToolWirelessTerminal
+
+shaped=
+    oredictionary:dustFluix certusCrystal dustEnder,
+    mc:iron_ingot mc:iron_ingot mc:iron_ingot,
+    -> 2 ae2:ItemMaterial.WirelessBooster
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/new.recipe b/src/main/resources/assets/appliedenergistics2/recipes/new.recipe
deleted file mode 100644
index 67fc87cf6..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/new.recipe
+++ /dev/null
@@ -1,189 +0,0 @@
-
-# Processor Recipes
-
-inscribe=
-	mc:iron_block ae2:ItemMaterial.LogicProcessorPress
-	-> ae2:ItemMaterial.LogicProcessorPress
-
-inscribe=
-	mc:iron_block ae2:ItemMaterial.CalcProcessorPress
-	-> ae2:ItemMaterial.CalcProcessorPress
-
-inscribe=
-	mc:iron_block ae2:ItemMaterial.EngProcessorPress
-	-> ae2:ItemMaterial.EngProcessorPress
-
-inscribe=
-	mc:iron_block ae2:ItemMaterial.SiliconPress
-	-> ae2:ItemMaterial.SiliconPress
-
-inscribe=
-	mc:gold_ingot ae2:ItemMaterial.LogicProcessorPress
-	-> ae2:ItemMaterial.LogicProcessorPrint
-
-inscribe=
-	ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.CalcProcessorPress
-	-> ae2:ItemMaterial.CalcProcessorPrint
-
-inscribe=
-	oredictionary:gemDiamond ae2:ItemMaterial.EngProcessorPress
-	-> ae2:ItemMaterial.EngProcessorPrint
-
-inscribe=
-	oredictionary:itemSilicon ae2:ItemMaterial.SiliconPress
-	-> ae2:ItemMaterial.SiliconPrint
-
-press=
-	mc:redstone ae2:ItemMaterial.LogicProcessorPrint ae2:ItemMaterial.SiliconPrint
-	-> ae2:ItemMaterial.LogicProcessor
-
-press=
-	mc:redstone ae2:ItemMaterial.CalcProcessorPrint ae2:ItemMaterial.SiliconPrint
-	-> ae2:ItemMaterial.CalcProcessor
-
-press=
-	mc:redstone ae2:ItemMaterial.EngProcessorPrint ae2:ItemMaterial.SiliconPrint
-	-> ae2:ItemMaterial.EngProcessor
-
-# Other New stuff
-
-shaped=
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot,
-	mc:iron_ingot mc:furnace mc:iron_ingot,
-	mc:iron_ingot ae2:BlockEnergyAcceptor mc:iron_ingot
-	-> ae2:BlockVibrationChamber
-
-shaped=
-	mc:iron_ingot ae2:BlockChest mc:iron_ingot,
-	cable ae2:ItemMaterial.Cell16kPart cable,
-	mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
-	-> ae2:BlockSecurity
-
-shapeless=
-	wrench monitor ae2:ItemMaterial.CalcProcessor mc:chest
-	-> ae2:ToolNetworkTool
-
-shaped=
-	certusCrystal oredictionary:dustFluix certusCrystal,
-	oredictionary:dustFluix ae2:BlockQuartzGlass oredictionary:dustFluix,
-	certusCrystal oredictionary:dustFluix certusCrystal
-	-> ae2:BlockEnergyCell
-
-shaped=
-	ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell,
-	ae2:BlockEnergyCell ae2:ItemMaterial.CalcProcessor ae2:BlockEnergyCell,
-	ae2:BlockEnergyCell ae2:BlockEnergyCell ae2:BlockEnergyCell
-	-> ae2:BlockDenseEnergyCell
-
-shaped=
-	ae2:BlockChest ae2:ItemMaterial.Cell1kPart ae2:BlockEnergyCell
-	-> ae2:ToolPortableCell
-
-shaped=
-	ae2:ItemMaterial.CertusQuartzCrystalCharged _ _,
-	_ mc:iron_ingot _,
-	_ _ mc:iron_ingot
-	-> ae2:ToolChargedStaff
-
-shaped=
-	fluixCrystal ae2:BlockEnergyCell _,
-	ae2:ItemMaterial.EngProcessor mc:iron_ingot _,
-	_ _ mc:iron_ingot
-	-> ae2:ToolEntropyManipulator
-
-shaped=
-	netherCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor
-	-> 2 ae2:ItemMaterial.AnnihilationCore
-
-shaped=
-	certusCrystal oreDictionary:dustFluix ae2:ItemMaterial.LogicProcessor
-	-> 2 ae2:ItemMaterial.FormationCore
-
-shaped=
-	ae2:ItemMaterial.EngProcessor mc:iron_ingot mc:iron_ingot,
-	mc:gold_ingot mc:redstone mc:gold_ingot
-	-> ae2:ToolBiometricCard
-
-# Memory Card
-shaped=
-	ae2:ItemMaterial.CalcProcessor mc:iron_ingot mc:iron_ingot,
-	mc:gold_ingot mc:redstone mc:gold_ingot
-	-> ae2:ToolMemoryCard
-
-shaped=
-	mc:gold_ingot mc:iron_ingot _,
-	mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
-	mc:gold_ingot mc:iron_ingot _
-	-> 2 ae2:ItemMaterial.BasicCard
-
-shaped=
-	_ 					mc:glowstone_dust ae2:BlockQuartzGlass,
-	mc:iron_ingot	mc:redstone ae2:BlockQuartzGlass,
-	_					mc:glowstone_dust ae2:BlockQuartzGlass
-	-> 3 ae2:ItemPart.SemiDarkMonitor
-
-shapeless=
-	ae2:ItemPart.DarkMonitor
-	-> ae2:ItemPart.SemiDarkMonitor
-
-shapeless=
-	ae2:ItemPart.SemiDarkMonitor
-	-> ae2:ItemPart.Monitor
-
-shapeless=
-	ae2:ItemPart.Monitor
-	-> ae2:ItemPart.DarkMonitor
-
-shaped=
-	oredictionary:gemDiamond mc:iron_ingot _,
-	mc:redstone ae2:ItemMaterial.CalcProcessor mc:iron_ingot,
-	oredictionary:gemDiamond mc:iron_ingot _
-	-> 2 ae2:ItemMaterial.AdvCard
-
-shapeless=
-	ae2:ItemMaterial.BasicCard certusCrystal
-	-> ae2:ItemMaterial.CardCapacity
-
-shapeless=
-	ae2:ItemMaterial.BasicCard mc:redstone_torch
-	-> ae2:ItemMaterial.CardRedstone
-
-shapeless=
-	ae2:ItemMaterial.AdvCard wool
-	-> ae2:ItemMaterial.CardFuzzy
-
-shapeless=
-	ae2:ItemMaterial.AdvCard mc:redstone_torch
-	-> ae2:ItemMaterial.CardInverter
-
-shapeless=
-	ae2:ItemMaterial.AdvCard fluixCrystal
-	-> ae2:ItemMaterial.CardSpeed
-
-shapeless=
-	ae2:ItemMaterial.AnnihilationCore ae2:ItemPart.StorageMonitor ae2:ItemMaterial.FormationCore
-	-> ae2:ItemPart.ConversionMonitor
-
-shaped=
-	_					mc:iron_ingot								_,
-	mc:iron_ingot	ae2:ItemMaterial.EngProcessor			mc:iron_ingot,
-	fluixCrystal	fluixCrystal								fluixCrystal
-	-> ae2:ItemPart.P2PTunnelME
-
-shaped=
-	wool	ae2:ItemMaterial.CalcProcessor	wool,
-	mc:iron_ingot	mc:chest							mc:iron_ingot,
-	mc:iron_ingot	mc:iron_ingot					mc:iron_ingot
-	-> ae2:BlockCellWorkbench
-
-shaped=
-	mc:iron_ingot	mc:sticky_piston	mc:iron_ingot,
-	fluixCrystal	_						mc:iron_ingot,
-	mc:iron_ingot	mc:sticky_piston	mc:iron_ingot
-	-> ae2:BlockInscriber
-
-shaped=
-	_ mc:iron_ingot _,
-	mc:iron_ingot ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot,
-	_ mc:iron_ingot _
-	-> ae2:BlockSkyCompass
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe b/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe
new file mode 100644
index 000000000..1431e246e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/oredict.recipe
@@ -0,0 +1,29 @@
+# Forge Ore Dictionary
+# logWood, slabWood, stairWood, treeSapling, treeLeaves,
+# oreGold, oreIron, oreLapis, oreDiamond, oreRedstone, oreEmerald, oreQuartz, oreCoal,
+# stone, cobblestone, record, stickWood, plankWood,
+# dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite
+
+# Minecraft Ore Dict Entries
+# Renamed for less clashing
+ore=mc:quartz -> crystalNetherQuartz
+ore=mc:wool:* -> blockWool
+ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay
+
+# AE2 Ore Dictionary
+# Materials for processing in other machines
+ore=ae2:ItemMaterial.CertusQuartzCrystal -> crystalCertusQuartz
+ore=ae2:ItemMaterial.FluixCrystal -> crystalFluix
+ore=ae2:ItemMaterial.PurifiedFluixCrystal -> crystalPureFluix
+ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz
+ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz
+ore=ae2:ItemMaterial.FluixDust -> dustFluix
+
+# Ores of AE2
+ore=ae2:tile.OreQuartz -> oreCertusQuartz
+ore=ae2:tile.OreQuartzCharged -> oreCertusQuartz
+
+# Parts to be used
+ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel
+ore= ae2:ItemPart.Monitor -> itemIlluminatedPanel
+ore= ae2:ItemPart.DarkMonitor -> itemIlluminatedPanel
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/paint_balls.recipe b/src/main/resources/assets/appliedenergistics2/recipes/paint_balls.recipe
deleted file mode 100644
index 62c1c49eb..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/paint_balls.recipe
+++ /dev/null
@@ -1,195 +0,0 @@
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeWhite ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.White
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeBlack ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Black
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeRed ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Red
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeGreen ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Green
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeBrown ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Brown
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeBlue ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Blue
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyePurple ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Purple
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeCyan ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Cyan
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeLightGray ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.LightGray
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeGray ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Gray
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyePink ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Pink
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeLime ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Lime
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeYellow ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Yellow
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeLightBlue ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.LightBlue
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeMagenta ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Magenta
-
-shaped=
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall oredictionary:dyeOrange ae2:ItemMaterial.MatterBall,
-	ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
-	-> 8 ae2:PaintBall.Orange
-
-
-
-shaped=
-	ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White,
-	ae2:PaintBall.White mc:glowstone_dust ae2:PaintBall.White,
-	ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White
-	-> 8 ae2:LumenPaintBall.White
-
-shaped=
-	ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black,
-	ae2:PaintBall.Black mc:glowstone_dust ae2:PaintBall.Black,
-	ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black
-	-> 8 ae2:LumenPaintBall.Black
-
-shaped=
-	ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red,
-	ae2:PaintBall.Red mc:glowstone_dust ae2:PaintBall.Red,
-	ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red
-	-> 8 ae2:LumenPaintBall.Red
-
-shaped=
-	ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green,
-	ae2:PaintBall.Green mc:glowstone_dust ae2:PaintBall.Green,
-	ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green
-	-> 8 ae2:LumenPaintBall.Green
-
-shaped=
-	ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown,
-	ae2:PaintBall.Brown mc:glowstone_dust ae2:PaintBall.Brown,
-	ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown
-	-> 8 ae2:LumenPaintBall.Brown
-
-shaped=
-	ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue,
-	ae2:PaintBall.Blue mc:glowstone_dust ae2:PaintBall.Blue,
-	ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue
-	-> 8 ae2:LumenPaintBall.Blue
-
-shaped=
-	ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple,
-	ae2:PaintBall.Purple mc:glowstone_dust ae2:PaintBall.Purple,
-	ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple
-	-> 8 ae2:LumenPaintBall.Purple
-
-shaped=
-	ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan,
-	ae2:PaintBall.Cyan mc:glowstone_dust ae2:PaintBall.Cyan,
-	ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan
-	-> 8 ae2:LumenPaintBall.Cyan
-
-shaped=
-	ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray,
-	ae2:PaintBall.LightGray mc:glowstone_dust ae2:PaintBall.LightGray,
-	ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray
-	-> 8 ae2:LumenPaintBall.LightGray
-
-shaped=
-	ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray,
-	ae2:PaintBall.Gray mc:glowstone_dust ae2:PaintBall.Gray,
-	ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray
-	-> 8 ae2:LumenPaintBall.Gray
-
-shaped=
-	ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink,
-	ae2:PaintBall.Pink mc:glowstone_dust ae2:PaintBall.Pink,
-	ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink
-	-> 8 ae2:LumenPaintBall.Pink
-
-shaped=
-	ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime,
-	ae2:PaintBall.Lime mc:glowstone_dust ae2:PaintBall.Lime,
-	ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime
-	-> 8 ae2:LumenPaintBall.Lime
-
-shaped=
-	ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow,
-	ae2:PaintBall.Yellow mc:glowstone_dust ae2:PaintBall.Yellow,
-	ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow
-	-> 8 ae2:LumenPaintBall.Yellow
-
-shaped=
-	ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue,
-	ae2:PaintBall.LightBlue mc:glowstone_dust ae2:PaintBall.LightBlue,
-	ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue
-	-> 8 ae2:LumenPaintBall.LightBlue
-
-shaped=
-	ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta,
-	ae2:PaintBall.Magenta mc:glowstone_dust ae2:PaintBall.Magenta,
-	ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta
-	-> 8 ae2:LumenPaintBall.Magenta
-
-shaped=
-	ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange,
-	ae2:PaintBall.Orange mc:glowstone_dust ae2:PaintBall.Orange,
-	ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange
-	-> 8 ae2:LumenPaintBall.Orange
-
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/port.recipe b/src/main/resources/assets/appliedenergistics2/recipes/port.recipe
deleted file mode 100644
index e53b12158..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/port.recipe
+++ /dev/null
@@ -1,238 +0,0 @@
-
-# Quartz Fiber
-shaped=
-	glass glass glass,
-	dustQuartz dustQuartz dustQuartz,
-	glass glass glass
-	-> 3 ae2:ItemPart.QuartzFiber
-
-# Glass Cable
-shapeless=
-	ae2:ItemPart.QuartzFiber fluixCrystal fluixCrystal
-	-> 4 ae2:CableGlass.Fluix
-
-# Covered Cable
-shapeless=
-	ae2:CableGlass
-	wool
-	-> ae2:CableCovered.Fluix
-
-# Smart Cable
-shapeless=
-	ae2:CableCovered
-	mc:redstone mc:glowstone_dust
-	-> ae2:CableSmart.Fluix
-
-# Smart Cable
-shapeless=
-	ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered 
-	mc:redstone mc:glowstone_dust
-	-> ae2:CableDense.Fluix
-
-shapeless=
-	ae2:CableSmart mc:water_bucket
-	-> ae2:CableSmart.Fluix
-
-shapeless=
-	ae2:CableCovered mc:water_bucket
-	-> ae2:CableCovered.Fluix
-
-shapeless=
-	ae2:CableGlass mc:water_bucket
-	-> ae2:CableGlass.Fluix
-
-shapeless=
-	ae2:CableDense mc:water_bucket
-	-> ae2:CableDense.Fluix
-
-# Planes
-
-shaped=
-	fluixCrystal fluixCrystal fluixCrystal,
-	mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot
-	-> ae2:ItemPart.FormationPlane
-
-shaped=
-	fluixCrystal fluixCrystal fluixCrystal,
-	mc:iron_ingot ae2:ItemMaterial.AnnihilationCore mc:iron_ingot
-	-> ae2:ItemPart.AnnihilationPlane
-
-shapeless=
-	ae2:ItemPart.AnnihilationPlane ae2:ItemMaterial.FluixPearl
-	-> ae2:ItemPart.IdentityAnnihilationPlane
-
-shaped=
-	glass	ae2:ItemPart.Terminal	glass,
-	cable						_								cable,
-	mc:iron_ingot			fluixCrystal				mc:iron_ingot,
-	-> ae2:BlockChest
-
-# Storage
-
-shaped=
-	mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot,
-	cable _ cable,
-	mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
-	-> ae2:BlockDrive
-
-# Misc
-shaped=
-	mc:iron_ingot glass mc:iron_ingot,
-	glass oredictionary:dustFluix glass,
-	mc:iron_ingot glass mc:iron_ingot
-	-> ae2:BlockCondenser
-
-shaped=
-	ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1,
-	ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.PurifiedFluixCrystal,
-	ae2:BlockSkyStone:1 ae2:ItemMaterial.PurifiedFluixCrystal ae2:BlockSkyStone:1
-	-> ae2:BlockController
-
-shapeless=
-	metalIngots knife
-	-> 3 ae2:ItemPart.CableAnchor
-
-shapeless=
-	monitor ae2:ItemMaterial.FormationCore ae2:ItemMaterial.AnnihilationCore ae2:ItemMaterial.LogicProcessor
-	-> ae2:ItemPart.Terminal
-
-shapeless=
-	ae2:ItemPart.Terminal mc:crafting_table ae2:ItemMaterial.CalcProcessor
-	-> ae2:ItemPart.CraftingTerminal
-
-shaped=
-	_ mc:redstone _,
-	cable mc:lever cable,
-	_ mc:redstone _
-	-> ae2:ItemPart.ToggleBus
-
-shapeless=
-	ae2:ItemPart.ToggleBus
-	-> ae2:ItemPart.InvertedToggleBus
-
-shapeless=
-	ae2:ItemPart.InvertedToggleBus
-	-> ae2:ItemPart.ToggleBus
-
-shaped=
-	glass glass glass,
-	ae2:BlockDrive cable ae2:BlockDrive,
-	mc:iron_ingot ae2:ItemMaterial.LogicProcessor mc:iron_ingot
-	-> ae2:BlockIOPort
-
-shaped=
-	glass glass glass,
-	cable ae2:BlockIOPort cable,
-	mc:iron_ingot ae2:ItemMaterial.EngProcessor mc:iron_ingot
-	-> ae2:BlockSpatialIOPort
-
-shaped=
-	ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass,
-	oredictionary:dustFluix fluixCrystal oredictionary:dustFluix,
-	ae2:BlockQuartzGlass cable ae2:BlockQuartzGlass
-	-> ae2:BlockSpatialPylon
-
-shaped=
-	mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot,
-	ae2:BlockQuartzGlass  fluixCrystal ae2:BlockQuartzGlass,
-	mc:iron_ingot ae2:BlockQuartzGlass mc:iron_ingot
-	-> ae2:BlockEnergyAcceptor
-
-shaped=
-	mc:iron_ingot cable mc:iron_ingot,
-	ae2:BlockQuartzGlass  ae2:fluix ae2:BlockQuartzGlass,
-	mc:iron_ingot cable mc:iron_ingot
-	-> ae2:BlockQuartzGrowthAccelerator
-
-shaped=
-	mc:iron_ingot fluixCrystal mc:iron_ingot,
-	mc:iron_ingot _ _,
-	mc:iron_ingot fluixCrystal mc:iron_ingot
-	-> ae2:BlockCharger
-
-shapeless=
-	ae2:ItemMaterial.CalcProcessor mc:redstone_torch
-	-> ae2:ItemPart.LevelEmitter
-
-shaped=
-	mc:iron_ingot ae2:ItemMaterial.FormationCore mc:iron_ingot,
-	_ mc:piston _
-	-> ae2:ItemPart.ExportBus
-
-shaped=
-	_ ae2:ItemMaterial.AnnihilationCore _,
-	mc:iron_ingot mc:sticky_piston mc:iron_ingot
-	-> ae2:ItemPart.ImportBus
-
-shaped=
-	mc:iron_ingot fluixCrystal,
-	ae2:ItemMaterial.AnnihilationCore fluixCrystal,
-	mc:iron_ingot fluixCrystal
-	-> ae2:ItemPart.AnnihilationPlane
-
-shaped=
-	mc:iron_ingot fluixCrystal,
-	ae2:ItemMaterial.FormationCore fluixCrystal,
-	mc:iron_ingot fluixCrystal
-	-> ae2:ItemPart.FormationPlane
-
-shapeless=
-	interface mc:sticky_piston mc:piston
-	-> ae2:ItemPart.StorageBus
-
-shapeless=
-	ae2:ItemPart.LevelEmitter monitor
-	-> ae2:ItemPart.StorageMonitor
-
-shapeless=
-	ae2:ItemPart.Interface
-	-> ae2:BlockInterface
-
-shapeless=
-	ae2:BlockInterface
-	-> ae2:ItemPart.Interface
-
-shaped=
-	mc:iron_ingot glass mc:iron_ingot,
-	ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore,
-	mc:iron_ingot glass mc:iron_ingot
-	-> ae2:BlockInterface
-
-# Matter Cannon
-shaped=
-	mc:iron_ingot mc:iron_ingot ae2:ItemMaterial.FormationCore,
-	ae2:ItemMaterial.Cell4kPart ae2:BlockEnergyCell _,
-	mc:iron_ingot _ _
-	-> ae2:ToolMassCannon
-
-# Wireless
-
-shaped=
-	_ ae2:ItemMaterial.FluixPearl _,
-	mc:iron_ingot ae2:ItemPart.QuartzFiber mc:iron_ingot,
-	_ mc:iron_ingot _
-	-> ae2:ItemMaterial.Wireless
-
-shaped=
-	ae2:ItemMaterial.Wireless,
-	ae2:ItemMaterial.CalcProcessor,
-	cable
-	-> ae2:BlockWireless
-
-shaped=
-	ae2:ItemMaterial.Wireless,
-	ae2:ItemPart.Terminal,
-	ae2:BlockDenseEnergyCell
-	-> ae2:ToolWirelessTerminal
-
-shaped=
-	oredictionary:dustFluix certusCrystal dustEnder,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot,
-	-> 2 ae2:ItemMaterial.WirelessBooster
-
-shaped=
-	dustQuartz mc:gunpowder,
-	mc:gunpowder dustQuartz
-	-> ae2:BlockTinyTNT
-
-import=hightech.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/process.recipe b/src/main/resources/assets/appliedenergistics2/recipes/process.recipe
deleted file mode 100644
index 96d199d8d..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/process.recipe
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# Sky Stone Chest
-
-shaped=
-	ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone,
-	ae2:BlockSkyStone _						ae2:BlockSkyStone,
-	ae2:BlockSkyStone ae2:BlockSkyStone ae2:BlockSkyStone
-	-> ae2:BlockSkyChest
-
-shaped=
-	ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1,
-	ae2:BlockSkyStone:1 _						 ae2:BlockSkyStone:1,
-	ae2:BlockSkyStone:1 ae2:BlockSkyStone:1 ae2:BlockSkyStone:1
-	-> ae2:BlockSkyChest:1
-	
-smelt=
-	ae2:BlockSkyStone -> ae2:BlockSkyStone:1
-
-shapeless=
-	ae2:BlockSkyStone:1 -> ae2:BlockSkyStone:2
-	
-shapeless=
-	ae2:BlockSkyStone:2 -> ae2:BlockSkyStone:3
-
-shapeless=
-	ae2:BlockSkyStone:3 -> ae2:BlockSkyStone:1
-
-# Quartz Glass
-	shaped=
-		dustQuartz glass dustQuartz,
-		glass dustQuartz glass,
-		dustQuartz glass dustQuartz
-		-> 4 ae2:BlockQuartzGlass
-
-	shaped=
-		mc:glowstone_dust ae2:BlockQuartzGlass mc:glowstone_dust
-		-> ae2:BlockQuartzLamp
-
-	shaped=
-		ae2:ItemMaterial.CertusQuartzCrystalCharged mc:iron_ingot
-		-> 2 ae2:BlockQuartzTorch
-
-	shaped=
-		netherCrystal mc:iron_ingot
-		-> ae2:BlockLightDetector
-
-# Seeds
-	shapeless= mc:sand oredictionary:dustNetherQuartz	-> 2 ae2:ItemCrystalSeed.Nether
-	shapeless= mc:sand oredictionary:dustCertusQuartz	-> 2 ae2:ItemCrystalSeed.Certus
-	shapeless= mc:sand oredictionary:dustFluix			-> 2 ae2:ItemCrystalSeed.Fluix
-
-# Gear Wooden ( optional item. )
-shaped=
-	_									oredictionary:stickWood		_,
-	oredictionary:stickWood 	_									oredictionary:stickWood,
-	_									oredictionary:stickWood		_
-	-> ae2:ItemMaterial.WoodenGear
-
-# Grind Stone
-
-	shaped=
-		oredictionary:stickWood oredictionary:stickWood oredictionary:stickWood,
-		_                       _                       oredictionary:stickWood,
-		_                       _                       oredictionary:stickWood
-		-> ae2:BlockCrank
-
-	shaped=
-		oredictionary:stone  		oredictionary:gearWood		oredictionary:stone,
-		crystalQuartz      	 		oredictionary:stone   		crystalQuartz,
-		oredictionary:cobblestone	crystalQuartz    				oredictionary:cobblestone
-		-> ae2:BlockGrinder
-
-# Iron
-	shaped=
-		ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget,
-		ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget,
-		ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget ae2:ItemMaterial.IronNugget
-		-> mc:iron_ingot
-	
-	shapeless=
-		mc:iron_ingot
-		-> 9 ae2:ItemMaterial.IronNugget
-
-
-
-# Raw Storage Blocks
-	shaped=
-		oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
-		oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz
-		-> ae2:BlockQuartz
-
-	shaped=
-		oredictionary:crystalFluix oredictionary:crystalFluix,
-		oredictionary:crystalFluix oredictionary:crystalFluix
-		-> ae2:fluix
-	
-
-# Pure Storage Blocks
-	shaped=
-		ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal,
-		ae2:ItemMaterial.PurifiedNetherQuartzCrystal _                                             ae2:ItemMaterial.PurifiedNetherQuartzCrystal,
-		ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal ae2:ItemMaterial.PurifiedNetherQuartzCrystal
-		-> mc:quartz_block
-
-	shaped=
-		ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal,
-		ae2:ItemMaterial.PurifiedCertusQuartzCrystal _                                             ae2:ItemMaterial.PurifiedCertusQuartzCrystal,
-		ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal ae2:ItemMaterial.PurifiedCertusQuartzCrystal
-		-> ae2:BlockQuartz
-
-	shaped=
-		ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal,
-		ae2:ItemMaterial.PurifiedFluixCrystal _                                      ae2:ItemMaterial.PurifiedFluixCrystal,
-		ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal
-		-> ae2:fluix
-
-
-
-# Decrative Certus
-	shaped=
-		ae2:BlockQuartz,
-		ae2:BlockQuartz
-		-> 2 ae2:BlockQuartzPillar
-
-	shaped=
-		ae2:BlockQuartz ae2:BlockQuartz
-		-> 2 ae2:BlockQuartzChiseled
-
-
-
-# Deconstruction
-	shapeless=
-		ae2:BlockQuartz
-		-> 4 ae2:ItemMaterial.CertusQuartzCrystal
-
-	shapeless=
-		ae2:BlockQuartzPillar
-		-> 4 ae2:ItemMaterial.CertusQuartzCrystal
-
-	shapeless=
-		ae2:BlockQuartzChiseled
-		-> 4 ae2:ItemMaterial.CertusQuartzCrystal
-
-	shapeless=
-		ae2:fluix
-		-> 4 ae2:ItemMaterial.FluixCrystal
-
-# Quantum Pearl
-	shaped=
-		oredictionary:dustFluix fluixCrystal oredictionary:dustFluix,
-		fluixCrystal mc:ender_pearl fluixCrystal,
-		oredictionary:dustFluix fluixCrystal oredictionary:dustFluix
-		-> ae2:ItemMaterial.FluixPearl
-
-
-# Machine Process
-	grind= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	grind= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	grind= mc:gravel -> mc:flint
-	grind= mc:bone -> 4 mc:dye:15
-
-	grindfz= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	grindfz= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	grindfz= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-#	grindfz= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-	grindfz= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	grindfz= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-#	grindfz= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	grindfz= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	grindfz= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-	mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-#bug	mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-#bug	mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-#	mekcrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-#bug	mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-	mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	mekechamber= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	mekechamber= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-	hccrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	hccrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	hccrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-	hccrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-	hccrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	hccrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-	hccrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	hccrusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	hccrusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-	crusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	crusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	crusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-	crusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-	crusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	crusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-	crusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	crusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	crusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-	macerator= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	macerator= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	macerator= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-#	macerator= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-	macerator= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	macerator= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-	macerator= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	macerator= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	macerator= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-	pulverizer= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
-	pulverizer= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
-	pulverizer= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
-	pulverizer= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
-	pulverizer= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
-	pulverizer= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
-	pulverizer= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
-	pulverizer= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
-	pulverizer= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
-
-# Ore Processing
-	smelt= ae2:ItemMaterial.GoldDust -> mc:gold_ingot
-	smelt= ae2:ItemMaterial.IronDust -> mc:iron_ingot
-	smelt= ae2:ItemMaterial.Flour -> mc:bread
-
-
-
-# Silicon
-	smelt= ae2:ItemMaterial.NetherQuartzDust -> ae2:ItemMaterial.Silicon
-	smelt= ae2:ItemMaterial.CertusQuartzDust -> ae2:ItemMaterial.Silicon
-
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe
new file mode 100644
index 000000000..d72fb7859
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/factorization.recipe
@@ -0,0 +1,9 @@
+grindfz= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+grindfz= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+grindfz= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+# grindfz= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+grindfz= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+grindfz= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+# grindfz= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+grindfz= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+grindfz= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe
new file mode 100644
index 000000000..f5a14d9ad
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/grind.recipe
@@ -0,0 +1,4 @@
+grind= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+grind= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+grind= mc:gravel -> mc:flint
+grind= mc:bone -> 4 mc:dye:15
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe
new file mode 100644
index 000000000..43102efef
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/hydraulicraft.recipe
@@ -0,0 +1,9 @@
+hccrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+hccrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+hccrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+hccrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+hccrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+hccrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+hccrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+hccrusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+hccrusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe
new file mode 100644
index 000000000..81d724cf9
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/ic2.recipe
@@ -0,0 +1,9 @@
+macerator= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+macerator= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+macerator= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+# macerator= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+macerator= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+macerator= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+macerator= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+macerator= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+macerator= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/index.recipe
new file mode 100644
index 000000000..9adbe987f
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/index.recipe
@@ -0,0 +1,8 @@
+import=processing/factorization.recipe
+import=processing/grind.recipe
+import=processing/hydralicraft.recipe
+import=processing/ic2.recipe
+import=processing/mekanism.recipe
+import=processing/rotarycraft.recipe
+import=processing/te.recipe
+import=processing/vanilla.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe
new file mode 100644
index 000000000..60b1be059
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/mekanism.recipe
@@ -0,0 +1,9 @@
+mekcrusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+#bug mekcrusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+#bug mekcrusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+# mekcrusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+#bug mekcrusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+mekcrusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+mekcrusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+mekechamber= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+mekechamber= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe
new file mode 100644
index 000000000..cb90574cd
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/rotarycraft.recipe
@@ -0,0 +1,9 @@
+crusher= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+crusher= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+crusher= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+crusher= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+crusher= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+crusher= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+crusher= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+crusher= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+crusher= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe
new file mode 100644
index 000000000..61af975af
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/te.recipe
@@ -0,0 +1,9 @@
+pulverizer= ae2:ItemMaterial.FluixCrystal -> ae2:ItemMaterial.FluixDust
+pulverizer= ae2:BlockSkyStone:0 -> ae2:ItemMaterial.SkyDust
+pulverizer= mc:ender_pearl -> ae2:ItemMaterial.EnderDust
+pulverizer= oredictionary:cropWheat -> ae2:ItemMaterial.Flour
+pulverizer= ae2:ItemMaterial.CertusQuartzCrystalCharged -> ae2:ItemMaterial.CertusQuartzDust
+pulverizer= ae2:ItemMaterial.CertusQuartzCrystal -> ae2:ItemMaterial.CertusQuartzDust
+pulverizer= mc:quartz -> ae2:ItemMaterial.NetherQuartzDust
+pulverizer= ae2:OreQuartz -> 2 ae2:ItemMaterial.CertusQuartzDust
+pulverizer= ae2:OreQuartzCharged -> 2 ae2:ItemMaterial.CertusQuartzDust
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe b/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe
new file mode 100644
index 000000000..8c8ca0e07
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/processing/vanilla.recipe
@@ -0,0 +1,8 @@
+# Ore Processing
+smelt= ae2:ItemMaterial.GoldDust -> mc:gold_ingot
+smelt= ae2:ItemMaterial.IronDust -> mc:iron_ingot
+smelt= ae2:ItemMaterial.Flour -> mc:bread
+
+# Silicon
+smelt= ae2:ItemMaterial.NetherQuartzDust -> ae2:ItemMaterial.Silicon
+smelt= ae2:ItemMaterial.CertusQuartzDust -> ae2:ItemMaterial.Silicon
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/storagecells.recipe b/src/main/resources/assets/appliedenergistics2/recipes/storagecells.recipe
deleted file mode 100644
index bc6d2d222..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/storagecells.recipe
+++ /dev/null
@@ -1,133 +0,0 @@
-
-# Storage Assembly
-
-shapeless=
-	ae2:ItemMaterial.Cell1kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.1k
-
-shapeless=
-	ae2:ItemMaterial.Cell4kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.4k
-
-shapeless=
-	ae2:ItemMaterial.Cell16kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.16k
-
-shapeless=
-	ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k
-
-shapeless=
-	certusCrystal ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemViewCell
-
-# Spatial Assembly
-
-shapeless=
-	ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.2Cubed
-
-shapeless=
-	ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.16Cubed
-
-shapeless=
-	ae2:ItemMaterial.Cell128SpatialPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemSpatialStorageCell.128Cubed
-
-
-# Empty Storage Cell
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone _ mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemMaterial.EmptyStorageCell
-
-# Spatial Cells
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell2SpatialPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemSpatialStorageCell.2Cubed
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell16SpatialPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemSpatialStorageCell.16Cubed
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell128SpatialPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemSpatialStorageCell.128Cubed
-
-
-# Cells
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemBasicStorageCell.1k
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell4kPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemBasicStorageCell.4k
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell16kPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemBasicStorageCell.16k
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone ae2:ItemMaterial.Cell64kPart mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemBasicStorageCell.64k
-
-shaped=
-	ae2:BlockQuartzGlass mc:redstone ae2:BlockQuartzGlass,
-	mc:redstone certusCrystal mc:redstone,
-	mc:iron_ingot mc:iron_ingot mc:iron_ingot
-	-> ae2:ItemViewCell
-
-# Spatial Cell Parts
-
-shaped=
-	mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust,
-	ae2:ItemMaterial.FluixPearl ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.FluixPearl,
-	mc:glowstone_dust ae2:ItemMaterial.FluixPearl mc:glowstone_dust
-	-> ae2:ItemMaterial.Cell2SpatialPart
-
-shaped=
-	mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust,
-	ae2:ItemMaterial.Cell2SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell2SpatialPart,
-	mc:glowstone_dust ae2:ItemMaterial.Cell2SpatialPart mc:glowstone_dust
-	-> ae2:ItemMaterial.Cell16SpatialPart
-
-shaped=
-	mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust,
-	ae2:ItemMaterial.Cell16SpatialPart ae2:ItemMaterial.EngProcessor ae2:ItemMaterial.Cell16SpatialPart,
-	mc:glowstone_dust ae2:ItemMaterial.Cell16SpatialPart mc:glowstone_dust
-	-> ae2:ItemMaterial.Cell128SpatialPart
-
-# Cell Parts
-shaped=
-	mc:redstone certusCrystal mc:redstone,
-	certusCrystal ae2:ItemMaterial.LogicProcessor certusCrystal,
-	mc:redstone certusCrystal mc:redstone
-	-> ae2:ItemMaterial.Cell1kPart
-
-shaped=
-	mc:redstone ae2:ItemMaterial.CalcProcessor mc:redstone,
-	ae2:ItemMaterial.Cell1kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell1kPart,
-	mc:redstone ae2:ItemMaterial.Cell1kPart mc:redstone
-	-> ae2:ItemMaterial.Cell4kPart
-
-shaped=
-	mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
-	ae2:ItemMaterial.Cell4kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell4kPart,
-	mc:glowstone_dust ae2:ItemMaterial.Cell4kPart mc:glowstone_dust
-	-> ae2:ItemMaterial.Cell16kPart
-
-shaped=
-	mc:glowstone_dust ae2:ItemMaterial.EngProcessor mc:glowstone_dust,
-	ae2:ItemMaterial.Cell16kPart ae2:BlockQuartzGlass ae2:ItemMaterial.Cell16kPart,
-	mc:glowstone_dust ae2:ItemMaterial.Cell16kPart mc:glowstone_dust
-	-> ae2:ItemMaterial.Cell64kPart
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools.recipe
deleted file mode 100644
index 5bea57500..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/tools.recipe
+++ /dev/null
@@ -1,88 +0,0 @@
-
-# Nether Tools
-shaped=
-	oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
-	oredictionary:crystalNetherQuartz oredictionary:stickWood,
-	_                                 oredictionary:stickWood
-	-> ae2:ToolNetherQuartzAxe
-
-shaped=
-	oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
-	_                                 oredictionary:stickWood           _,
-	_                                 oredictionary:stickWood           _
-	-> ae2:ToolNetherQuartzPickaxe
-
-shaped=
-	oredictionary:crystalNetherQuartz,
-	oredictionary:stickWood,
-	oredictionary:stickWood
-	-> ae2:ToolNetherQuartzSpade
-
-shaped=
-	oredictionary:crystalNetherQuartz,
-	oredictionary:crystalNetherQuartz,
-	oredictionary:stickWood
-	-> ae2:ToolNetherQuartzSword
-
-shaped=
-	oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
-	_                                 oredictionary:stickWood,
-	_                                 oredictionary:stickWood
-	-> ae2:ToolNetherQuartzHoe
-
-shaped=
-	oredictionary:crystalNetherQuartz _                                 oredictionary:crystalNetherQuartz,
-	_                                 oredictionary:crystalNetherQuartz _,
-	oredictionary:crystalNetherQuartz _                                 oredictionary:crystalNetherQuartz
-	-> ae2:ToolNetherQuartzWrench
-
-shaped=
-	_ _ oredictionary:stickWood,
-	mc:iron_ingot oredictionary:stickWood _,
-	oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz  _
-	-> ae2:ToolNetherQuartzCuttingKnife
-
-
-
-# Certus Tools
-shaped=
-	oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
-	oredictionary:crystalCertusQuartz oredictionary:stickWood,
-	_                                 oredictionary:stickWood
-	-> ae2:ToolCertusQuartzAxe
-
-shaped=
-	oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
-	_                                 oredictionary:stickWood                          _,
-	_                                 oredictionary:stickWood                          _
-	-> ae2:ToolCertusQuartzPickaxe
-
-shaped=
-	oredictionary:crystalCertusQuartz,
-	oredictionary:stickWood,
-	oredictionary:stickWood
-	-> ae2:ToolCertusQuartzSpade
-
-shaped=
-	oredictionary:crystalCertusQuartz,
-	oredictionary:crystalCertusQuartz,
-	oredictionary:stickWood
-	-> ae2:ToolCertusQuartzSword
-
-shaped=
-	oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
-	_                                 oredictionary:stickWood,
-	_                                 oredictionary:stickWood
-	-> ae2:ToolCertusQuartzHoe
-
-shaped=
-	oredictionary:crystalCertusQuartz _                                 oredictionary:crystalCertusQuartz,
-	_                                 oredictionary:crystalCertusQuartz _,
-	oredictionary:crystalCertusQuartz _                                 oredictionary:crystalCertusQuartz
-	-> ae2:ToolCertusQuartzWrench
-
-shaped=
-	_ _ oredictionary:stickWood,
-	mc:iron_ingot oredictionary:stickWood _,
-	oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz  _
-	-> ae2:ToolCertusQuartzCuttingKnife
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe
new file mode 100644
index 000000000..1c8e2aba5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe
@@ -0,0 +1,41 @@
+shaped=
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
+    oredictionary:crystalCertusQuartz oredictionary:stickWood,
+    _oredictionary:stickWood
+    -> ae2:ToolCertusQuartzAxe
+
+shaped=
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
+    _ oredictionary:stickWood _,
+    _ oredictionary:stickWood _
+    -> ae2:ToolCertusQuartzPickaxe
+
+shaped=
+    oredictionary:crystalCertusQuartz,
+    oredictionary:stickWood,
+    oredictionary:stickWood
+    -> ae2:ToolCertusQuartzSpade
+
+shaped=
+    oredictionary:crystalCertusQuartz,
+    oredictionary:crystalCertusQuartz,
+    oredictionary:stickWood
+    -> ae2:ToolCertusQuartzSword
+
+shaped=
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz,
+    _ oredictionary:stickWood,
+    _ oredictionary:stickWood
+    -> ae2:ToolCertusQuartzHoe
+
+shaped=
+    oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz,
+    _ oredictionary:crystalCertusQuartz _,
+    oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz
+    -> ae2:ToolCertusQuartzWrench
+
+shaped=
+    _ _ oredictionary:stickWood,
+    mc:iron_ingot oredictionary:stickWood _,
+    oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz  _
+    -> ae2:ToolCertusQuartzCuttingKnife
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe
new file mode 100644
index 000000000..b1d6e53ab
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/index.recipe
@@ -0,0 +1,6 @@
+import=tools/certus-quartz.recipe
+import=tools/matter-cannon.recipe
+import=tools/misctools.recipe
+import=tools/nether-quartz.recipe
+import=tools/network.recipe
+import=tools/paintballs.recipe
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe
new file mode 100644
index 000000000..f79c993d7
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe
@@ -0,0 +1,5 @@
+shaped=
+    mc:iron_ingot mc:iron_ingot ae2:ItemMaterial.FormationCore,
+    ae2:ItemMaterial.Cell4kPart ae2:BlockEnergyCell _,
+    mc:iron_ingot _ _
+    -> ae2:ToolMassCannon
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe
new file mode 100644
index 000000000..2378227e3
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe
@@ -0,0 +1,11 @@
+shaped=
+    ae2:ItemMaterial.CertusQuartzCrystalCharged _ _,
+    _ mc:iron_ingot _,
+    _ _ mc:iron_ingot
+    -> ae2:ToolChargedStaff
+
+shaped=
+    fluixCrystal ae2:BlockEnergyCell _,
+    ae2:ItemMaterial.EngProcessor mc:iron_ingot _,
+    _ _ mc:iron_ingot
+    -> ae2:ToolEntropyManipulator
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe
new file mode 100644
index 000000000..d5de6e6e6
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/nether-quartz.recipe
@@ -0,0 +1,41 @@
+shaped=
+    oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
+    oredictionary:crystalNetherQuartz oredictionary:stickWood,
+    _ oredictionary:stickWood
+    -> ae2:ToolNetherQuartzAxe
+
+shaped=
+    oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
+    _ oredictionary:stickWood _,
+    _ oredictionary:stickWood _
+    -> ae2:ToolNetherQuartzPickaxe
+
+shaped=
+    oredictionary:crystalNetherQuartz,
+    oredictionary:stickWood,
+    oredictionary:stickWood
+    -> ae2:ToolNetherQuartzSpade
+
+shaped=
+    oredictionary:crystalNetherQuartz,
+    oredictionary:crystalNetherQuartz,
+    oredictionary:stickWood
+    -> ae2:ToolNetherQuartzSword
+
+shaped=
+    oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz,
+    _ oredictionary:stickWood,
+    _ oredictionary:stickWood
+    -> ae2:ToolNetherQuartzHoe
+
+shaped=
+    oredictionary:crystalNetherQuartz _ oredictionary:crystalNetherQuartz,
+    _ oredictionary:crystalNetherQuartz _,
+    oredictionary:crystalNetherQuartz _ oredictionary:crystalNetherQuartz
+    -> ae2:ToolNetherQuartzWrench
+
+shaped=
+    _ _ oredictionary:stickWood,
+    mc:iron_ingot oredictionary:stickWood _,
+    oredictionary:crystalNetherQuartz oredictionary:crystalNetherQuartz _
+    -> ae2:ToolNetherQuartzCuttingKnife
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe
new file mode 100644
index 000000000..3f20b20a5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe
@@ -0,0 +1,23 @@
+shaped=
+    ae2:BlockChest ae2:ItemMaterial.Cell1kPart ae2:BlockEnergyCell
+    -> ae2:ToolPortableCell
+    
+shapeless=
+    wrench monitor ae2:ItemMaterial.CalcProcessor mc:chest
+    -> ae2:ToolNetworkTool
+    
+shaped=
+    ae2:ItemMaterial.EngProcessor mc:iron_ingot mc:iron_ingot,
+    mc:gold_ingot mc:redstone mc:gold_ingot
+    -> ae2:ToolBiometricCard
+
+shaped=
+    ae2:ItemMaterial.CalcProcessor mc:iron_ingot mc:iron_ingot,
+    mc:gold_ingot mc:redstone mc:gold_ingot
+    -> ae2:ToolMemoryCard
+    
+shaped=
+    ae2:ItemMaterial.FormationCore mc:iron_ingot _,
+    mc:iron_ingot ae2:ItemMaterial.Cell4kPart _,
+    _ _ ae2:BlockEnergyCell
+    -> ae2:ToolColorApplicator
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe
new file mode 100644
index 000000000..1fe73b75a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/paintballs.recipe
@@ -0,0 +1,191 @@
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeWhite ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.White
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeBlack ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Black
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeRed ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Red
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeGreen ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Green
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeBrown ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Brown
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeBlue ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Blue
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyePurple ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Purple
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeCyan ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Cyan
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeLightGray ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.LightGray
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeGray ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Gray
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyePink ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Pink
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeLime ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Lime
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeYellow ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Yellow
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeLightBlue ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.LightBlue
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeMagenta ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Magenta
+
+shaped=
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall oredictionary:dyeOrange ae2:ItemMaterial.MatterBall,
+    ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall ae2:ItemMaterial.MatterBall
+    -> 8 ae2:PaintBall.Orange
+
+shaped=
+    ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White,
+    ae2:PaintBall.White mc:glowstone_dust ae2:PaintBall.White,
+    ae2:PaintBall.White ae2:PaintBall.White ae2:PaintBall.White
+    -> 8 ae2:LumenPaintBall.White
+
+shaped=
+    ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black,
+    ae2:PaintBall.Black mc:glowstone_dust ae2:PaintBall.Black,
+    ae2:PaintBall.Black ae2:PaintBall.Black ae2:PaintBall.Black
+    -> 8 ae2:LumenPaintBall.Black
+
+shaped=
+    ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red,
+    ae2:PaintBall.Red mc:glowstone_dust ae2:PaintBall.Red,
+    ae2:PaintBall.Red ae2:PaintBall.Red ae2:PaintBall.Red
+    -> 8 ae2:LumenPaintBall.Red
+
+shaped=
+    ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green,
+    ae2:PaintBall.Green mc:glowstone_dust ae2:PaintBall.Green,
+    ae2:PaintBall.Green ae2:PaintBall.Green ae2:PaintBall.Green
+    -> 8 ae2:LumenPaintBall.Green
+
+shaped=
+    ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown,
+    ae2:PaintBall.Brown mc:glowstone_dust ae2:PaintBall.Brown,
+    ae2:PaintBall.Brown ae2:PaintBall.Brown ae2:PaintBall.Brown
+    -> 8 ae2:LumenPaintBall.Brown
+
+shaped=
+    ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue,
+    ae2:PaintBall.Blue mc:glowstone_dust ae2:PaintBall.Blue,
+    ae2:PaintBall.Blue ae2:PaintBall.Blue ae2:PaintBall.Blue
+    -> 8 ae2:LumenPaintBall.Blue
+
+shaped=
+    ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple,
+    ae2:PaintBall.Purple mc:glowstone_dust ae2:PaintBall.Purple,
+    ae2:PaintBall.Purple ae2:PaintBall.Purple ae2:PaintBall.Purple
+    -> 8 ae2:LumenPaintBall.Purple
+
+shaped=
+    ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan,
+    ae2:PaintBall.Cyan mc:glowstone_dust ae2:PaintBall.Cyan,
+    ae2:PaintBall.Cyan ae2:PaintBall.Cyan ae2:PaintBall.Cyan
+    -> 8 ae2:LumenPaintBall.Cyan
+
+shaped=
+    ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray,
+    ae2:PaintBall.LightGray mc:glowstone_dust ae2:PaintBall.LightGray,
+    ae2:PaintBall.LightGray ae2:PaintBall.LightGray ae2:PaintBall.LightGray
+    -> 8 ae2:LumenPaintBall.LightGray
+
+shaped=
+    ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray,
+    ae2:PaintBall.Gray mc:glowstone_dust ae2:PaintBall.Gray,
+    ae2:PaintBall.Gray ae2:PaintBall.Gray ae2:PaintBall.Gray
+    -> 8 ae2:LumenPaintBall.Gray
+
+shaped=
+    ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink,
+    ae2:PaintBall.Pink mc:glowstone_dust ae2:PaintBall.Pink,
+    ae2:PaintBall.Pink ae2:PaintBall.Pink ae2:PaintBall.Pink
+    -> 8 ae2:LumenPaintBall.Pink
+
+shaped=
+    ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime,
+    ae2:PaintBall.Lime mc:glowstone_dust ae2:PaintBall.Lime,
+    ae2:PaintBall.Lime ae2:PaintBall.Lime ae2:PaintBall.Lime
+    -> 8 ae2:LumenPaintBall.Lime
+
+shaped=
+    ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow,
+    ae2:PaintBall.Yellow mc:glowstone_dust ae2:PaintBall.Yellow,
+    ae2:PaintBall.Yellow ae2:PaintBall.Yellow ae2:PaintBall.Yellow
+    -> 8 ae2:LumenPaintBall.Yellow
+
+shaped=
+    ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue,
+    ae2:PaintBall.LightBlue mc:glowstone_dust ae2:PaintBall.LightBlue,
+    ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue ae2:PaintBall.LightBlue
+    -> 8 ae2:LumenPaintBall.LightBlue
+
+shaped=
+    ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta,
+    ae2:PaintBall.Magenta mc:glowstone_dust ae2:PaintBall.Magenta,
+    ae2:PaintBall.Magenta ae2:PaintBall.Magenta ae2:PaintBall.Magenta
+    -> 8 ae2:LumenPaintBall.Magenta
+
+shaped=
+    ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange,
+    ae2:PaintBall.Orange mc:glowstone_dust ae2:PaintBall.Orange,
+    ae2:PaintBall.Orange ae2:PaintBall.Orange ae2:PaintBall.Orange
+    -> 8 ae2:LumenPaintBall.Orange
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/unsorted.recipe b/src/main/resources/assets/appliedenergistics2/recipes/unsorted.recipe
deleted file mode 100644
index f77c5bb3d..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/unsorted.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-
-blkPreformatter
-glass materialConvMatrix glass
-mc:iron_ingot itemWorkbench mc:iron_ingot
-mc:iron_ingot mc:iron_ingot mc:iron_ingot
-
-
-blkQLink
-blkQuartzGlass materialFluixPearl blkQuartzGlass
-materialFluixPearl _ materialFluixPearl
-blkQuartzGlass materialFluixPearl blkQuartzGlass
-
-
-blkTinyTNT
-_ _ _
-itemAnyQuartzDust itemGunpowder _
-itemGunpowder itemAnyQuartzDust _
-
-blkWireless
-mc:iron_ingot glass mc:iron_ingot
-blkCable ae2:ItemMaterial.Wireless glass
-mc:iron_ingot glass mc:iron_ingot
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/vanilla_enhance.recipe b/src/main/resources/assets/appliedenergistics2/recipes/vanilla_enhance.recipe
deleted file mode 100644
index 14fc410ea..000000000
--- a/src/main/resources/assets/appliedenergistics2/recipes/vanilla_enhance.recipe
+++ /dev/null
@@ -1,12 +0,0 @@
-
-shaped=
-	glass glass glass,
-	netherCrystal netherCrystal netherCrystal,
-	mc:wooden_slab:* mc:wooden_slab:* mc:wooden_slab:*
-	-> mc:daylight_detector
-
-shaped=
-	_ mc:redstone_torch _,
-	mc:redstone_torch netherCrystal mc:redstone_torch,
-	oredictionary:stone oredictionary:stone oredictionary:stone
-	-> mc:comparator