Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2

core/Registration.java

@@ -9,6 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.ChestGenHooks;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.RecipeSorter.Category;
 import appeng.api.AEApi;
@@ -187,7 +188,8 @@ public class Registration
 	public RecipeHandler recipeHandler;
 	public BiomeGenBase storageBiome;
 
-	private Registration() {
+	private Registration()
+	{
 		recipeHandler = new RecipeHandler();
 	}
 
@@ -707,6 +709,9 @@ public class Registration
 		mr.whiteListTileEntity( net.minecraft.tileentity.TileEntityNote.class );
 		mr.whiteListTileEntity( net.minecraft.tileentity.TileEntityHopper.class );
 
+		// very silly fix cause Reika decided to pair the item with a block.
+		OreDictionary.registerOre( "itemWheat", net.minecraft.init.Items.wheat );
+
 		/**
 		 * Whitelist AE2
 		 */