1) Deleted the entries from cards.txt which used the old "This card doesn't untap during your untap step." keyword.

2) Updated these entries to the new form of the keyword and pasted them at the top of file.
3) Updated the code to reflect this change in CardFactoryUtil.java and Input_Untap.java.

res/cards.txt

@@ -1,3 +1,79 @@
+Basalt Monolith
+3
+Artifact
+no text
+CARDNAME doesn't untap during your untap step.
+Untap:3
+tap: add 3
+
+Dehydration
+3 U
+Enchantment Aura
+Enchanted creature doesn't untap during its controller's untap step.
+Enchant creature
+enPumpCurse:CARDNAME doesn't untap during your untap step.
+
+Eternity Snare
+5 U
+Enchantment Aura
+Enchanted creature doesn't untap during its controller's untap step.
+Enchant creature
+enPumpCurse:CARDNAME doesn't untap during your untap step.
+When CARDNAME enters the battlefield, draw a card.
+
+Goblin Sharpshooter
+2 R
+Creature Goblin
+no text
+1/1
+abDamageTgtCP T:1
+CARDNAME doesn't untap during your untap step.
+Whenever a creature is put into a graveyard from the battlefield, untap Goblin Sharpshooter.
+
+Grim Monolith
+2
+Artifact
+no text
+CARDNAME doesn't untap during your untap step.
+Untap:4
+tap: add 3
+
+Leaden Fists
+2 U
+Enchantment Aura
+Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step.
+Flash
+Enchant creature
+enPumpCurse:+3/+3/CARDNAME doesn't untap during your untap step.
+
+Paralyzing Grasp
+2 U
+Enchantment Aura
+Enchanted creature doesn't untap during its controller's untap step.
+Enchant creature
+enPumpCurse:CARDNAME doesn't untap during your untap step.
+
+Phyrexian Ironfoot
+3
+Snow Artifact Creature Construct
+no text
+3/4
+CARDNAME doesn't untap during your untap step.
+Untap:1 S
+
+Time Vault
+2
+Artifact
+If you would begin your turn while Time Vault is tapped, you may skip that turn instead. If you do, untap Time Vault.
+CARDNAME doesn't untap during your untap step.
+Comes into play tapped.
+
+Vulshok Gauntlets
+2
+Artifact Equipment
+Equipped creature gets +4/+2 and doesn't untap during its controller's untap step.
+eqPump 3:+4/+2/CARDNAME doesn't untap during your untap step.
+
 Genesis
 4 G
 Creature Incarnation
@@ -42,14 +118,6 @@ no text
 1/1
 When CARDNAME enters the battlefield, draw a card.
 
-Eternity Snare
-5 U
-Enchantment Aura
-Enchanted creature doesn't untap during its controller's untap step.
-Enchant creature
-enPumpCurse:This card doesn't untap during your untap step.
-When CARDNAME enters the battlefield, draw a card.
-
 Frog Tongue
 G
 Enchantment Aura
@@ -1088,14 +1156,6 @@ Enchanted creature gets -1/-1 and has fear.
 Enchant creature
 enPump:-1/-1/Fear
 
-Leaden Fists
-2 U
-Enchantment Aura
-Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step.
-Flash
-Enchant creature
-enPumpCurse:+3/+3/This card doesn't untap during your untap step.
-
 Zephyr Net
 1 U
 Enchantment Aura
@@ -1224,13 +1284,6 @@ Enchanted creature attacks each turn if able.
 Enchant creature
 enPumpCurse:This card attacks each turn if able.
 
-Dehydration
-3 U
-Enchantment Aura
-Enchanted creature doesn't untap during its controller's untap step.
-Enchant creature
-enPumpCurse:This card doesn't untap during your untap step.
-
 Wings of Aesthir
 W U
 Enchantment Aura
@@ -1238,13 +1291,6 @@ Enchanted creature gets +1/+0 and has flying and first strike.
 Enchant creature
 enPump:+1/+0/Flying & First Strike
 
-Paralyzing Grasp
-2 U
-Enchantment Aura
-Enchanted creature doesn't untap during its controller's untap step.
-Enchant creature
-enPumpCurse:This card doesn't untap during your untap step.
-
 Artifact Ward
 W
 Enchantment Aura
@@ -2084,12 +2130,6 @@ Artifact Equipment
 Equipped creature gets +3/+3.
 eqPump 3:+3/+3
 
-Vulshok Gauntlets
-2
-Artifact Equipment
-Equipped creature gets +4/+2 and doesn't untap during its controller's untap step.
-eqPump 3:+4/+2/This card doesn't untap during your untap step.
-
 Vulshok Morningstar
 2
 Artifact Equipment
@@ -3197,13 +3237,6 @@ Creature Merfolk Rogue
 Wanderbrine Rootcutters can't be blocked by green creatures.
 3/3
 
-Time Vault
-2
-Artifact
-If you would begin your turn while Time Vault is tapped, you may skip that turn instead. If you do, untap Time Vault.
-This card doesn't untap during your untap step.
-Comes into play tapped.
-
 Mana Tithe
 W
 Instant
@@ -5641,14 +5674,6 @@ no text
 1/1
 RegenerateMe:S
 
-Phyrexian Ironfoot
-3
-Snow Artifact Creature Construct
-no text
-3/4
-This card doesn't untap during your untap step.
-Untap:1 S
-
 Door to Nothingness
 5
 Artifact
@@ -5765,15 +5790,6 @@ Enchantment
 no text
 Whenever a creature is put into a graveyard from the battlefield, that creature's controller may draw a card.
 
-Goblin Sharpshooter
-2 R
-Creature Goblin
-no text
-1/1
-abDamageTgtCP T:1
-This card doesn't untap during your untap step.
-Whenever a creature is put into a graveyard from the battlefield, untap Goblin Sharpshooter.
-
 Soulcatcher
 1 W
 Creature Bird Soldier
@@ -9393,22 +9409,6 @@ Voltaic Key
 Artifact
 no text
 
-Basalt Monolith
-3
-Artifact
-no text
-This card doesn't untap during your untap step.
-Untap:3
-tap: add 3
-
-Grim Monolith
-2
-Artifact
-no text
-This card doesn't untap during your untap step.
-Untap:4
-tap: add 3
-
 Akki Drillmaster
 2 R
 Creature Goblin Shaman

src/forge/CardFactoryUtil.java

@@ -1749,10 +1749,10 @@ public class CardFactoryUtil {
                     });
                 }
                 
-                // If extrinsicKeywords contains "This card doesn't untap during your untap step."
+                // If extrinsicKeywords contains "CARDNAME doesn't untap during your untap step."
                 //     then remove creatures with Vigilance from the list
                 
-                if (extKeywords.contains("This card doesn't untap during your untap step.")) {
+                if (extKeywords.contains("CARDNAME doesn't untap during your untap step.")) {
                     list = list.filter(new CardListFilter() {
                         public boolean addCard(Card c) {
                             return c.isCreature() && 

src/forge/Input_Untap.java

@@ -82,7 +82,7 @@ public class Input_Untap extends Input {
     	});
 
     	for(Card c : list) {
-    		if(!c.getKeyword().contains("This card doesn't untap during your untap step.")
+    		if(!c.getKeyword().contains("CARDNAME doesn't untap during your untap step.")
     				&& !c.getKeyword().contains("This card doesn't untap during your next untap step.")) c.untap();
     		else c.removeExtrinsicKeyword("This card doesn't untap during your next untap step.");