added:

Duergar Mine-Captain
Hateflayer
Merrow Grimeblotter
Merrow Wavebreakers
Order of Whiteclay
Pale Wayfarer
Patrol Signaler
Pili-Pala
Safehold Sentry
Silkbind Faerie
Umbral Mantle

projects/mtg/bin/Res/sets/mtg_todo.dat

@@ -5835,15 +5835,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Duergar Mine-Captain
-text={1}{(r/w)}, {Q}: Attacking creatures get +1/+0 until end of turn. ({Q} is the untap symbol.)
-mana={2}{RW}
-type=Creature
-subtype=Dwarf Soldier
-power=2
-toughness=1
-[/card]
-[card]
 name=Dunerider Outlaw
 text=Protection from green -- At the beginning of each end step, if Dunerider Outlaw dealt damage to an opponent this turn, put a +1/+1 counter on it.
 mana={B}{B}
@@ -9644,16 +9635,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Hateflayer
-abilities=wither
-text=Wither (This deals damage to creatures in the form of -1/-1 counters.) -- {2}{R}, {Q}: Hateflayer deals damage equal to its power to target creature or player. ({Q} is the untap symbol.)
-mana={5}{R}{R}
-type=Creature
-subtype=Elemental
-power=5
-toughness=5
-[/card]
-[card]
 name=Hatred
 text=As an additional cost to cast Hatred, pay X life. -- Target creature gets +X/+0 until end of turn.
 mana={3}{B}{B}
@@ -13792,15 +13773,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Merrow Grimeblotter
-text={1}{(u/b)}, {Q}: Target creature gets -2/-0 until end of turn. ({Q} is the untap symbol.)
-mana={3}{UB}
-type=Creature
-subtype=Merfolk Wizard
-power=2
-toughness=2
-[/card]
-[card]
 name=Merrow Harbinger
 text=Islandwalk -- When Merrow Harbinger enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
@@ -13823,15 +13795,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Merrow Wavebreakers
-text={1}{U}, {Q}: Merrow Wavebreakers gains flying until end of turn. ({Q} is the untap symbol.)
-mana={4}{U}
-type=Creature
-subtype=Merfolk Soldier
-power=3
-toughness=3
-[/card]
-[card]
 name=Merseine
 text=Enchant creature -- Merseine enters the battlefield with three net counters on it. -- Enchanted creature doesn't untap during its controller's untap step as long as Merseine has a net counter on it. -- Pay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if he or she controls the enchanted creature.
 mana={2}{U}{U}
@@ -16111,15 +16074,6 @@ mana={3}{W}
 type=Instant
 [/card]
 [card]
-name=Order of Whiteclay
-text={1}{W}{W}, {Q}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. ({Q} is the untap symbol.)
-mana={1}{W}{W}
-type=Creature
-subtype=Kithkin Cleric
-power=1
-toughness=4
-[/card]
-[card]
 name=Orim's Thunder
 text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Destroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
 mana={2}{W}
@@ -16396,15 +16350,6 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
-name=Pale Wayfarer
-text={2}{W}{W}, {Q}: Target creature gains protection from the color of its controller's choice until end of turn. ({Q} is the untap symbol.)
-mana={5}{W}{W}
-type=Creature
-subtype=Spirit Giant
-power=4
-toughness=4
-[/card]
-[card]
 name=Palinchron
 text=Flying -- When Palinchron enters the battlefield, untap up to seven lands. -- {2}{U}{U}: Return Palinchron to its owner's hand.
 mana={5}{U}{U}
@@ -16559,15 +16504,6 @@ mana={3}{W}
 type=Instant
 [/card]
 [card]
-name=Patrol Signaler
-text={1}{W}, {Q}: Put a 1/1 white Kithkin Soldier creature token onto the battlefield. ({Q} is the untap symbol.)
-mana={1}{W}
-type=Creature
-subtype=Kithkin Soldier
-power=1
-toughness=1
-[/card]
-[card]
 name=Patron Wizard
 text=Tap an untapped Wizard you control: Counter target spell unless its controller pays {1}.
 mana={U}{U}{U}
@@ -17001,15 +16937,6 @@ power=1
 toughness=3
 [/card]
 [card]
