From 63558902c0aa2e451c49a659cc36b58549645001 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 30 Jun 2021 17:58:34 +0400 Subject: [PATCH] Merge fix --- .../Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck | 4 ++-- Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck b/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck index 32c468e760..6a6bd14e10 100644 --- a/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck +++ b/Mage.Client/release/sample-decks/Decks to Beat/Saint WW TDtB ST Jan 2012.mwDeck.dck @@ -8,7 +8,7 @@ 1 [POR:196] Plains 1 [M10:233] Plains 1 [M13:225] Glacial Fortress -4 [PMBS:8] Hero of Bladehold +4 [PMBS:8*] Hero of Bladehold 3 [ISD:11] Doomed Traveler 1 [DDK:2] Doomed Traveler 1 [DDN:81] Plains @@ -40,4 +40,4 @@ SB: 1 [M12:11] Celestial Purge SB: 1 [MBS:115] Mortarpod SB: 4 [M12:40] Timely Reinforcements SB: 3 [M12:63] Mana Leak -SB: 2 [M15:71] Negate +SB: 2 [M15:71] Negate \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java b/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java index d983dff710..32f32cc5c1 100644 --- a/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java +++ b/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java @@ -67,7 +67,7 @@ public class RavnicaAllegiancePromos extends ExpansionSet { cards.add(new SetCardInfo("Kaya's Wrath", "187s", Rarity.RARE, mage.cards.k.KayasWrath.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kaya, Orzhov Usurper", "186p", Rarity.MYTHIC, mage.cards.k.KayaOrzhovUsurper.class)); cards.add(new SetCardInfo("Lavinia, Azorius Renegade", "189s", Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Lavinia, Azorius Renegade", 189, Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class)); + cards.add(new SetCardInfo("Lavinia, Azorius Renegade", 189, Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Light Up the Stage", 107, Rarity.UNCOMMON, mage.cards.l.LightUpTheStage.class)); cards.add(new SetCardInfo("Lumbering Battlement", "15s", Rarity.RARE, mage.cards.l.LumberingBattlement.class)); cards.add(new SetCardInfo("Mass Manipulation", "42p", Rarity.RARE, mage.cards.m.MassManipulation.class));