When you use a Mer-kin wordquiz with a Mer-kin cheatsheet, track vocabulary
mastery in "merkinVocabularyMastery" setting and dedecut both items.
Track aquisition of all eight Mer-kin dreadscroll clues.
Eight settings: deadscroll1 .. dreadscroll8 hold the option number (1-4) that
corresponds to the clue, or 0, if you have not found it.
Add "dreadscroll" command to list the status of your dreadscroll clues
Enable GRANDMA as a crafting method


git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12223 b29ace70-8910-0410-8dcc-aa2fc6433167
print conflict information in red so it stands out from the rest of svn output

git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12224 b29ace70-8910-0410-8dcc-aa2fc6433167
Fix effect name: "Deep-Tainted Mind" not "Deep-Tainted"
Deep-Tainted Mind cannot be removed
Do not decorate unremoveable effects in the charpane with remove links
Load phrase dropdowns in Mer-kin dreadscroll with correct values, based on
clues we have learend.


git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12225 b29ace70-8910-0410-8dcc-aa2fc6433167
Adjust DataUtilities, FileUtilities, and MallPriceDatabase so that logging the
use of an override file is done only once - at the time when it happens.


git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12226 b29ace70-8910-0410-8dcc-aa2fc6433167
Add quest items from Canadia Quest (courtesy of Bale), monsters from Canadia
Quest (courtesy of Darzil), and monster images for many monsters (courtesy of
Darzil).
Note that monster.txt version is bumped to 5 since the monster image is now
in its own field.


git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12227 b29ace70-8910-0410-8dcc-aa2fc6433167
Adjust the war hero windows slightly

git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12228 b29ace70-8910-0410-8dcc-aa2fc6433167
Using 100 d4s takes a turn.  Add shaking skull.

git-svn-id: svn://svn.code.sf.net/p/kolmafia/code@12229 b29ace70-8910-0410-8dcc-aa2fc6433167