-name=Pili-Pala
-text=Flying -- {2}, {Q}: Add one mana of any color to your mana pool. ({Q} is the untap symbol.)
-mana={2}
-type=Artifact Creature
-subtype=Scarecrow
-power=1
-toughness=1
-[/card]
-[card]
 name=Pillar Tombs of Aku
 text=At the beginning of each player's upkeep, that player may sacrifice a creature. If that player doesn't, he or she loses 5 life and you sacrifice Pillar Tombs of Aku.
 mana={2}{B}{B}
@@ -19755,15 +19682,6 @@ mana={B}{B}{B}
 type=Sorcery
 [/card]
 [card]
-name=Safehold Sentry
-text={2}{W}, {Q}: Safehold Sentry gets +0/+2 until end of turn. ({Q} is the untap symbol.)
-mana={1}{W}
-type=Creature
-subtype=Elf Warrior
-power=2
-toughness=2
-[/card]
-[card]
 name=Saffi Eriksdotter
 text=Sacrifice Saffi Eriksdotter: When target creature is put into your graveyard from the battlefield this turn, return that card to the battlefield.
 mana={G}{W}
@@ -21162,15 +21080,6 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
-name=Silkbind Faerie
-text=Flying -- {1}{(w/u)}, {Q}: Tap target creature. ({Q} is the untap symbol.)
-mana={2}{WU}
-type=Creature
-subtype=Faerie Rogue
-power=1
-toughness=3
-[/card]
-[card]
 name=Silver Wyvern
 text=Flying -- {U}: Change the target of target spell or ability that targets only Silver Wyvern. The new target must be a creature.
 mana={3}{U}{U}
@@ -24791,13 +24700,6 @@ power=*
 toughness=*
 [/card]
 [card]
-name=Umbral Mantle
-text=Equipped creature has "{3}, {Q}: This creature gets +2/+2 until end of turn." ({Q} is the untap symbol.) -- Equip {0}
-mana={3}
-type=Artifact
-subtype=Equipment
-[/card]
-[card]
 name=Unblinking Bleb
 text=Morph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) -- Whenever Unblinking Bleb or another permanent is turned face up, you may scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={3}{U}

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -17652,6 +17652,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Duergar Mine-Captain
+auto={1}{rw}{q}:all(creature[attacking]) +1/+0 ueot
+text={1}{(r/w)}, {Q}: Attacking creatures get +1/+0 until end of turn. ({Q} is the untap symbol.)
+mana={2}{RW}
+type=Creature
+subtype=Dwarf Soldier
+power=2
+toughness=1
+[/card]
+[card]
 name=Duergar Cave-Guard
 abilities=wither
 auto={RW}:1/0
@@ -28418,6 +28428,17 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Hateflayer
+abilities=wither
+auto={2}{r}{q}:target(creature,player) dynamicability<!powerstrike!>
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.) -- {2}{R}, {Q}: Hateflayer deals damage equal to its power to target creature or player. ({Q} is the untap symbol.)
+mana={5}{R}{R}
+type=Creature
+subtype=Elemental
+power=5
+toughness=5
+[/card]
+[card]
 name=Haunted Angel
 abilities=flying
 autograveyard=token(Angel,Creature Angel,3/3,flying black) opponent && moveto(exile)
@@ -38852,6 +38873,16 @@ id=22222228
 type=nothing
 [/card]
 [card]
+name=Merrow Grimeblotter
+auto={1}{ub}{q}:target(creature) -2/0 ueot
+text={1}{(u/b)}, {Q}: Target creature gets -2/-0 until end of turn. ({Q} is the untap symbol.)
+mana={3}{UB}
+type=Creature
+subtype=Merfolk Wizard
+power=2
+toughness=2
+[/card]
+[card]
 name=Marrow-Gnawer
 auto={T}{S(rat|myBattlefield)}:foreach(rat|myBattlefield) token(Rat,Creature Rat,1/1,black)
 auto=lord(rat) fear
@@ -38863,6 +38894,16 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Merrow Wavebreakers
+auto={1}{u}{q}:flying ueot
+text={1}{U}, {Q}: Merrow Wavebreakers gains flying until end of turn. ({Q} is the untap symbol.)
+mana={4}{U}
+type=Creature
+subtype=Merfolk Soldier
+power=3
+toughness=3
+[/card]
+[card]
 name=Marsh Boa
 abilities=swampwalk
 text=Swampwalk
