Complete rewrite of the Ordo fire's handling of ore block detection
Merge remote-tracking branch 'origin/develop' into develop