Added some fields that are necessary for modern tokens and futureshifts.
Altered card sorting script to sort cards with super type "Basic Land" but common rarity as non-basic lands.

Conversion to new ScriptableImage complete, this affected quite a bit, including the evil thumbnail thread;
Added StyleListener, so style changes are only propagated to interested viewers.

Added 'pack type', intended for playtesting (random boosters/starters);
Added 'default(_image)' property to ImageStyle, and added the frame fillers for magic;
Added blurring and bold printing (rather hacky) to the text rendering functions (used for "double click to add image" text);
Added 'symmetric overlay' combine mode, which will look really nice for hybrids;
Moved the watermark choices from the game to an include file in magic-watermarks;
Working on a replacement for the image scripting system that plays nicer with the rest of the code. In particular, it will be possible to compare generated images quickly, so they can be updated continuously. This is a work in progress, currently there are two versions of everything.

Further cleaned up keywords.
Added remaining ability words.

Some experimenting with dependencies

Nicer warnings about using spaces for indentation

Added 'just_header' flag to make stylesheet list load faster;
Added versioning and dependency support to packages

Added magic-old-split.

Updated some gold, colorless, and light artifact frames.
Added machinery for tri-hybrid mana.
Added watermarks to magic-new-flip.
Updated watermarks.
Updated Vanguard keywords to version in Magic.
Fixed font_color scripts in magic-new-flip, magic-new-promo, and magic-new-textless.

More simplifaction of tags in typing_action. All tags in the old part of the value (that is being replaced) cancel out as much as possible.
Fixed position of recent file list in menu

Use watermark+angle:180 for the watermark2 in fpm flip templates. This means watermarks-180 can be removed.

Added all files necessary to make them work.
Fixed bugs in FPM Normal and FPM Promo.
Fixed an error in Magic Split light artifact frame.

Added FPM Normal, FPM Promo, and Magic Planeshifted templates, and all pieces necessary to make them work.
Further modifications to Magic keyword system.
Edited oacard.jpg in Magic Promo to remove white border from around art.

Fixed: specific character prefered over .* for keywords

Added more fields necessary for FPM temp merger.

Fixed possible problem in Textless style.
Further updated Magic keyword system.
Added card fields necessary for FPM temp merger to magic game file.
Updated Vanguard with new keyword system.
Enabled reminder texts in Vanguard.

Formatted all keywords with cost params to use it.
Re-activated font for textbox in Magic-new style.

I had to rename the export function in Apprentice.cpp since "export" is a reserved word according to the C++ standard. I don't know whether GCC supports it yet, but it certainly complains.

In preparation to merge FPM and normal Magic:
Added Xander and Promotional Watermarks
Modified Blend Scripts to handle larger numbers of pieces.

Updated Magic Old to have colored lands.
Added colorless frame to all templates.  Same as artifact in all but Magic New.
Altered script to make colorless default.  Becomes artifact when "Artifact" is type.

Fixed: initialization of 'direction' for TextStyle