add Upwelling (from Scourge)

.gitattributes

@@ -4567,6 +4567,7 @@ res/cardsfolder/unyaro_bee_sting.txt -text svneol=native#text/plain
 res/cardsfolder/unyaro_bees.txt -text svneol=native#text/plain
 res/cardsfolder/upheaval.txt -text svneol=native#text/plain
 res/cardsfolder/uproot.txt -text svneol=native#text/plain
+res/cardsfolder/upwelling.txt -text svneol=native#text/plain
 res/cardsfolder/ur_drago.txt -text svneol=native#text/plain
 res/cardsfolder/ur_golems_eye.txt -text svneol=native#text/plain
 res/cardsfolder/urborg_drake.txt -text svneol=native#text/plain

res/cardsfolder/upwelling.txt

@@ -0,0 +1,7 @@
+Name:Upwelling
+ManaCost:3 G
+Types:Enchantment
+Text:Mana pools don't empty as steps and phases end.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/upwelling.jpg
+End

src/forge/Phase.java

@@ -134,8 +134,9 @@ public class Phase extends MyObservable
         //	c.setExtrinsicKeyword(new ArrayList<String>());
         //}
         
-
+        
-        AllZone.ManaPool.clearPool();
+        if(!AllZoneUtil.isCardInPlay("Upwelling")) AllZone.ManaPool.clearPool();
+        
         if (getPhase().equals(Constant.Phase.Combat_Declare_Attackers)) {
         	nCombatsThisTurn++;
         } else if (getPhase().equals(Constant.Phase.Main1)) {