@@ -44803,6 +44844,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Order of Whiteclay
+auto={1}{w}{w}{q}:target(creature[manacost <=3]|mygraveyard) moveto(mybattlefield)
+text={1}{W}{W}, {Q}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield. ({Q} is the untap symbol.)
+mana={1}{W}{W}
+type=Creature
+subtype=Kithkin Cleric
+power=1
+toughness=4
+[/card]
+[card]
 name=Order of the Stars
 abilities=defender
 auto=choice name(White) counter(0/0,1,White) all(this)
@@ -45356,6 +45407,20 @@ power=4
 toughness=5
 [/card]
 [card]
+name=Pale Wayfarer
+auto={2}{w}{w}{q}:target(creature) protection from white ueot
+auto={2}{w}{w}{q}:target(creature) protection from black ueot
+auto={2}{w}{w}{q}:target(creature) protection from green ueot
+auto={2}{w}{w}{q}:target(creature) protection from red ueot
+auto={2}{w}{w}{q}:target(creature) protection from blue ueot
+text={2}{W}{W}, {Q}: Target creature gains protection from the color of its controller's choice until end of turn. ({Q} is the untap symbol.)
+mana={5}{W}{W}
+type=Creature
+subtype=Spirit Giant
+power=4
+toughness=4
+[/card]
+[card]
 name=Paleoloth
 auto=@movedTo(other creature[power>=5]|myBattlefield):may moveTo(myhand) target(creature|mygraveyard)
 text=Whenever another creature with power 5 or greater enters the battlefield under your control, you may return target creature card from your graveyard to your hand.
@@ -45757,6 +45822,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Patrol Signaler
+auto={1}{w}{q}:token(KithKin,creature kithkin soldier,1/1,white)
+text={1}{W}, {Q}: Put a 1/1 white Kithkin Soldier creature token onto the battlefield. ({Q} is the untap symbol.)
+mana={1}{W}
+type=Creature
+subtype=Kithkin Soldier
+power=1
+toughness=1
+[/card]
+[card]
 name=Patron of the Wild
 facedown={3}
 autofacedown={2}{G}:morph
@@ -46958,6 +47033,21 @@ mana={W}
 type=Instant
 [/card]
 [card]
+name=Pili-Pala
+abilities=flying
+auto={2}{q}:add{g}
+auto={2}{q}:add{w}
+auto={2}{q}:add{r}
+auto={2}{q}:add{u}
+auto={2}{q}:add{b}
+text=Flying -- {2}, {Q}: Add one mana of any color to your mana pool. ({Q} is the untap symbol.)
+mana={2}
+type=Artifact Creature
+subtype=Scarecrow
+power=1
+toughness=1
+[/card]
+[card]
 name=Pilgrim's Eye
 abilities=flying
 auto=may moveTo(ownerhand) target(land[basic]|mylibrary)
@@ -53247,6 +53337,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Safehold Sentry
+auto={2}{w}{q}:0/+2 ueot
+text={2}{W}, {Q}: Safehold Sentry gets +0/+2 until end of turn. ({Q} is the untap symbol.)
+mana={1}{W}
+type=Creature
+subtype=Elf Warrior
+power=2
+toughness=2
+[/card]
+[card]
 name=Safewright Quest
 target=forest,plains|myLibrary
 auto=moveTo(myHand)
@@ -57152,6 +57252,17 @@ mana={G}
 type=Instant
 [/card]
 [card]
+name=Silkbind Faerie
+auto={1}{wu}{q}:target(creature) tap
+abilities=flying
+text=Flying -- {1}{(w/u)}, {Q}: Tap target creature. ({Q} is the untap symbol.)
+mana={2}{WU}
+type=Creature
+subtype=Faerie Rogue
+power=1
+toughness=3
+[/card]
+[card]
 name=Silkenfist Fighter
 auto=@combat(blocked,turnlimited) source(this):untap
 text=Whenever Silkenfist Fighter becomes blocked, untap it.
@@ -68428,6 +68539,15 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Umbral Mantle
+auto=teach(creature) {3}{q}:+3/+3 ueot
+auto={0}:equip
+text=Equipped creature has "{3}, {Q}: This creature gets +2/+2 until end of turn." ({Q} is the untap symbol.) -- Equip {0}
+mana={3}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
 name=Umezawa's Jitte
 auto={2}:equip
 auto=@combatdamaged(creature,player) from(mytgt):counter(0/0,2,Charge) all(this)