Merge branch 'master' into dfhack_r4

This is in preparation for fixing autosyndrome tags across all the
raws.

* master: (27 commits)
  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 - Now only prints to stderr safe changes to apply.
  Turrets are now constructed from brass.
  export-patches.pl - No longer export simple-leather
  Hide root oil can be turned into soap (Billy Jack)
  Gun rebalance. All pistols have force/maxvel 25k, muskets 50k
  Remove unused items from RAWs. (Oktane, refined warp flasks, down)
  Orcish dry-dock: Allow 'collect rusty iron weapons' reaction.
  gitignore: Ignore save files in git
  Distribute simpler leather patches across all tilesets.
  Updates to Billy Jack's leather 12 Nov
  Added a patch-graphics-from-master.pl
  ...

Conflicts:
	Dwarf Fortress/dfhack.history
	Dwarf Fortress/gamelog.txt
	Dwarf Fortress/raw/objects/inorganic_zmasterwork_2.txt
	Dwarf Fortress/stderr.log
Remove now redundant WORKER_ONLY tag from reactions.

This tag no longer exists in autosydnrome r4, which targets the
worker only by default.
Merge branch 'dfhack_r4' into unified

* dfhack_r4:
  Remove now redundant WORKER_ONLY tag from reactions.