More Ore Dictionary support
Merge pull request #2202 from ganymedes01/6.1.x

More Ore Dictionary support all around