Merge remote-tracking branch 'upstream/master'
added ore dict listener
Lots of tidying
fixes aluminium ingot recipe
Merge pull request #540 from hilburn/master

Things