Merge

.hgignore

@@ -27,8 +27,9 @@ Mage/target
 
 releases
 Utils/author.txt
-Utils/newList.txt
+.metadata
-Utils/oldList.txt
+.project
+.settings
 syntax: regexp
 .class
 .jar

Mage.Server/pom.xml

@@ -217,6 +217,41 @@
         </plugins>
 
         <finalName>mage-server</finalName>
+        <pluginManagement>
+        	<plugins>
+        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        		<plugin>
+        			<groupId>org.eclipse.m2e</groupId>
+        			<artifactId>lifecycle-mapping</artifactId>
+        			<version>1.0.0</version>
+        			<configuration>
+        				<lifecycleMappingMetadata>
+        					<pluginExecutions>
+        						<pluginExecution>
+        							<pluginExecutionFilter>
+        								<groupId>
+        									org.jvnet.jaxb2.maven2
+        								</groupId>
+        								<artifactId>
+        									maven-jaxb2-plugin
+        								</artifactId>
+        								<versionRange>
+        									[0.7.4,)
+        								</versionRange>
+        								<goals>
+        									<goal>generate</goal>
+        								</goals>
+        							</pluginExecutionFilter>
+        							<action>
+        								<ignore></ignore>
+        							</action>
+        						</pluginExecution>
+        					</pluginExecutions>
+        				</lifecycleMappingMetadata>
+        			</configuration>
+        		</plugin>
+        	</plugins>
+        </pluginManagement>
     </build>
 
     <properties/>

Mage.Sets/src/mage/sets/alarareborn/KnotvinePaladin.java

@@ -0,0 +1,78 @@
+/*
+ *  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.alarareborn;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.common.continious.BoostSourceEffect;
+import mage.cards.CardImpl;
+import mage.filter.Filter;
+import mage.filter.common.FilterControlledCreaturePermanent;
+
+/**
+ *
+ * @author Loki
+ */
+public class KnotvinePaladin extends CardImpl<KnotvinePaladin> {
+    private static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
+
+    static {
+        filter.setUseTapped(true);
+        filter.setTapped(false);
+    }
+
+
+    public KnotvinePaladin(UUID ownerId) {
+        super(ownerId, 71, "Knotvine Paladin", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{G}{W}");
+        this.expansionSetCode = "ARB";
+        this.subtype.add("Human");
+        this.subtype.add("Knight");
+
+        this.color.setGreen(true);
+        this.color.setWhite(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        this.addAbility(new AttacksTriggeredAbility(new BoostSourceEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Constants.Duration.EndOfTurn), false));
+    }
+
+    public KnotvinePaladin(final KnotvinePaladin card) {
+        super(card);
+    }
+
+    @Override
+    public KnotvinePaladin copy() {
+        return new KnotvinePaladin(this);
+    }
+}

Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java

@@ -28,12 +28,15 @@
 package mage.sets.newphyrexia;
 
 import java.util.UUID;
+
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.keyword.InfectAbility;
 import mage.cards.CardImpl;
@@ -59,6 +62,7 @@ public class ChainedThroatseeker extends CardImpl<ChainedThroatseeker> {
         this.toughness = new MageInt(5);
 
         this.addAbility(InfectAbility.getInstance());
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new ChainedThroatseekerEffect()));
     }
 
     public ChainedThroatseeker(final ChainedThroatseeker card) {