From efafaedf6833296fba27ec7dc4e19bae33b55940 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 13 Jun 2015 17:06:24 +0200 Subject: [PATCH] Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry Conflicts: src/main/java/appeng/block/solids/OreQuartz.java --- .../resources/assets/appliedenergistics2/recipes/index.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe index 6a04bd643..facef180d 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/index.recipe @@ -18,6 +18,8 @@ ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz ore=ae2:ItemMaterial.FluixDust -> dustFluix +ore=ae2:tile.OreQuartz -> oreCertusQuartz +ore=ae2:tile.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