Merge branch 'master' into harmonize_raws

* master:
  Update settings program from splinterz/settings
  Added missing spore-tree saplings to many tilesets.
  Updated Masterwork Dwarf Fortress.exe from Splinterz
  Move patch-graphics-from-master.pl into maint-bin
  Spacefox: Cave fungus is no longer invisble.
  Upstream release - 4e
  Exported patch files no longer contain branch merge messages.
  Remove confusing ITEM_ARMOR_LAMELLAR. Lamellar leather armor remains.
  Remove unproduceable 'mail' armor from raws.
show-tileset-diffs.pl - Less context on unified diffs.

This allows for us to make more auto-generated patches. Yay!
More tileset harmonizations.

Automatically generated. All should be safe. Everything uses
the Masterwork tiles as intended behaviour.
Merge branch 'harmonize_raws' into unified

* harmonize_raws:
  More tileset harmonizations.
  show-tileset-diffs.pl - Less context on unified diffs.