initial commit
final cleanup for release version

- cleaned up a few more files
- fixed the randcreature stuff
- added a very basic tester for almost all options when debugging
(ctrl+alt+tilde)
plant_grasses and missing color

- added jolly bastion default color scheme back
- fixed the YESSTANDARTCAVERN flag in the plant_grasses.txt within all
the graphics pack raws
Merge pull request #19 from splintermind/master

inclusion of new masterwork settings source
tileset color mapping, modified background, about button

- removed redundant colors.txt from the tileset directories
- added missing color schemes for some tilesets
- added an xml mapping between tilesets and their default color schemes
- removed the install graphics button, users are now prompted upon
choosing an item

- the button to update save files shows properly again
- moved the dll files to the MasterworkDwarfFortress subdir
- added an about button to the menu
fixed random creature issue

- fixed an issue where if the random creature/entity/language files are
missing when the app loads, the first run of random creature won't allow
deletions
fix for backwards 'simple' settings

- fixes the simple xx buttons in the misc. section, which had the
enable/disable tokens set backwards.
- also fixed the description on the mineral scarcity tooltip
Merge remote-tracking branch 'splinterz/master' into settings

* splinterz/master:
  fix for backwards 'simple' settings
  fixed random creature issue
  tileset color mapping, modified background, about button
Merge branch 'master' into settings

This harmonizes splinterz' git branch with our master.
Upstream was released with different default settings to
splinterz/settings, so there are *lots* of raw changes
which are flipping features on and off.

With conflicts, we took upstream's Masterwork.settings file,
and removed creature_random_rc.txt, entity_random_rc.txt,
and langauge_RANDOM.txt (they were removed in splinterz/settings).
preview.png was also removed, as it is no longer upstream (and
presumably no longer used).

* master:
  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

Conflicts:
	Dwarf Fortress/Masterwork.settings
	Dwarf Fortress/raw/objects/creature_random_rc.txt
	Dwarf Fortress/raw/objects/entity_random_rc.txt
	Dwarf Fortress/raw/objects/language_RANDOM.txt
	Settings Source/Resources/preview.png
fixes, added 3rd party source

- fixed evil/good region tooltips
- fixed grammar/spelling on a few other tooltips
- added missing ironhand color scheme

- added the source for the ribbon and the tab control, as i've made
significant updates to them
- all the color themes are contained within the ribbon source code now
- added a theme chooser to the main menu, along with an additional
white/blue theme
-
merge with pjf settings raws
added deleted preview.png from the merge
removed .suo
updated gitignore for .suo file(s)
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  GH #36 - Enable simple minerals by default
  Fix typo syntax error in herbalism research reaction.
  patch-graphics-from-master: Be lenient with whitespace changes.
  Remove plant_fake.txt from tileset directories.
  patch-graphics-from-master.pl - Ignore already applied patches
  patch-grapics-from-master.pl - Really don't make .rej files
  Update settings program from splinterz/settings
  Added missing spore-tree saplings to many tilesets.
updated raws and new civ options

work in progress commit for new options and such before i go wrecking
things

- fixes for goat beards
- fixes for golbin to goblin
- cave entities have been moved to their own files
- removed batmen entity
- removed unused !NOMORECLOTH! options
- removed //UNTOUCHED tags
Merge branch 'master' into settings

* master:
  Add README.md
  Remove all obsolete !NOMORECLOTH! lines. GH #41
  Add chin-whiskers back onto goats. GH #41
  Fix typo of _CLAY to CLAY in inorganic_stone_soil.txt
  Correct all GOLBINS to GOBLINS.
  Turn bogus [UNTOUCHED] tag into a comment.
  export-patches: Add a DFHack r4 nerfed_diseases export target
  Ironhand: Remove pumpkins, sugar-cane, and turnips
  Adjust positioning of black-caps in ASCII/plant_standard.txt
  Manual harmonisation of plant raws across tilesets.
  show-tileset-diffs: Ignore DEAD_PICKED_TILE
  Manual harmonisation of many tilesets
  show-tileset-diffs: Ignore [BUILD_COLOR] tag
  Even more tileset harmonizations.
  show-tileset-diffs.pl - Tweaks and debugging
  More tileset harmonizations.
  show-tileset-diffs.pl - Less context on unified diffs.
  Automatic harmonization of graphics raws with master files.

Conflicts:
	Dwarf Fortress/raw/objects/creature_domestic.txt
	Dwarf Fortress/raw/objects/entity_default.txt
	Dwarf Fortress/raw/objects/entity_drow.txt
	Dwarf Fortress/raw/objects/entity_drow_evil.txt
	Dwarf Fortress/raw/objects/entity_dwarf_evil.txt
	Dwarf Fortress/raw/objects/entity_elf.txt
	Dwarf Fortress/raw/objects/entity_elf_evil.txt
	Dwarf Fortress/raw/objects/entity_human.txt
	Dwarf Fortress/raw/objects/entity_human_evil.txt
	Dwarf Fortress/raw/objects/entity_orc.txt
	Dwarf Fortress/raw/objects/reaction_inventor.txt
Merge pull request #2 from pjf/settings

Updated commits from upstream/master
raw changes for new options

not quite finished (still needs materials) but most changes are there
for the new civ options. requires quite a few raw changes to both the
original and graphics packs, so it could use some testing.

- updated entity files to include either !BABYSNATCHER! or
[BABYSNATCHER] tokens
- updated main civ. creatures to include NATURAL_SKILLS tokens, and/or
the related YESHARDERINVADER_<CIV_NAME> tags so the settings app can
find them
- added missing siege and trade triggers where applicable
- fixed elf and evil elf siege triggers (less of an issue now that they
can be changed via the interface)
- fixed missing settings tags in fortdefense files (very minor issue)
- removed duplicate ASCII color scheme, and update ASCII color map to
use default colors (VANILLA)
- fixed some of the flickering issues when changing tabs
Merge updated settings and raws from Splinterz

This merge does not include the settings source code, but includes
everything else.

* settings:
  raw changes for new options
  updated raws and new civ options
  updated gitignore for .suo file(s)
  removed .suo
  added deleted preview.png from the merge
  fixes, added 3rd party source
  fix for backwards 'simple' settings
  fixed random creature issue
  tileset color mapping, modified background, about button
  plant_grasses and missing color
  final cleanup for release version
  initial commit