- Added "Any" as option of controller of the CastSpell trigger of the whenever keyword.

- Added Angel's Feather, Apothecary Initiate, Contemplation and Ivory Cup.

.gitattributes

@@ -152,6 +152,7 @@ res/cardsfolder/angelic_chorus.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_curator.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_voices.txt -text svneol=native#text/plain
 res/cardsfolder/angelic_wall.txt -text svneol=native#text/plain
+res/cardsfolder/angels_feather.txt -text svneol=native#text/plain
 res/cardsfolder/angels_mercy.txt -text svneol=native#text/plain
 res/cardsfolder/angelsong.txt -text svneol=native#text/plain
 res/cardsfolder/anger.txt -text svneol=native#text/plain
@@ -169,6 +170,7 @@ res/cardsfolder/anurid_barkripper.txt -text svneol=native#text/plain
 res/cardsfolder/anurid_murkdiver.txt -text svneol=native#text/plain
 res/cardsfolder/apex_hawks.txt -text svneol=native#text/plain
 res/cardsfolder/apocalypse_hydra.txt -text svneol=native#text/plain
+res/cardsfolder/apothecary_initiate.txt -text svneol=native#text/plain
 res/cardsfolder/apprentice_wizard.txt -text svneol=native#text/plain
 res/cardsfolder/araba_mothrider.txt -text svneol=native#text/plain
 res/cardsfolder/arachnoid.txt -text svneol=native#text/plain
@@ -727,6 +729,7 @@ res/cardsfolder/conspiracy.txt -text svneol=native#text/plain
 res/cardsfolder/constricting_tendrils.txt -text svneol=native#text/plain
 res/cardsfolder/consume_the_meek.txt -text svneol=native#text/plain
 res/cardsfolder/contagious_nim.txt -text svneol=native#text/plain
+res/cardsfolder/contemplation.txt -text svneol=native#text/plain
 res/cardsfolder/control_magic.txt -text svneol=native#text/plain
 res/cardsfolder/control_of_the_court.txt -text svneol=native#text/plain
 res/cardsfolder/convalescence.txt -text svneol=native#text/plain
@@ -1921,6 +1924,7 @@ res/cardsfolder/island_fish_jasconius.txt -text svneol=native#text/plain
 res/cardsfolder/island_of_wak_wak.txt -text svneol=native#text/plain
 res/cardsfolder/isleback_spawn.txt -text svneol=native#text/plain
 res/cardsfolder/isochron_scepter.txt -text svneol=native#text/plain
+res/cardsfolder/ivory_cup.txt -text svneol=native#text/plain
 res/cardsfolder/ivory_guardians.txt -text svneol=native#text/plain
 res/cardsfolder/ivory_tower.txt -text svneol=native#text/plain
 res/cardsfolder/ivy_dancer.txt -text svneol=native#text/plain

res/cardsfolder/angels_feather.txt

@@ -0,0 +1,8 @@
+Name:Angel's Feather
+ManaCost:2
+Types:Artifact
+Text:no text
+K:WheneverKeyword:CastSpell/Any:Color/white:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:Yes_No:No Special Condition:Whenever a player casts a white spell, you may gain 1 life.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/angels_feather.jpg
+End

res/cardsfolder/apothecary_initiate.txt

@@ -0,0 +1,9 @@
+Name:Apothecary Initiate
+ManaCost:W
+Types:Creature Kithkin Cleric
+Text:no text
+PT:1/1
+K:WheneverKeyword:CastSpell/Any:Color/white:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:PayMana/1:No Special Condition:Whenever a player casts a white spell, you may pay {1}. If you do, you gain 1 life.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/apothecary_initiate.jpg
+End

res/cardsfolder/contemplation.txt

@@ -0,0 +1,8 @@
+Name:Contemplation
+ManaCost:1 W W
+Types:Enchantment
+Text:no text
+K:WheneverKeyword:CastSpell/Controller:None:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:No_Condition:No Special Condition:Whenever you cast a spell, you gain 1 life.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/contemplation.jpg
+End

res/cardsfolder/ivory_cup.txt

@@ -0,0 +1,8 @@
+Name:Ivory Cup
+ManaCost:1
+Types:Artifact
+Text:no text
+K:WheneverKeyword:CastSpell/Any:Color/white:Play:ModifyLife/1:ControllingPlayer_Self:ASAP:PayMana/1:No Special Condition:Whenever a player casts a white spell, you may pay 1. If you do, you gain 1 life.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ivory_cup.jpg
+End

src/forge/GameAction.java

@@ -1031,6 +1031,7 @@ public class GameAction {
                         for(int z = 0; z < SpellController.length - 1; z++) {
                         	if(SpellController[z + 1].equals("Controller") && (c.getController()).equals(card.getController())) Nullified = false;  
                         	if(SpellController[z + 1].equals("Opponent") && (c.getController()).equals(getOpponent(card.getController()))) Nullified = false;
+                        	if(SpellController[z + 1].equals("Any")) Nullified = false;
                         }
                         if(Nullified == true) k[4] = "Null";   
                         }