Changes to AssemblyRecipe to support OreDict

New PR as requested in #1319

Should resolve #531 and #1318