Removed Crystal Ore, re-ordered variables
Fixed merge conflict in Dictionary files