merge :(

.hgignore

@@ -23,6 +23,9 @@ Mage/target
 syntax: regexp
 .class
 .jar
+.iml
+.ipr
+.iws
 nbactions.xml
 glob:Mage.Client/cheat.dck
 glob:Mage.Client/test.dck

Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java

@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.sets.mirrodin;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Duration;
+import mage.Constants.Rarity;
+import mage.Constants.Zone;
+import mage.MageInt;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+
+/**
+ *
+ * @author Loki
+ */
+public class LeoninSkyhunter extends CardImpl<LeoninSkyhunter> {
+
+    public LeoninSkyhunter (UUID ownerId) {
+        super(ownerId, 11, "Leonin Skyhunter", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{W}{W}");
+        this.expansionSetCode = "MRD";
+        this.subtype.add("Cat");
+        this.subtype.add("Knight");
+		this.color.setWhite(true);
+		this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+        this.addAbility(FlyingAbility.getInstance());
+    }
+
+    public LeoninSkyhunter (final LeoninSkyhunter card) {
+        super(card);
+    }
+
+    @Override
+    public LeoninSkyhunter copy() {
+        return new LeoninSkyhunter(this);
+    }
+
+}

Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninSkyhunter.java

@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.sets.mirrodinbesieged;
+
+import java.util.UUID;
+
+/**
+ *
+ * @author Loki
+ */
+public class LeoninSkyhunter extends mage.sets.mirrodin.LeoninSkyhunter {
+
+    public LeoninSkyhunter (UUID ownerId) {
+        super(ownerId);
+        this.cardNumber = 11;
+        this.expansionSetCode = "MBS";
+    }
+
+    public LeoninSkyhunter (final LeoninSkyhunter card) {
+        super(card);
+    }
+
+    @Override
+    public LeoninSkyhunter copy() {
+        return new LeoninSkyhunter(this);
+    }
+
+}

Utils/gen-card.pl

@@ -208,6 +208,7 @@ $wizardstous{'WWK'} = 'WWK';
 $wizardstous{'SOM'} = 'SOM';
 $wizardstous{'V10'} = 'FVR';
 $wizardstous{'DDF'} = 'DDF';
+$wizardstous{'MBS'} = 'MBS';
 
 my %knownSets;
 $knownSets{'ARB'} = 'alarareborn';