diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index f9f5951f3d..c4f3e58f13 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -47,7 +47,10 @@ log4j log4j - jar + + + org.slf4j + slf4j-log4j12 ${project.groupId} diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index 979d7b44e4..399aa60b39 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -27,6 +27,7 @@ + @@ -71,6 +72,7 @@ + diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/AssaultFormation.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/AssaultFormation.java index 5e30ae6d56..75a189ac7a 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/AssaultFormation.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/AssaultFormation.java @@ -93,7 +93,7 @@ class AssaultFormationCombatDamageRuleEffect extends ContinuousEffectImpl { public AssaultFormationCombatDamageRuleEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Each creature assigns combat damage equal to its toughness rather than its power"; + staticText = "Each creature you control assigns combat damage equal to its toughness rather than its power"; } public AssaultFormationCombatDamageRuleEffect(final AssaultFormationCombatDamageRuleEffect effect) { diff --git a/Utils/release/getting_implemented_cards.txt b/Utils/release/getting_implemented_cards.txt index 05d870e9f2..3feba783d6 100644 --- a/Utils/release/getting_implemented_cards.txt +++ b/Utils/release/getting_implemented_cards.txt @@ -102,6 +102,10 @@ git log 7d7afb60d6fbe6d3f15a8fae9af147df3d3f31c6..HEAD --diff-filter=A --name-st since 1.3.0-2015-02-07v7 git log 6bd17716cd23e0f19142fb59c9c1bc44d87441e3..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt +since 1.3.0-2015-03-14v1 +git log ece4d69f367536ffb80cdf94d5a3dd771ba40f04..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt + + 3. Copy added_cards.txt to trunk\Utils folder 4. Run script: > perl extract_in_wiki_format.perl