From 044db331f49829a3e4c33ea5da1efec278c72ae0 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 6 Aug 2015 22:16:12 +0200
Subject: [PATCH] Changed Overide for Mirrordin set.

---
 .../mage/sets/mirrodin/AEtherSpellbomb.java    |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java |  2 +-
 .../src/mage/sets/mirrodin/AltarsLight.java    |  2 +-
 .../src/mage/sets/mirrodin/AncientDen.java     |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Annul.java    |  2 +-
 .../src/mage/sets/mirrodin/ArcSlogger.java     |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Arrest.java   |  2 +-
 .../mage/sets/mirrodin/AssertAuthority.java    |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Atog.java     |  2 +-
 .../mage/sets/mirrodin/AuriokBladewarden.java  |  2 +-
 .../mage/sets/mirrodin/AuriokSteelshaper.java  |  8 ++++----
 .../mage/sets/mirrodin/AuriokTransfixer.java   |  2 +-
 .../src/mage/sets/mirrodin/BansheesBlade.java  | 10 +++++-----
 .../src/mage/sets/mirrodin/BarterInBlood.java  |  2 +-
 .../src/mage/sets/mirrodin/Battlegrowth.java   |  2 +-
 .../mage/sets/mirrodin/BetrayalOfFlesh.java    |  2 +-
 .../src/mage/sets/mirrodin/BlindingBeam.java   |  2 +-
 .../src/mage/sets/mirrodin/BlinkmothUrn.java   |  6 +++---
 .../src/mage/sets/mirrodin/BlinkmothWell.java  |  2 +-
 .../src/mage/sets/mirrodin/Bloodscent.java     |  2 +-
 .../src/mage/sets/mirrodin/Bonesplitter.java   |  2 +-
 .../src/mage/sets/mirrodin/BoshIronGolem.java  |  2 +-
 .../src/mage/sets/mirrodin/BottleGnomes.java   |  2 +-
 .../src/mage/sets/mirrodin/Broodstar.java      |  2 +-
 .../src/mage/sets/mirrodin/Cathodion.java      |  2 +-
 .../mage/sets/mirrodin/ChaliceOfTheVoid.java   | 18 +++++++++---------
 .../mage/sets/mirrodin/ChromaticSphere.java    |  2 +-
 .../src/mage/sets/mirrodin/ChromeMox.java      | 12 ++++++------
 .../mage/sets/mirrodin/ClockworkBeetle.java    |  6 +++---
 .../mage/sets/mirrodin/ClockworkCondor.java    |  6 +++---
 .../mage/sets/mirrodin/ClockworkDragon.java    |  6 +++---
 .../mage/sets/mirrodin/ClockworkVorrac.java    |  6 +++---
 .../src/mage/sets/mirrodin/Cloudpost.java      |  2 +-
 .../src/mage/sets/mirrodin/CobaltGolem.java    |  2 +-
 .../src/mage/sets/mirrodin/ConsumeSpirit.java  |  2 +-
 .../mage/sets/mirrodin/ContaminatedBond.java   |  2 +-
 .../src/mage/sets/mirrodin/CopperMyr.java      |  2 +-
 .../src/mage/sets/mirrodin/CreepingMold.java   |  2 +-
 .../src/mage/sets/mirrodin/CrystalShard.java   |  6 +++---
 .../src/mage/sets/mirrodin/DampingMatrix.java  | 10 +++++-----
 .../src/mage/sets/mirrodin/Deconstruct.java    |  2 +-
 .../mage/sets/mirrodin/DiscipleOfTheVault.java |  2 +-
 .../src/mage/sets/mirrodin/DragonBlood.java    |  2 +-
 .../src/mage/sets/mirrodin/DreamsGrip.java     |  2 +-
 .../src/mage/sets/mirrodin/DrossProwler.java   |  2 +-
 .../src/mage/sets/mirrodin/Duplicant.java      | 16 ++++++++--------
 .../src/mage/sets/mirrodin/Duskworker.java     |  2 +-
 .../src/mage/sets/mirrodin/ElfReplica.java     |  2 +-
 .../src/mage/sets/mirrodin/EmpyrialPlate.java  |  2 +-
 .../mage/sets/mirrodin/ExtraplanarLens.java    | 14 +++++++-------
 .../src/mage/sets/mirrodin/Fabricate.java      |  2 +-
 .../src/mage/sets/mirrodin/FangrenHunter.java  |  2 +-
 .../src/mage/sets/mirrodin/FarsightMask.java   | 12 ++++++------
 .../src/mage/sets/mirrodin/FieryGambit.java    |  6 +++---
 .../src/mage/sets/mirrodin/Fireshrieker.java   |  2 +-
 .../mage/sets/mirrodin/FistsOfTheAnvil.java    |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Forest1.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Forest2.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Forest3.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Forest4.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Frogmite.java |  2 +-
 .../src/mage/sets/mirrodin/GalvanicKey.java    |  2 +-
 .../src/mage/sets/mirrodin/GildedLotus.java    |  2 +-
 .../src/mage/sets/mirrodin/Glimmervoid.java    | 10 +++++-----
 .../mage/sets/mirrodin/GlissaSunseeker.java    |  6 +++---
 .../mage/sets/mirrodin/GoblinCharbelcher.java  |  6 +++---
 .../src/mage/sets/mirrodin/GoblinReplica.java  |  2 +-
 .../src/mage/sets/mirrodin/GoblinStriker.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java  |  2 +-
 .../mage/sets/mirrodin/GolemSkinGauntlets.java | 10 +++++-----
 .../src/mage/sets/mirrodin/GrabTheReins.java   |  6 +++---
 .../src/mage/sets/mirrodin/GreatFurnace.java   |  2 +-
 .../src/mage/sets/mirrodin/HematiteGolem.java  |  2 +-
 .../src/mage/sets/mirrodin/IcyManipulator.java |  2 +-
 .../src/mage/sets/mirrodin/InciteWar.java      |  6 +++---
 Mage.Sets/src/mage/sets/mirrodin/IronMyr.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Island1.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Island2.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Island3.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Island4.java  |  2 +-
 .../mage/sets/mirrodin/IsochronScepter.java    | 10 +++++-----
 .../mage/sets/mirrodin/JourneyOfDiscovery.java |  2 +-
 .../src/mage/sets/mirrodin/KrarkClanGrunt.java |  2 +-
 .../mage/sets/mirrodin/KrarkClanShaman.java    |  2 +-
 .../src/mage/sets/mirrodin/KrarksThumb.java    | 12 ++++++------
 .../src/mage/sets/mirrodin/LeadenMyr.java      |  2 +-
 .../src/mage/sets/mirrodin/LeoninAbunas.java   |  2 +-
 .../mage/sets/mirrodin/LeoninBladetrap.java    |  2 +-
 .../src/mage/sets/mirrodin/LeoninDenGuard.java |  2 +-
 .../src/mage/sets/mirrodin/LeoninElder.java    |  2 +-
 .../src/mage/sets/mirrodin/LeoninScimitar.java |  2 +-
 .../mage/sets/mirrodin/LeoninSkyhunter.java    |  2 +-
 .../mage/sets/mirrodin/LeoninSunStandard.java  |  2 +-
 .../mage/sets/mirrodin/LifesparkSpellbomb.java |  2 +-
 .../mage/sets/mirrodin/LightningGreaves.java   |  2 +-
 .../src/mage/sets/mirrodin/LivingHive.java     |  6 +++---
 .../src/mage/sets/mirrodin/LodestoneMyr.java   |  2 +-
 .../mage/sets/mirrodin/LoomingHoverguard.java  |  2 +-
 .../src/mage/sets/mirrodin/LoxodonMender.java  |  2 +-
 .../mage/sets/mirrodin/LoxodonPunisher.java    |  2 +-
 .../mage/sets/mirrodin/LoxodonWarhammer.java   |  2 +-
 .../mage/sets/mirrodin/LumengridWarden.java    |  2 +-
 .../src/mage/sets/mirrodin/LuminousAngel.java  |  2 +-
 .../src/mage/sets/mirrodin/MalachiteGolem.java |  2 +-
 .../mage/sets/mirrodin/MarchOfTheMachines.java |  2 +-
 .../src/mage/sets/mirrodin/MaskOfMemory.java   |  2 +-
 .../src/mage/sets/mirrodin/MassHysteria.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Megatog.java  |  2 +-
 .../src/mage/sets/mirrodin/MesmericOrb.java    | 10 +++++-----
 Mage.Sets/src/mage/sets/mirrodin/MindsEye.java |  2 +-
 .../src/mage/sets/mirrodin/Mindslaver.java     |  2 +-
 .../src/mage/sets/mirrodin/MolderSlug.java     |  2 +-
 .../src/mage/sets/mirrodin/MoltenRain.java     |  6 +++---
 .../src/mage/sets/mirrodin/Mountain1.java      |  2 +-
 .../src/mage/sets/mirrodin/Mountain2.java      |  2 +-
 .../src/mage/sets/mirrodin/Mountain3.java      |  2 +-
 .../src/mage/sets/mirrodin/Mountain4.java      |  2 +-
 .../src/mage/sets/mirrodin/MyrAdapter.java     |  2 +-
 .../src/mage/sets/mirrodin/MyrEnforcer.java    |  2 +-
 .../src/mage/sets/mirrodin/MyrRetriever.java   |  2 +-
 .../src/mage/sets/mirrodin/NecrogenMists.java  |  2 +-
 .../mage/sets/mirrodin/NecrogenSpellbomb.java  |  2 +-
 .../src/mage/sets/mirrodin/Needlebug.java      |  2 +-
 .../mage/sets/mirrodin/NeurokHoversail.java    |  2 +-
 .../src/mage/sets/mirrodin/NeurokSpy.java      |  2 +-
 .../src/mage/sets/mirrodin/NightmareLash.java  |  2 +-
 .../src/mage/sets/mirrodin/NimDevourer.java    |  6 +++---
 .../src/mage/sets/mirrodin/NimLasher.java      |  2 +-
 .../src/mage/sets/mirrodin/NimReplica.java     |  2 +-
 .../src/mage/sets/mirrodin/NimShambler.java    |  2 +-
 .../src/mage/sets/mirrodin/NimShrieker.java    |  2 +-
 .../src/mage/sets/mirrodin/NuisanceEngine.java |  2 +-
 .../src/mage/sets/mirrodin/OblivionStone.java  |  6 +++---
 Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java |  2 +-
 .../src/mage/sets/mirrodin/OneDozenEyes.java   |  2 +-
 .../src/mage/sets/mirrodin/Ornithopter.java    |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Pentavus.java |  2 +-
 .../src/mage/sets/mirrodin/PewterGolem.java    |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Plains1.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Plains2.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Plains3.java  |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Plains4.java  |  2 +-
 .../src/mage/sets/mirrodin/PlatedSlagwurm.java |  2 +-
 .../src/mage/sets/mirrodin/PlatinumAngel.java  |  2 +-
 .../mage/sets/mirrodin/PredatorsStrike.java    |  2 +-
 .../src/mage/sets/mirrodin/PromiseOfPower.java |  2 +-
 .../src/mage/sets/mirrodin/ProteusStaff.java   |  6 +++---
 .../mage/sets/mirrodin/PsychicMembrane.java    |  2 +-
 .../mage/sets/mirrodin/PsychogenicProbe.java   | 10 +++++-----
 .../mage/sets/mirrodin/PyriteSpellbomb.java    |  2 +-
 .../src/mage/sets/mirrodin/RaiseTheAlarm.java  |  2 +-
 .../src/mage/sets/mirrodin/RazorBarrier.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Regress.java  |  2 +-
 .../src/mage/sets/mirrodin/ReiverDemon.java    |  2 +-
 .../src/mage/sets/mirrodin/RoarOfTheKha.java   |  2 +-
 .../src/mage/sets/mirrodin/RuleOfLaw.java      |  2 +-
 .../src/mage/sets/mirrodin/RustmouthOgre.java  | 10 +++++-----
 .../src/mage/sets/mirrodin/RustsporeRam.java   |  2 +-
 .../mage/sets/mirrodin/ScaleOfChissGoria.java  |  2 +-
 .../mage/sets/mirrodin/ScrabblingClaws.java    |  6 +++---
 .../src/mage/sets/mirrodin/SculptingSteel.java |  2 +-
 .../sets/mirrodin/ScytheOfTheWretched.java     | 14 +++++++-------
 .../src/mage/sets/mirrodin/SeatOfTheSynod.java |  2 +-
 .../src/mage/sets/mirrodin/SecondSunrise.java  | 12 ++++++------
 .../src/mage/sets/mirrodin/SeethingSong.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Shatter.java  |  2 +-
 .../src/mage/sets/mirrodin/ShrapnelBlast.java  |  2 +-
 .../src/mage/sets/mirrodin/SilverMyr.java      |  2 +-
 .../src/mage/sets/mirrodin/SkeletonShard.java  |  2 +-
 .../mage/sets/mirrodin/SkyhunterPatrol.java    |  2 +-
 .../src/mage/sets/mirrodin/SlagwurmArmor.java  |  2 +-
 .../src/mage/sets/mirrodin/SlithAscendant.java |  2 +-
 .../mage/sets/mirrodin/SlithBloodletter.java   |  2 +-
 .../mage/sets/mirrodin/SlithFirewalker.java    |  2 +-
 .../src/mage/sets/mirrodin/SlithPredator.java  |  2 +-
 .../src/mage/sets/mirrodin/SlithStrider.java   |  2 +-
 .../src/mage/sets/mirrodin/SolarTide.java      |  2 +-
 .../src/mage/sets/mirrodin/SoldierReplica.java |  2 +-
 .../mage/sets/mirrodin/SolemnSimulacrum.java   |  2 +-
 .../mage/sets/mirrodin/SomberHoverguard.java   |  2 +-
 .../src/mage/sets/mirrodin/SoulFoundry.java    | 12 ++++++------
 .../mage/sets/mirrodin/SpikeshotGoblin.java    |  6 +++---
 .../mage/sets/mirrodin/SpoilsOfTheVault.java   |  6 +++---
 .../src/mage/sets/mirrodin/StalkingStones.java |  2 +-
 .../src/mage/sets/mirrodin/SteelWall.java      |  2 +-
 .../src/mage/sets/mirrodin/SunDroplet.java     |  2 +-
 .../mage/sets/mirrodin/SunbeamSpellbomb.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Swamp1.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Swamp2.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Swamp3.java   |  2 +-
 Mage.Sets/src/mage/sets/mirrodin/Swamp4.java   |  2 +-
 .../src/mage/sets/mirrodin/SwordOfKaldra.java  | 10 +++++-----
 .../src/mage/sets/mirrodin/SylvanScrying.java  |  2 +-
 .../mage/sets/mirrodin/TajNarSwordsmith.java   |  6 +++---
 .../sets/mirrodin/TalismanOfDominance.java     |  2 +-
 .../mage/sets/mirrodin/TalismanOfImpulse.java  |  2 +-
 .../sets/mirrodin/TalismanOfIndulgence.java    |  2 +-
 .../mage/sets/mirrodin/TalismanOfProgress.java |  2 +-
 .../mage/sets/mirrodin/TalismanOfUnity.java    |  2 +-
 .../src/mage/sets/mirrodin/Tanglebloom.java    |  2 +-
 .../mage/sets/mirrodin/TelJiladArchers.java    |  2 +-
 .../src/mage/sets/mirrodin/TelJiladChosen.java |  2 +-
 .../src/mage/sets/mirrodin/TelJiladExile.java  |  2 +-
 .../src/mage/sets/mirrodin/TelJiladStylus.java |  2 +-
 .../src/mage/sets/mirrodin/TempestOfLight.java |  2 +-
 .../mage/sets/mirrodin/TemporalCascade.java    | 10 +++++-----
 Mage.Sets/src/mage/sets/mirrodin/Terror.java   |  2 +-
 .../mage/sets/mirrodin/ThirstForKnowledge.java |  2 +-
 .../src/mage/sets/mirrodin/Thoughtcast.java    |  2 +-
 .../src/mage/sets/mirrodin/TitaniumGolem.java  |  2 +-
 .../src/mage/sets/mirrodin/ToothAndNail.java   |  2 +-
 .../mage/sets/mirrodin/ToothOfChissGoria.java  |  2 +-
 .../mage/sets/mirrodin/TowerOfChampions.java   |  2 +-
 .../src/mage/sets/mirrodin/TowerOfEons.java    |  2 +-
 .../mage/sets/mirrodin/TowerOfFortunes.java    |  2 +-
 .../src/mage/sets/mirrodin/TowerOfMurmurs.java |  2 +-
 .../mage/sets/mirrodin/TrashForTreasure.java   |  2 +-
 .../src/mage/sets/mirrodin/TreeOfTales.java    |  2 +-
 .../src/mage/sets/mirrodin/Triskelion.java     |  2 +-
 .../src/mage/sets/mirrodin/TrollAscetic.java   |  2 +-
 .../mage/sets/mirrodin/TrollsOfTelJilad.java   |  2 +-
 .../src/mage/sets/mirrodin/TurnToDust.java     |  2 +-
 .../mage/sets/mirrodin/VaultOfWhispers.java    |  2 +-
 .../mage/sets/mirrodin/VedalkenArchmage.java   |  2 +-
 .../src/mage/sets/mirrodin/ViridianJoiner.java |  2 +-
 .../src/mage/sets/mirrodin/ViridianShaman.java |  2 +-
 .../mage/sets/mirrodin/VorracBattlehorns.java  | 10 +++++-----
 .../mage/sets/mirrodin/VulshokBattlegear.java  |  2 +-
 .../mage/sets/mirrodin/VulshokBerserker.java   |  2 +-
 .../mage/sets/mirrodin/VulshokGauntlets.java   | 10 +++++-----
 .../src/mage/sets/mirrodin/WailOfTheNim.java   |  2 +-
 .../src/mage/sets/mirrodin/WallOfBlood.java    |  2 +-
 .../mage/sets/mirrodin/WanderguardSentry.java  |  2 +-
 .../src/mage/sets/mirrodin/WeldingJar.java     |  2 +-
 .../src/mage/sets/mirrodin/WizardReplica.java  |  2 +-
 .../src/mage/sets/mirrodin/Worldslayer.java    |  2 +-
 .../src/mage/sets/mirrodin/WrenchMind.java     |  6 +++---
 .../src/mage/sets/mirrodin/YotianSoldier.java  |  2 +-
 238 files changed, 383 insertions(+), 383 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
index f13888a697..c27b2d019f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AEtherSpellbomb.java
@@ -45,7 +45,7 @@ public class AEtherSpellbomb extends mage.sets.elspethvstezzeret.AEtherSpellbomb
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AEtherSpellbomb copy() {
         return new AEtherSpellbomb(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java b/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java
index 613bb3e433..8928b1b157 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AlphaMyr.java
@@ -52,7 +52,7 @@ public class AlphaMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AlphaMyr copy() {
         return new AlphaMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
index 4bc72f29f6..adc976a385 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
@@ -63,7 +63,7 @@ public class AltarsLight extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AltarsLight copy() {
         return new AltarsLight(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java b/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java
index 8093e62ee8..6d813331cc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AncientDen.java
@@ -50,7 +50,7 @@ public class AncientDen extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AncientDen copy() {
         return new AncientDen(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Annul.java b/Mage.Sets/src/mage/sets/mirrodin/Annul.java
index 9399d38cfe..c24d2101e2 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Annul.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Annul.java
@@ -63,7 +63,7 @@ public class Annul extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Annul copy() {
         return new Annul(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java b/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java
index 5566992025..a69747adbe 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ArcSlogger.java
@@ -65,7 +65,7 @@ public class ArcSlogger extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ArcSlogger copy() {
         return new ArcSlogger(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java
index aaf206d24f..6cd9dafc0c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Arrest.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Arrest.java
@@ -70,7 +70,7 @@ public class Arrest extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Arrest copy() {
         return new Arrest(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java
index a392b15f73..3651291548 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AssertAuthority.java
@@ -58,7 +58,7 @@ public class AssertAuthority extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AssertAuthority copy() {
         return new AssertAuthority(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Atog.java b/Mage.Sets/src/mage/sets/mirrodin/Atog.java
index 5a31d2ef6e..5d9f5f0036 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Atog.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Atog.java
@@ -68,7 +68,7 @@ public class Atog extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Atog copy() {
         return new Atog(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java
index cc71010233..0c0565c388 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokBladewarden.java
@@ -67,7 +67,7 @@ public class AuriokBladewarden extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AuriokBladewarden copy() {
         return new AuriokBladewarden(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokSteelshaper.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokSteelshaper.java
index bc0d94da41..fdd7ffdd47 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AuriokSteelshaper.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokSteelshaper.java
@@ -82,7 +82,7 @@ public class AuriokSteelshaper extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AuriokSteelshaper copy() {
         return new AuriokSteelshaper(this);
     }
@@ -99,18 +99,18 @@ class AuriokSteelshaperCostReductionEffect extends CostModificationEffectImpl {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public AuriokSteelshaperCostReductionEffect copy() {
         return new AuriokSteelshaperCostReductionEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source, Ability abilityToModify) {
         CardUtil.reduceCost(abilityToModify, 1);
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public boolean applies(Ability abilityToModify, Ability source, Game game) {
         return abilityToModify.getControllerId().equals(source.getControllerId()) &&
                 (abilityToModify instanceof EquipAbility);
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
index f2cf65be8f..2c0ee1ec02 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
@@ -73,7 +73,7 @@ public class AuriokTransfixer extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public AuriokTransfixer copy() {
         return new AuriokTransfixer(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java b/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
index 896454e695..f3fe9728c3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
@@ -71,7 +71,7 @@ public class BansheesBlade extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BansheesBlade copy() {
         return new BansheesBlade(this);
     }
@@ -91,12 +91,12 @@ class BansheesBladeAbility extends TriggeredAbilityImpl {
         this.usedInPhase = ability.usedInPhase;
     }
 
-    @Override
+    @java.lang.Override
     public BansheesBladeAbility copy() {
         return new BansheesBladeAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == EventType.DAMAGED_PLAYER
                 || event.getType() == EventType.DAMAGED_CREATURE
@@ -104,7 +104,7 @@ class BansheesBladeAbility extends TriggeredAbilityImpl {
                 || event.getType() == EventType.COMBAT_DAMAGE_STEP_PRE;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event instanceof DamagedEvent && ((DamagedEvent) event).isCombatDamage() && !usedInPhase) {
             Permanent permanent = game.getPermanent(event.getSourceId());
@@ -119,7 +119,7 @@ class BansheesBladeAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever equipped creature deals combat damage, put a charge counter on {this}.";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java b/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
index 7ffb3d2db3..b4b2d060ad 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BarterInBlood.java
@@ -45,7 +45,7 @@ public class BarterInBlood extends mage.sets.avacynrestored.BarterInBlood {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BarterInBlood copy() {
         return new BarterInBlood(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java
index 266267c2f8..cb5efc7db1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Battlegrowth.java
@@ -53,7 +53,7 @@ public class Battlegrowth extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Battlegrowth copy() {
         return new Battlegrowth(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java b/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
index 50d0a33d43..c03a021913 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BetrayalOfFlesh.java
@@ -73,7 +73,7 @@ public class BetrayalOfFlesh extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BetrayalOfFlesh copy() {
         return new BetrayalOfFlesh(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java b/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
index b762ddbc0c..18f2b179b6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BlindingBeam.java
@@ -45,7 +45,7 @@ public class BlindingBeam extends mage.sets.elspethvstezzeret.BlindingBeam {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BlindingBeam copy() {
         return new BlindingBeam(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BlinkmothUrn.java b/Mage.Sets/src/mage/sets/mirrodin/BlinkmothUrn.java
index 5eea8cdfb5..a5ac16b9a1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BlinkmothUrn.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BlinkmothUrn.java
@@ -41,7 +41,7 @@ public class BlinkmothUrn extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BlinkmothUrn copy() {
         return new BlinkmothUrn(this);
     }
@@ -59,12 +59,12 @@ class BlinkmothUrnEffect extends OneShotEffect {
         super(effect);
     }
     
-    @Override
+    @java.lang.Override
     public BlinkmothUrnEffect copy() {
         return new BlinkmothUrnEffect(this);
     }
     
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(game.getActivePlayerId());
         FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts you control");
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BlinkmothWell.java b/Mage.Sets/src/mage/sets/mirrodin/BlinkmothWell.java
index cd023737f9..894222dbb6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BlinkmothWell.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BlinkmothWell.java
@@ -72,7 +72,7 @@ public class BlinkmothWell extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BlinkmothWell copy() {
         return new BlinkmothWell(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java
index 8fc5076042..2780de6bd8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Bloodscent.java
@@ -55,7 +55,7 @@ public class Bloodscent extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Bloodscent copy() {
         return new Bloodscent(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java b/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java
index ccf8f2c157..b2d4c29045 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Bonesplitter.java
@@ -58,7 +58,7 @@ public class Bonesplitter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Bonesplitter copy() {
         return new Bonesplitter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java b/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
index cd6d64cc78..051bd6d3b9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BoshIronGolem.java
@@ -45,7 +45,7 @@ public class BoshIronGolem extends mage.sets.planechase.BoshIronGolem {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BoshIronGolem copy() {
         return new BoshIronGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java b/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
index df238073ae..cf8f159ef1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BottleGnomes.java
@@ -45,7 +45,7 @@ public class BottleGnomes extends mage.sets.tempest.BottleGnomes {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public BottleGnomes copy() {
         return new BottleGnomes(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java b/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
index 47d749000f..ae4662db8b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Broodstar.java
@@ -45,7 +45,7 @@ public class Broodstar extends mage.sets.planechase.Broodstar {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Broodstar copy() {
         return new Broodstar(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java
index 8f38f129a8..6ca82d31e6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Cathodion.java
@@ -55,7 +55,7 @@ public class Cathodion extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Cathodion copy() {
         return new Cathodion(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
index 92255a1111..9547ef0150 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
@@ -68,7 +68,7 @@ public class ChaliceOfTheVoid extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ChaliceOfTheVoid copy() {
         return new ChaliceOfTheVoid(this);
     }
@@ -84,7 +84,7 @@ class ChaliceOfTheVoidEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (permanent != null) {
@@ -101,7 +101,7 @@ class ChaliceOfTheVoidEffect extends OneShotEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public ChaliceOfTheVoidEffect copy() {
         return new ChaliceOfTheVoidEffect(this);
     }
@@ -119,17 +119,17 @@ class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl {
         super(abiltity);
     }
 
-    @Override
+    @java.lang.Override
     public ChaliceOfTheVoidTriggeredAbility copy() {
         return new ChaliceOfTheVoidTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.SPELL_CAST;
     }
     
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent chalice = game.getPermanent(getSourceId());
         Spell spell = game.getStack().getSpell(event.getTargetId());
@@ -142,7 +142,7 @@ class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever a player casts a spell with converted mana cost equal to the number of charge counters on {this}, counter that spell.";
     }
@@ -159,12 +159,12 @@ class CounterEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public CounterEffect copy() {
         return new CounterEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         return game.getStack().counter(this.getTargetPointer().getFirst(game, source), source.getSourceId(), game);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java b/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java
index 0d8ee85234..1b9b2c20ae 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ChromaticSphere.java
@@ -61,7 +61,7 @@ public class ChromaticSphere extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ChromaticSphere copy() {
         return new ChromaticSphere(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChromeMox.java b/Mage.Sets/src/mage/sets/mirrodin/ChromeMox.java
index 00e8256abb..af94a37a99 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ChromeMox.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ChromeMox.java
@@ -73,7 +73,7 @@ public class ChromeMox extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ChromeMox copy() {
         return new ChromeMox(this);
     }
@@ -94,7 +94,7 @@ class ChromeMoxEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player.getHand().size() > 0) {
@@ -113,7 +113,7 @@ class ChromeMoxEffect extends OneShotEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public ChromeMoxEffect copy() {
         return new ChromeMoxEffect(this);
     }
@@ -135,12 +135,12 @@ class ChromeMoxManaEffect extends ManaEffect {
 
 
 
-    @Override
+    @java.lang.Override
     public ChromeMoxManaEffect copy() {
         return new ChromeMoxManaEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         Player player = game.getPlayer(source.getControllerId());
@@ -197,7 +197,7 @@ class ChromeMoxManaEffect extends ManaEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public Mana getMana(Game game, Ability source) {
         return null;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java
index 7f91eb2f87..f544032e83 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkBeetle.java
@@ -65,7 +65,7 @@ public class ClockworkBeetle extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkBeetle copy() {
         return new ClockworkBeetle(this);
     }
@@ -81,7 +81,7 @@ class ClockworkBeetleEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent p = game.getPermanent(source.getSourceId());
         if (p != null) {
@@ -93,7 +93,7 @@ class ClockworkBeetleEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkBeetleEffect copy() {
         return new ClockworkBeetleEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java
index 6a01b421d4..d995f96848 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkCondor.java
@@ -68,7 +68,7 @@ public class ClockworkCondor extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkCondor copy() {
         return new ClockworkCondor(this);
     }
@@ -84,7 +84,7 @@ class ClockworkCondorEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent p = game.getPermanent(source.getSourceId());
         if (p != null) {
@@ -96,7 +96,7 @@ class ClockworkCondorEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkCondorEffect copy() {
         return new ClockworkCondorEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java
index 89edef7ff4..d478eb1a37 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkDragon.java
@@ -72,7 +72,7 @@ public class ClockworkDragon extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkDragon copy() {
         return new ClockworkDragon(this);
     }
@@ -88,7 +88,7 @@ class ClockworkDragonEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent p = game.getPermanent(source.getSourceId());
         if (p != null) {
@@ -100,7 +100,7 @@ class ClockworkDragonEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkDragonEffect copy() {
         return new ClockworkDragonEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java b/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java
index f51b7517be..e783cbcbbb 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ClockworkVorrac.java
@@ -72,7 +72,7 @@ public class ClockworkVorrac extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkVorrac copy() {
         return new ClockworkVorrac(this);
     }
@@ -88,7 +88,7 @@ class ClockworkVorracEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent p = game.getPermanent(source.getSourceId());
         if (p != null) {
@@ -100,7 +100,7 @@ class ClockworkVorracEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public ClockworkVorracEffect copy() {
         return new ClockworkVorracEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java b/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java
index 2de82786bb..ea6e278bc9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Cloudpost.java
@@ -65,7 +65,7 @@ public class Cloudpost extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Cloudpost copy() {
         return new Cloudpost(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java b/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java
index 01c3b87fee..af9c86341d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/CobaltGolem.java
@@ -59,7 +59,7 @@ public class CobaltGolem extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public CobaltGolem copy() {
         return new CobaltGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
index c0bea16de0..6c5da65656 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ConsumeSpirit.java
@@ -47,7 +47,7 @@ public class ConsumeSpirit extends mage.sets.magic2010.ConsumeSpirit {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ConsumeSpirit copy() {
         return new ConsumeSpirit(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java b/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
index e38e9aa0c8..b89a4f8a8f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ContaminatedBond.java
@@ -45,7 +45,7 @@ public class ContaminatedBond extends mage.sets.ninthedition.ContaminatedBond {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ContaminatedBond copy() {
         return new ContaminatedBond(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java b/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java
index 6891e88e69..395c564520 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/CopperMyr.java
@@ -54,7 +54,7 @@ public class CopperMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public CopperMyr copy() {
         return new CopperMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java b/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
index a6400e102f..307d6dfea7 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/CreepingMold.java
@@ -45,7 +45,7 @@ public class CreepingMold extends mage.sets.tenthedition.CreepingMold {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public CreepingMold copy() {
         return new CreepingMold(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java b/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java
index 5b6e779b37..5068a42903 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/CrystalShard.java
@@ -70,7 +70,7 @@ public class CrystalShard extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public CrystalShard copy() {
         return new CrystalShard(this);
     }
@@ -91,12 +91,12 @@ class CrystalShardEffect extends OneShotEffect {
         this.cost = effect.cost.copy();
     }
 
-    @Override
+    @java.lang.Override
     public CrystalShardEffect copy() {
         return new CrystalShardEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {        
diff --git a/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java b/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java
index 491766f4fd..fb7dfb0f0d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/DampingMatrix.java
@@ -65,7 +65,7 @@ public class DampingMatrix extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public DampingMatrix copy() {
         return new DampingMatrix(this);
     }
@@ -89,22 +89,22 @@ class DampingMatrixEffect extends ReplacementEffectImpl {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public DampingMatrixEffect copy() {
         return new DampingMatrixEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         return true;
     }
     
-    @Override
+    @java.lang.Override
     public boolean checksEventType(GameEvent event, Game game) {
         return event.getType() == EventType.ACTIVATE_ABILITY;
     }
     
-    @Override
+    @java.lang.Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         MageObject object = game.getObject(event.getSourceId());
         if (object instanceof Permanent && filter.match((Permanent)object, game)) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
index 1e6eef3d17..9ee62a3fbb 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
@@ -63,7 +63,7 @@ public class Deconstruct extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Deconstruct copy() {
         return new Deconstruct(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java
index 223f4b99aa..6355d35451 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/DiscipleOfTheVault.java
@@ -69,7 +69,7 @@ public class DiscipleOfTheVault extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public DiscipleOfTheVault copy() {
         return new DiscipleOfTheVault(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java
index e3c6c1015c..fb9cfeb570 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/DragonBlood.java
@@ -60,7 +60,7 @@ public class DragonBlood extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public DragonBlood copy() {
         return new DragonBlood(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java
index 1f539e867e..228e76e2d7 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/DreamsGrip.java
@@ -74,7 +74,7 @@ public class DreamsGrip extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public DreamsGrip copy() {
         return new DreamsGrip(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java
index 060d0a0484..36fe5a79a4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/DrossProwler.java
@@ -55,7 +55,7 @@ public class DrossProwler extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public DrossProwler copy() {
         return new DrossProwler(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
index 097ad9b5bb..97e6c4811d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
@@ -81,7 +81,7 @@ public class Duplicant extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Duplicant copy() {
         return new Duplicant(this);
     }
@@ -97,12 +97,12 @@ class ExileTargetEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public ExileTargetEffect copy() {
         return new ExileTargetEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
         Permanent sourcePermananent = game.getPermanent(source.getSourceId());
@@ -117,7 +117,7 @@ class ExileTargetEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getText(Mode mode) {
         return "you may exile target nontoken creature";
     }
@@ -135,12 +135,12 @@ class DuplicantContinuousEffect extends ContinuousEffectImpl {
         super(effect);
         }
 
-    @Override
+    @java.lang.Override
     public DuplicantContinuousEffect copy() {
         return new DuplicantContinuousEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         Permanent permanent = game.getPermanent(source.getSourceId());
         if (permanent != null) {
@@ -172,12 +172,12 @@ class DuplicantContinuousEffect extends ContinuousEffectImpl {
         return false;
     }
     
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         return false;
     }
        
-    @Override
+    @java.lang.Override
     public boolean hasLayer(Layer layer) {
         return layer == Layer.PTChangingEffects_7 || layer == Layer.TypeChangingEffects_4;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java b/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java
index 5a0c14ff4d..a3e8b1dcf5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Duskworker.java
@@ -61,7 +61,7 @@ public class Duskworker extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Duskworker copy() {
         return new Duskworker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
index 1384238764..c7a006aa34 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
@@ -71,7 +71,7 @@ public class ElfReplica extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ElfReplica copy() {
         return new ElfReplica(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/EmpyrialPlate.java b/Mage.Sets/src/mage/sets/mirrodin/EmpyrialPlate.java
index 8e670b1954..f4f896cb3d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/EmpyrialPlate.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/EmpyrialPlate.java
@@ -61,7 +61,7 @@ public class EmpyrialPlate extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public EmpyrialPlate copy() {
         return new EmpyrialPlate(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ExtraplanarLens.java b/Mage.Sets/src/mage/sets/mirrodin/ExtraplanarLens.java
index b019f5c019..343798c557 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ExtraplanarLens.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ExtraplanarLens.java
@@ -73,7 +73,7 @@ public class ExtraplanarLens extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ExtraplanarLens copy() {
         return new ExtraplanarLens(this);
     }
@@ -96,7 +96,7 @@ class ExtraplanarLensImprintEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent extraplanarLens = game.getPermanentOrLKIBattlefield(source.getSourceId());
@@ -118,7 +118,7 @@ class ExtraplanarLensImprintEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public ExtraplanarLensImprintEffect copy() {
         return new ExtraplanarLensImprintEffect(this);
     }
@@ -135,12 +135,12 @@ class ExtraplanarLensTriggeredAbility extends TriggeredManaAbility {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.TAPPED_FOR_MANA;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent landTappedForMana = game.getPermanentOrLKIBattlefield(event.getSourceId());
         Permanent extraplanarLens = game.getPermanent(getSourceId());
@@ -164,12 +164,12 @@ class ExtraplanarLensTriggeredAbility extends TriggeredManaAbility {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return new StringBuilder("Whenever a land with the same name as the exiled card is tapped for mana, ").append(super.getRule()).toString();
     }
 
-    @Override
+    @java.lang.Override
     public ExtraplanarLensTriggeredAbility copy() {
         return new ExtraplanarLensTriggeredAbility(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java b/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
index 17ae471d3d..f188f69da3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Fabricate.java
@@ -45,7 +45,7 @@ public class Fabricate extends mage.sets.magic2010.Fabricate {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Fabricate copy() {
         return new Fabricate(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java
index fcda78ed97..a50ce1baf3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FangrenHunter.java
@@ -55,7 +55,7 @@ public class FangrenHunter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public FangrenHunter copy() {
         return new FangrenHunter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
index 7aa5166950..3638e18895 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
@@ -56,7 +56,7 @@ public class FarsightMask extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public FarsightMask copy() {
         return new FarsightMask(this);
     }
@@ -72,23 +72,23 @@ class FarsightMaskTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public FarsightMaskTriggeredAbility copy() {
         return new FarsightMaskTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkInterveningIfClause(Game game) {
         Permanent permanent = game.getPermanent(getSourceId());
         return permanent != null && !permanent.isTapped();
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getTargetId().equals(controllerId)) {
             UUID sourceControllerId = game.getControllerId(event.getSourceId());
@@ -99,7 +99,7 @@ class FarsightMaskTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever a source an opponent controls deals damage to you, if {this} is untapped, you may draw a card.";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java
index 25be1b7f87..c95dbad0ff 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FieryGambit.java
@@ -63,7 +63,7 @@ public class FieryGambit extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public FieryGambit copy() {
         return new FieryGambit(this);
     }
@@ -81,12 +81,12 @@ class FieryGambitEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public FieryGambitEffect copy() {
         return new FieryGambitEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java b/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
index 5371b7da9b..1e3504d471 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Fireshrieker.java
@@ -45,7 +45,7 @@ public class Fireshrieker extends mage.sets.magic2014.Fireshrieker {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Fireshrieker copy() {
         return new Fireshrieker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java b/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
index 2f42a1b088..c091e6f2b6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FistsOfTheAnvil.java
@@ -45,7 +45,7 @@ public class FistsOfTheAnvil extends mage.sets.tenthedition.FistsOfTheAnvil {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public FistsOfTheAnvil copy() {
         return new FistsOfTheAnvil(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Forest1.java b/Mage.Sets/src/mage/sets/mirrodin/Forest1.java
index d3c05ea5c4..417118b11a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Forest1.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Forest1.java
@@ -44,7 +44,7 @@ public class Forest1 extends mage.cards.basiclands.Forest {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Forest1 copy() {
         return new Forest1(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Forest2.java b/Mage.Sets/src/mage/sets/mirrodin/Forest2.java
index ff6380dca7..fd9f4b3e5f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Forest2.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Forest2.java
@@ -44,7 +44,7 @@ public class Forest2 extends mage.cards.basiclands.Forest {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Forest2 copy() {
         return new Forest2(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Forest3.java b/Mage.Sets/src/mage/sets/mirrodin/Forest3.java
index 3b443dff6e..5bc9d69b78 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Forest3.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Forest3.java
@@ -44,7 +44,7 @@ public class Forest3 extends mage.cards.basiclands.Forest {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Forest3 copy() {
         return new Forest3(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Forest4.java b/Mage.Sets/src/mage/sets/mirrodin/Forest4.java
index 676ccafb7c..12bfcb4ed7 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Forest4.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Forest4.java
@@ -44,7 +44,7 @@ public class Forest4 extends mage.cards.basiclands.Forest {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Forest4 copy() {
         return new Forest4(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java b/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
index e5bf48cfe4..e4de69dba5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Frogmite.java
@@ -45,7 +45,7 @@ public class Frogmite extends mage.sets.elspethvstezzeret.Frogmite {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Frogmite copy() {
         return new Frogmite(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
index 57fba23da1..31cf76f1fa 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
@@ -69,7 +69,7 @@ public class GalvanicKey extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GalvanicKey copy() {
         return new GalvanicKey(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java b/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
index b3a9670c52..afd3842ee6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GildedLotus.java
@@ -45,7 +45,7 @@ public class GildedLotus extends mage.sets.magic2013.GildedLotus {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GildedLotus copy() {
         return new GildedLotus(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
index f8f27d33be..75ab8e50f0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
@@ -60,7 +60,7 @@ public class Glimmervoid extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Glimmervoid copy() {
         return new Glimmervoid(this);
     }
@@ -76,17 +76,17 @@ class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public GlimmervoidTriggeredAbility copy() {
         return new GlimmervoidTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == EventType.END_TURN_STEP_PRE;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         FilterArtifactPermanent filter = new FilterArtifactPermanent();
         if (!game.getBattlefield().contains(filter, controllerId, 1, game)) {
@@ -95,7 +95,7 @@ class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "At the beginning of the end step, if you control no artifacts, sacrifice {this}.";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java b/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java
index f4520e50e5..4e6bc4c5fe 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GlissaSunseeker.java
@@ -72,7 +72,7 @@ public class GlissaSunseeker extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GlissaSunseeker copy() {
         return new GlissaSunseeker(this);
     }
@@ -89,12 +89,12 @@ class GlissaSunseekerEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public GlissaSunseekerEffect copy() {
         return new GlissaSunseekerEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         ManaPool pool = controller.getManaPool();
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java
index 4d592923a7..654c4e4dcf 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinCharbelcher.java
@@ -68,7 +68,7 @@ public class GoblinCharbelcher extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GoblinCharbelcher copy() {
         return new GoblinCharbelcher(this);
     }
@@ -85,12 +85,12 @@ class GoblinCharbelcherEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public GoblinCharbelcherEffect copy() {
         return new GoblinCharbelcherEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         boolean isMountain = false;
         MageObject sourceObject = game.getObject(source.getSourceId());
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
index d5b315d609..aeffd5c109 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
@@ -71,7 +71,7 @@ public class GoblinReplica extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GoblinReplica copy() {
         return new GoblinReplica(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java
index 51ad002083..e0944b2ca6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinStriker.java
@@ -58,7 +58,7 @@ public class GoblinStriker extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GoblinStriker copy() {
         return new GoblinStriker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java b/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java
index 843a45b436..6f1fd69cb8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GoldMyr.java
@@ -54,7 +54,7 @@ public class GoldMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GoldMyr copy() {
         return new GoldMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java
index bfbead38c7..b5beeb571e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GolemSkinGauntlets.java
@@ -62,7 +62,7 @@ public class GolemSkinGauntlets extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GolemSkinGauntlets copy() {
         return new GolemSkinGauntlets(this);
     }
@@ -78,7 +78,7 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue {
     public GolemSkinGauntletsAttachedCount(final GolemSkinGauntletsAttachedCount dynamicValue) {
     }
 
-    @Override
+    @java.lang.Override
     public int calculate(Game game, Ability source, Effect effect) {
         int count = 0;
         Permanent equipment = game.getPermanent(source.getSourceId());
@@ -98,17 +98,17 @@ class GolemSkinGauntletsAttachedCount implements DynamicValue {
         return count;
     }
 
-    @Override
+    @java.lang.Override
     public DynamicValue copy() {
         return new GolemSkinGauntletsAttachedCount(this);
     }
 
-    @Override
+    @java.lang.Override
     public String toString() {
         return "1";
     }
 
-    @Override
+    @java.lang.Override
     public String getMessage() {
         return "Equipment attached to it";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GrabTheReins.java b/Mage.Sets/src/mage/sets/mirrodin/GrabTheReins.java
index 905ef340f2..1cbdbdbb75 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GrabTheReins.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GrabTheReins.java
@@ -89,7 +89,7 @@ public class GrabTheReins extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GrabTheReins copy() {
         return new GrabTheReins(this);
     }
@@ -106,7 +106,7 @@ class GrabTheReinsEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         UUID controllerId = source.getControllerId();
         Target target = new TargetCreaturePermanent();
@@ -142,7 +142,7 @@ class GrabTheReinsEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public GrabTheReinsEffect copy() {
         return new GrabTheReinsEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java b/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java
index 5a759d25d8..abe44d7765 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GreatFurnace.java
@@ -50,7 +50,7 @@ public class GreatFurnace extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public GreatFurnace copy() {
         return new GreatFurnace(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java b/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java
index c35522ba36..0e8e54ad99 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/HematiteGolem.java
@@ -58,7 +58,7 @@ public class HematiteGolem extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public HematiteGolem copy() {
         return new HematiteGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java b/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
index 20129833d8..5a453583f1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/IcyManipulator.java
@@ -45,7 +45,7 @@ public class IcyManipulator extends mage.sets.tenthedition.IcyManipulator {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public IcyManipulator copy() {
         return new IcyManipulator(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/InciteWar.java b/Mage.Sets/src/mage/sets/mirrodin/InciteWar.java
index aecd8e0290..b7635f2125 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/InciteWar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/InciteWar.java
@@ -82,7 +82,7 @@ public class InciteWar extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public InciteWar copy() {
         return new InciteWar(this);
     }
@@ -99,12 +99,12 @@ class InciteWarMustAttackEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public InciteWarMustAttackEffect copy() {
         return new InciteWarMustAttackEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source));
         if (player != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java b/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java
index b8b92d7c43..713188380d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/IronMyr.java
@@ -54,7 +54,7 @@ public class IronMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public IronMyr copy() {
         return new IronMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Island1.java b/Mage.Sets/src/mage/sets/mirrodin/Island1.java
index 40c253b9aa..5465691330 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Island1.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Island1.java
@@ -45,7 +45,7 @@ public class Island1 extends mage.cards.basiclands.Island {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Island1 copy() {
         return new Island1(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Island2.java b/Mage.Sets/src/mage/sets/mirrodin/Island2.java
index c4493783a8..882a0f8fe8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Island2.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Island2.java
@@ -45,7 +45,7 @@ public class Island2 extends mage.cards.basiclands.Island {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Island2 copy() {
         return new Island2(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Island3.java b/Mage.Sets/src/mage/sets/mirrodin/Island3.java
index 09a395efda..56ff70d013 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Island3.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Island3.java
@@ -45,7 +45,7 @@ public class Island3 extends mage.cards.basiclands.Island {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Island3 copy() {
         return new Island3(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Island4.java b/Mage.Sets/src/mage/sets/mirrodin/Island4.java
index 2a43af0bf7..a6f457c94d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Island4.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Island4.java
@@ -45,7 +45,7 @@ public class Island4 extends mage.cards.basiclands.Island {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Island4 copy() {
         return new Island4(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java b/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java
index c66fe327f6..182669babf 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/IsochronScepter.java
@@ -75,7 +75,7 @@ public class IsochronScepter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public IsochronScepter copy() {
         return new IsochronScepter(this);
     }
@@ -98,7 +98,7 @@ class IsochronScepterImprintEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
@@ -124,7 +124,7 @@ class IsochronScepterImprintEffect extends OneShotEffect {
         
     }
 
-    @Override
+    @java.lang.Override
     public IsochronScepterImprintEffect copy() {
         return new IsochronScepterImprintEffect(this);
     }
@@ -142,12 +142,12 @@ class IsochronScepterCopyEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public IsochronScepterCopyEffect copy() {
         return new IsochronScepterCopyEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/JourneyOfDiscovery.java b/Mage.Sets/src/mage/sets/mirrodin/JourneyOfDiscovery.java
index 9c0820954d..40a8f5ee9b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/JourneyOfDiscovery.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/JourneyOfDiscovery.java
@@ -65,7 +65,7 @@ public class JourneyOfDiscovery extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public JourneyOfDiscovery copy() {
         return new JourneyOfDiscovery(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java
index 94ffdedb22..aae26d6f7c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanGrunt.java
@@ -74,7 +74,7 @@ public class KrarkClanGrunt extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public KrarkClanGrunt copy() {
         return new KrarkClanGrunt(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java
index a7c8e9e14a..a146a28a62 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/KrarkClanShaman.java
@@ -74,7 +74,7 @@ public class KrarkClanShaman extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public KrarkClanShaman copy() {
         return new KrarkClanShaman(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java b/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java
index 36535622b0..0cdacc0dde 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/KrarksThumb.java
@@ -61,7 +61,7 @@ public class KrarksThumb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public KrarksThumb copy() {
         return new KrarksThumb(this);
     }
@@ -77,7 +77,7 @@ class KrarksThumbEffect extends ReplacementEffectImpl {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         Player player = game.getPlayer(event.getPlayerId());
         if (player != null) {
@@ -96,22 +96,22 @@ class KrarksThumbEffect extends ReplacementEffectImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checksEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.FLIP_COIN;
     }
 
-    @Override
+    @java.lang.Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         return source.getControllerId().equals(event.getPlayerId());
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public KrarksThumbEffect copy() {
         return new KrarksThumbEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java b/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java
index ffb5900b8b..7d144062de 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeadenMyr.java
@@ -54,7 +54,7 @@ public class LeadenMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeadenMyr copy() {
         return new LeadenMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java
index e8fa6160cf..540f7a870c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninAbunas.java
@@ -64,7 +64,7 @@ public class LeoninAbunas extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninAbunas copy() {
         return new LeoninAbunas(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
index 504e83a6da..654eb93d90 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninBladetrap.java
@@ -45,7 +45,7 @@ public class LeoninBladetrap extends mage.sets.commander2013.LeoninBladetrap {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninBladetrap copy() {
         return new LeoninBladetrap(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java
index e49cf3faa0..075c217813 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninDenGuard.java
@@ -73,7 +73,7 @@ public class LeoninDenGuard extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninDenGuard copy() {
         return new LeoninDenGuard(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java
index c790c360d7..45986262ef 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninElder.java
@@ -60,7 +60,7 @@ public class LeoninElder extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninElder copy() {
         return new LeoninElder(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
index f4acfab016..f2c5a2be69 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninScimitar.java
@@ -47,7 +47,7 @@ public class LeoninScimitar extends mage.sets.tenthedition.LeoninScimitar {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninScimitar copy() {
         return new LeoninScimitar(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java
index 2f58b879d2..edf59d4f9b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninSkyhunter.java
@@ -56,7 +56,7 @@ public class LeoninSkyhunter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninSkyhunter copy() {
         return new LeoninSkyhunter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java b/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java
index dbd41164ff..d24fd96fc1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LeoninSunStandard.java
@@ -55,7 +55,7 @@ public class LeoninSunStandard extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LeoninSunStandard copy() {
         return new LeoninSunStandard(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java
index d16126b5cc..21ab646e06 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LifesparkSpellbomb.java
@@ -71,7 +71,7 @@ public class LifesparkSpellbomb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LifesparkSpellbomb copy() {
         return new LifesparkSpellbomb(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java b/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java
index 73a92cb9de..391adfcb05 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LightningGreaves.java
@@ -68,7 +68,7 @@ public class LightningGreaves extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LightningGreaves copy() {
         return new LightningGreaves(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LivingHive.java b/Mage.Sets/src/mage/sets/mirrodin/LivingHive.java
index d2e38bc750..7ba01ec498 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LivingHive.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LivingHive.java
@@ -66,7 +66,7 @@ public class LivingHive extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LivingHive copy() {
         return new LivingHive(this);
     }
@@ -83,12 +83,12 @@ class LivingHiveEffect extends OneShotEffect {
         super(effect);
     }
     
-    @Override
+    @java.lang.Override
     public LivingHiveEffect copy() {
         return new LivingHiveEffect(this);
     }
     
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(targetPointer.getFirst(game, source));
         if (player != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java b/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
index b1f3e0e145..05a91327a9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LodestoneMyr.java
@@ -45,7 +45,7 @@ public class LodestoneMyr extends mage.sets.planechase.LodestoneMyr {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LodestoneMyr copy() {
         return new LodestoneMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
index 3f09d0e5a5..657e07c854 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
@@ -69,7 +69,7 @@ public class LoomingHoverguard extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LoomingHoverguard copy() {
         return new LoomingHoverguard(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
index 4bcf2cee1e..f280f831ae 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
@@ -73,7 +73,7 @@ public class LoxodonMender extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LoxodonMender copy() {
         return new LoxodonMender(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java
index edc5fbb089..9b849c157c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonPunisher.java
@@ -63,7 +63,7 @@ public class LoxodonPunisher extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LoxodonPunisher copy() {
         return new LoxodonPunisher(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
index 9c48fc6395..510bb2b755 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonWarhammer.java
@@ -47,7 +47,7 @@ public class LoxodonWarhammer extends mage.sets.planechase.LoxodonWarhammer {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LoxodonWarhammer copy() {
         return new LoxodonWarhammer(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java b/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
index 210c29f8f5..5729d6d846 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LumengridWarden.java
@@ -45,7 +45,7 @@ public class LumengridWarden extends mage.sets.tenthedition.LumengridWarden {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LumengridWarden copy() {
         return new LumengridWarden(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java
index 7fab125c19..2bd4c953df 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LuminousAngel.java
@@ -60,7 +60,7 @@ public class LuminousAngel extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public LuminousAngel copy() {
         return new LuminousAngel(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java b/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java
index c1b768a0e7..354cb3b493 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MalachiteGolem.java
@@ -59,7 +59,7 @@ public class MalachiteGolem extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MalachiteGolem copy() {
         return new MalachiteGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java b/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
index 1c14f4eb5f..a772a1b044 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MarchOfTheMachines.java
@@ -45,7 +45,7 @@ public class MarchOfTheMachines extends mage.sets.tenthedition.MarchOfTheMachine
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MarchOfTheMachines copy() {
         return new MarchOfTheMachines(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java b/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
index cc13eecf92..1fb2fff129 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MaskOfMemory.java
@@ -45,7 +45,7 @@ public class MaskOfMemory extends mage.sets.planechase.MaskOfMemory {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MaskOfMemory copy() {
         return new MaskOfMemory(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java
index b48267e3fb..2cc90d3727 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MassHysteria.java
@@ -56,7 +56,7 @@ public class MassHysteria extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MassHysteria copy() {
         return new MassHysteria(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java
index 801acb392b..c888442f90 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Megatog.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Megatog.java
@@ -72,7 +72,7 @@ public class Megatog extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Megatog copy() {
         return new Megatog(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java b/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
index 7b237c99fe..6e5e1f84b7 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
@@ -61,7 +61,7 @@ public class MesmericOrb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MesmericOrb copy() {
         return new MesmericOrb(this);
     }
@@ -77,17 +77,17 @@ class BecomesUntappedPermanentTriggeredAbility extends TriggeredAbilityImpl{
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public BecomesUntappedPermanentTriggeredAbility copy() {
         return new BecomesUntappedPermanentTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == EventType.UNTAPPED;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent permanent = game.getPermanent(event.getTargetId());
         if (permanent != null) {
@@ -97,7 +97,7 @@ class BecomesUntappedPermanentTriggeredAbility extends TriggeredAbilityImpl{
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever a permanent becomes untapped, " + super.getRule();
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java
index baec209011..07dcfcda89 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MindsEye.java
@@ -54,7 +54,7 @@ public class MindsEye extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MindsEye copy() {
         return new MindsEye(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
index 10de4e8ae6..1e0e616bc1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mindslaver.java
@@ -47,7 +47,7 @@ public class Mindslaver extends mage.sets.scarsofmirrodin.Mindslaver {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Mindslaver copy() {
         return new Mindslaver(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java
index cefc85a018..f13d7e10a0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MolderSlug.java
@@ -67,7 +67,7 @@ public class MolderSlug extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MolderSlug copy() {
         return new MolderSlug(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java
index bdcac25004..e0872cb2b5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MoltenRain.java
@@ -63,7 +63,7 @@ public class MoltenRain extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MoltenRain copy() {
         return new MoltenRain(this);
     }
@@ -80,12 +80,12 @@ class MoltenRainEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public MoltenRainEffect copy() {
         return new MoltenRainEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD);
         if (permanent != null && !permanent.getSupertype().contains("Basic")) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mountain1.java b/Mage.Sets/src/mage/sets/mirrodin/Mountain1.java
index 0679b2a11a..83978d3dd3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mountain1.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mountain1.java
@@ -45,7 +45,7 @@ public class Mountain1 extends mage.cards.basiclands.Mountain {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Mountain1 copy() {
         return new Mountain1(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mountain2.java b/Mage.Sets/src/mage/sets/mirrodin/Mountain2.java
index ea38142bd3..9190ef81d6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mountain2.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mountain2.java
@@ -45,7 +45,7 @@ public class Mountain2 extends mage.cards.basiclands.Mountain {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Mountain2 copy() {
         return new Mountain2(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mountain3.java b/Mage.Sets/src/mage/sets/mirrodin/Mountain3.java
index 3d4a0dd4bb..9b13f549bf 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mountain3.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mountain3.java
@@ -45,7 +45,7 @@ public class Mountain3 extends mage.cards.basiclands.Mountain {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Mountain3 copy() {
         return new Mountain3(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Mountain4.java b/Mage.Sets/src/mage/sets/mirrodin/Mountain4.java
index 7c8639020a..852a488bb3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Mountain4.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Mountain4.java
@@ -45,7 +45,7 @@ public class Mountain4 extends mage.cards.basiclands.Mountain {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Mountain4 copy() {
         return new Mountain4(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java b/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java
index 16592471fe..5ed2e2f88e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MyrAdapter.java
@@ -62,7 +62,7 @@ public class MyrAdapter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MyrAdapter copy() {
         return new MyrAdapter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java b/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
index dbc7ba0755..75d9999fb5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MyrEnforcer.java
@@ -45,7 +45,7 @@ public class MyrEnforcer extends mage.sets.planechase.MyrEnforcer {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MyrEnforcer copy() {
         return new MyrEnforcer(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java b/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
index 58fc7b74bf..7791fdacbe 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MyrRetriever.java
@@ -45,7 +45,7 @@ public class MyrRetriever extends mage.sets.modernmasters.MyrRetriever {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public MyrRetriever copy() {
         return new MyrRetriever(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java
index a6881b1756..6849b48b76 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenMists.java
@@ -55,7 +55,7 @@ public class NecrogenMists extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NecrogenMists copy() {
         return new NecrogenMists(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java
index fcb16b0875..67655a692a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NecrogenSpellbomb.java
@@ -65,7 +65,7 @@ public class NecrogenSpellbomb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NecrogenSpellbomb copy() {
         return new NecrogenSpellbomb(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java b/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java
index 56f10dfdd4..1bd3e785c7 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Needlebug.java
@@ -59,7 +59,7 @@ public class Needlebug extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Needlebug copy() {
         return new Needlebug(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java b/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java
index 6eef00d505..909d74c8f8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NeurokHoversail.java
@@ -58,7 +58,7 @@ public class NeurokHoversail extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NeurokHoversail copy() {
         return new NeurokHoversail(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java
index 3dccb51f5d..51188369f4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NeurokSpy.java
@@ -67,7 +67,7 @@ public class NeurokSpy extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NeurokSpy copy() {
         return new NeurokSpy(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java b/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java
index 2b1afca748..6afd1d2bab 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NightmareLash.java
@@ -68,7 +68,7 @@ public class NightmareLash extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NightmareLash copy() {
         return new NightmareLash(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimDevourer.java b/Mage.Sets/src/mage/sets/mirrodin/NimDevourer.java
index 5096665ecc..b66386c528 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NimDevourer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NimDevourer.java
@@ -85,7 +85,7 @@ public class NimDevourer extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NimDevourer copy() {
         return new NimDevourer(this);
     }
@@ -102,12 +102,12 @@ class NimDevourerEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public NimDevourerEffect copy() {
         return new NimDevourerEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java
index 1af1ffcdb6..b3cbc9c3d2 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NimLasher.java
@@ -67,7 +67,7 @@ public class NimLasher extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NimLasher copy() {
         return new NimLasher(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java
index 1c1f302394..a660579507 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NimReplica.java
@@ -64,7 +64,7 @@ public class NimReplica extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NimReplica copy() {
         return new NimReplica(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java
index 57a57fb340..a3ad438840 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NimShambler.java
@@ -72,7 +72,7 @@ public class NimShambler extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NimShambler copy() {
         return new NimShambler(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java
index 8ed76b47f6..b81a37f201 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NimShrieker.java
@@ -69,7 +69,7 @@ public class NimShrieker extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NimShrieker copy() {
         return new NimShrieker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java b/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
index 3b63bda3f4..184bf4f6dd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/NuisanceEngine.java
@@ -45,7 +45,7 @@ public class NuisanceEngine extends mage.sets.planechase.NuisanceEngine {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public NuisanceEngine copy() {
         return new NuisanceEngine(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java
index 184dcc1ab3..d0ef92ef31 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/OblivionStone.java
@@ -71,7 +71,7 @@ public class OblivionStone extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public OblivionStone copy() {
         return new OblivionStone(this);
     }
@@ -87,7 +87,7 @@ class OblivionStoneEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         for (Permanent p : game.getBattlefield().getAllActivePermanents()) {
             if (!(p.getCardType().contains(CardType.LAND) || p.getCounters().containsKey(CounterType.FATE))) {
@@ -102,7 +102,7 @@ class OblivionStoneEffect extends OneShotEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public OblivionStoneEffect copy() {
         return new OblivionStoneEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java b/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java
index 615a134409..5f9062daa1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/OmegaMyr.java
@@ -52,7 +52,7 @@ public class OmegaMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public OmegaMyr copy() {
         return new OmegaMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java b/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
index 3518126f72..db0a3d698e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/OneDozenEyes.java
@@ -45,7 +45,7 @@ public class OneDozenEyes extends mage.sets.commander2013.OneDozenEyes {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public OneDozenEyes copy() {
         return new OneDozenEyes(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java b/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
index c64f333279..78ee448d26 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Ornithopter.java
@@ -45,7 +45,7 @@ public class Ornithopter extends mage.sets.tenthedition.Ornithopter {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Ornithopter copy() {
         return new Ornithopter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java b/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
index 6fe1b9ea2d..a8a632e26e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Pentavus.java
@@ -45,7 +45,7 @@ public class Pentavus extends mage.sets.elspethvstezzeret.Pentavus {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Pentavus copy() {
         return new Pentavus(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java b/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java
index 4109de8823..bac712072b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PewterGolem.java
@@ -57,7 +57,7 @@ public class PewterGolem extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PewterGolem copy() {
         return new PewterGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Plains1.java b/Mage.Sets/src/mage/sets/mirrodin/Plains1.java
index 10604274df..3624537364 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Plains1.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Plains1.java
@@ -45,7 +45,7 @@ public class Plains1 extends mage.cards.basiclands.Plains {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Plains1 copy() {
         return new Plains1(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Plains2.java b/Mage.Sets/src/mage/sets/mirrodin/Plains2.java
index 6a498371eb..f0ef9c70af 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Plains2.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Plains2.java
@@ -45,7 +45,7 @@ public class Plains2 extends mage.cards.basiclands.Plains {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Plains2 copy() {
         return new Plains2(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Plains3.java b/Mage.Sets/src/mage/sets/mirrodin/Plains3.java
index 99c444dcc5..6ecb5572b1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Plains3.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Plains3.java
@@ -45,7 +45,7 @@ public class Plains3 extends mage.cards.basiclands.Plains {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Plains3 copy() {
         return new Plains3(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Plains4.java b/Mage.Sets/src/mage/sets/mirrodin/Plains4.java
index ed626f5590..f0badf9c20 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Plains4.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Plains4.java
@@ -45,7 +45,7 @@ public class Plains4 extends mage.cards.basiclands.Plains {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Plains4 copy() {
         return new Plains4(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java
index 1e7509f184..39cd1476dd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PlatedSlagwurm.java
@@ -55,7 +55,7 @@ public class PlatedSlagwurm extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PlatedSlagwurm copy() {
         return new PlatedSlagwurm(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java b/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
index 2fb71ad5da..f4e95c130a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PlatinumAngel.java
@@ -45,7 +45,7 @@ public class PlatinumAngel extends mage.sets.tenthedition.PlatinumAngel {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PlatinumAngel copy() {
         return new PlatinumAngel(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java
index b4191b97b5..edc6f1aef4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PredatorsStrike.java
@@ -57,7 +57,7 @@ public class PredatorsStrike extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PredatorsStrike copy() {
         return new PredatorsStrike(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java b/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
index 80706a2622..4296e76d27 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PromiseOfPower.java
@@ -45,7 +45,7 @@ public class PromiseOfPower extends mage.sets.commander2014.PromiseOfPower {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PromiseOfPower copy() {
         return new PromiseOfPower(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ProteusStaff.java b/Mage.Sets/src/mage/sets/mirrodin/ProteusStaff.java
index 90dc9c2a87..7cfbf933b6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ProteusStaff.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ProteusStaff.java
@@ -69,7 +69,7 @@ public class ProteusStaff extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ProteusStaff copy() {
         return new ProteusStaff(this);
     }
@@ -86,12 +86,12 @@ class ProteusStaffEffect extends OneShotEffect {
         super(effect);
     }
     
-    @Override
+    @java.lang.Override
     public ProteusStaffEffect copy() {
         return new ProteusStaffEffect(this);
     }
     
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source));
         if (permanent != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java
index 7fb6463e9b..13d1253701 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PsychicMembrane.java
@@ -59,7 +59,7 @@ public class PsychicMembrane extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PsychicMembrane copy() {
         return new PsychicMembrane(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java b/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java
index 9ce7f410cf..0c4b4c1004 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PsychogenicProbe.java
@@ -58,7 +58,7 @@ public class PsychogenicProbe extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PsychogenicProbe copy() {
         return new PsychogenicProbe(this);
     }
@@ -74,17 +74,17 @@ class PsychogenicProbeTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public PsychogenicProbeTriggeredAbility copy() {
         return new PsychogenicProbeTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType().equals(EventType.LIBRARY_SHUFFLED);
     }
     
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         for (Effect effect : this.getEffects()) {
             effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
@@ -92,7 +92,7 @@ class PsychogenicProbeTriggeredAbility extends TriggeredAbilityImpl {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever a spell or ability causes a player to shuffle his or her library, Psychogenic Probe deals 2 damage to him or her.";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java
index 8b8428a8a3..23a1e2a825 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/PyriteSpellbomb.java
@@ -65,7 +65,7 @@ public class PyriteSpellbomb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public PyriteSpellbomb copy() {
         return new PyriteSpellbomb(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java
index a168b85253..86ac6a53c0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RaiseTheAlarm.java
@@ -52,7 +52,7 @@ public class RaiseTheAlarm extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RaiseTheAlarm copy() {
         return new RaiseTheAlarm(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java b/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
index 49b8783748..a9568c0830 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RazorBarrier.java
@@ -45,7 +45,7 @@ public class RazorBarrier extends mage.sets.elspethvstezzeret.RazorBarrier {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RazorBarrier copy() {
         return new RazorBarrier(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Regress.java b/Mage.Sets/src/mage/sets/mirrodin/Regress.java
index c54168c991..911acf72f8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Regress.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Regress.java
@@ -53,7 +53,7 @@ public class Regress extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Regress copy() {
         return new Regress(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java b/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
index 0f3420423d..5a6c5a41fe 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ReiverDemon.java
@@ -45,7 +45,7 @@ public class ReiverDemon extends mage.sets.divinevsdemonic.ReiverDemon {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ReiverDemon copy() {
         return new ReiverDemon(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RoarOfTheKha.java b/Mage.Sets/src/mage/sets/mirrodin/RoarOfTheKha.java
index d4a2813bbf..c85e9e2474 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RoarOfTheKha.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RoarOfTheKha.java
@@ -66,7 +66,7 @@ public class RoarOfTheKha extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RoarOfTheKha copy() {
         return new RoarOfTheKha(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
index e30fdd0279..b72076ada6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RuleOfLaw.java
@@ -47,7 +47,7 @@ public class RuleOfLaw extends mage.sets.tenthedition.RuleOfLaw {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RuleOfLaw copy() {
         return new RuleOfLaw(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java b/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java
index 669833fd27..175bc1194e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RustmouthOgre.java
@@ -65,7 +65,7 @@ public class RustmouthOgre extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RustmouthOgre copy() {
         return new RustmouthOgre(this);
     }
@@ -81,17 +81,17 @@ class RustmouthOgreTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public RustmouthOgreTriggeredAbility copy() {
         return new RustmouthOgreTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == EventType.DAMAGED_PLAYER;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         DamagedPlayerEvent damageEvent = (DamagedPlayerEvent) event;
         if (damageEvent.isCombatDamage() && event.getSourceId().equals(this.getSourceId())) {
@@ -106,7 +106,7 @@ class RustmouthOgreTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever {this} deals combat damage to a player, you may destroy target artifact that player controls.";
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
index ea823b712e..643987c81b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
@@ -66,7 +66,7 @@ public class RustsporeRam extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public RustsporeRam copy() {
         return new RustsporeRam(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java
index bb969fccc9..32f80eceb4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScaleOfChissGoria.java
@@ -65,7 +65,7 @@ public class ScaleOfChissGoria extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ScaleOfChissGoria copy() {
         return new ScaleOfChissGoria(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScrabblingClaws.java b/Mage.Sets/src/mage/sets/mirrodin/ScrabblingClaws.java
index 22f3b27323..83c645ba00 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScrabblingClaws.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScrabblingClaws.java
@@ -74,7 +74,7 @@ public class ScrabblingClaws extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ScrabblingClaws copy() {
         return new ScrabblingClaws(this);
     }
@@ -91,12 +91,12 @@ class ScrabblingClawsEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public ScrabblingClawsEffect copy() {
         return new ScrabblingClawsEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player targetPlayer = game.getPlayer(source.getFirstTarget());
         if (targetPlayer != null) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java b/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
index 7c3715074f..3844913c70 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SculptingSteel.java
@@ -45,7 +45,7 @@ public class SculptingSteel extends mage.sets.tenthedition.SculptingSteel {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SculptingSteel copy() {
         return new SculptingSteel(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
index 341aecb719..a0b0f53927 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ScytheOfTheWretched.java
@@ -79,7 +79,7 @@ public class ScytheOfTheWretched extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ScytheOfTheWretched copy() {
         return new ScytheOfTheWretched(this);
     }
@@ -95,17 +95,17 @@ class ScytheOfTheWretchedTriggeredAbility extends TriggeredAbilityImpl {
         super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public ScytheOfTheWretchedTriggeredAbility copy() {
         return new ScytheOfTheWretchedTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.ZONE_CHANGE;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         ZoneChangeEvent zoneChange = (ZoneChangeEvent) event;
         if (zoneChange.isDiesEvent() && zoneChange.getTarget().getCardType().contains(CardType.CREATURE)) {
@@ -122,7 +122,7 @@ class ScytheOfTheWretchedTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
         return "Whenever a creature dealt damage by equipped creature this turn dies, " + super.getRule();
     }
@@ -153,7 +153,7 @@ class ScytheOfTheWretchedReanimateEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Card card = game.getCard(getTargetPointer().getFirst(game, source));
         Player controller = game.getPlayer(source.getControllerId());
@@ -169,7 +169,7 @@ class ScytheOfTheWretchedReanimateEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public Effect copy() {
         return new ScytheOfTheWretchedReanimateEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java
index a8353a2179..351536ae65 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SeatOfTheSynod.java
@@ -50,7 +50,7 @@ public class SeatOfTheSynod extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SeatOfTheSynod copy() {
         return new SeatOfTheSynod(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
index 141503c8ef..376b69c06b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SecondSunrise.java
@@ -60,7 +60,7 @@ public class SecondSunrise extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SecondSunrise copy() {
         return new SecondSunrise(this);
     }
@@ -77,7 +77,7 @@ class SecondSunriseEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         SecondSunriseWatcher watcher = (SecondSunriseWatcher) game.getState().getWatchers().get("SecondSunriseWatcher");
         if (watcher != null) {
@@ -94,7 +94,7 @@ class SecondSunriseEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public SecondSunriseEffect copy() {
         return new SecondSunriseEffect(this);
     }
@@ -112,19 +112,19 @@ class SecondSunriseWatcher extends Watcher {
         this.cards.addAll(watcher.cards);
     }
 
-    @Override
+    @java.lang.Override
     public void watch(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
             cards.add(event.getTargetId());
         }
     }
 
-    @Override
+    @java.lang.Override
     public SecondSunriseWatcher copy() {
         return new SecondSunriseWatcher(this);
     }
 
-    @Override
+    @java.lang.Override
     public void reset() {
         super.reset();
         cards.clear();
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java
index 118b7979ec..63ddebe54f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SeethingSong.java
@@ -51,7 +51,7 @@ public class SeethingSong extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SeethingSong copy() {
         return new SeethingSong(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
index 6c8c5d5154..8b153e8955 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
@@ -53,7 +53,7 @@ public class Shatter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Shatter copy() {
         return new Shatter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java
index c9dda788ef..4b269946fb 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ShrapnelBlast.java
@@ -63,7 +63,7 @@ public class ShrapnelBlast extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ShrapnelBlast copy() {
         return new ShrapnelBlast(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java b/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java
index 024642a8d9..218dd3ecf9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SilverMyr.java
@@ -54,7 +54,7 @@ public class SilverMyr extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SilverMyr copy() {
         return new SilverMyr(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java b/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
index 4056a01304..2fe693eadd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SkeletonShard.java
@@ -45,7 +45,7 @@ public class SkeletonShard extends mage.sets.planechase.SkeletonShard {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SkeletonShard copy() {
         return new SkeletonShard(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java b/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
index 6223384d85..6827426e3d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SkyhunterPatrol.java
@@ -45,7 +45,7 @@ public class SkyhunterPatrol extends mage.sets.tenthedition.SkyhunterPatrol {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SkyhunterPatrol copy() {
         return new SkyhunterPatrol(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java b/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java
index 9e008c2bf2..ebd9df3c58 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlagwurmArmor.java
@@ -56,7 +56,7 @@ public class SlagwurmArmor extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlagwurmArmor copy() {
         return new SlagwurmArmor(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java
index 931a7b3233..ba749e2371 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlithAscendant.java
@@ -58,7 +58,7 @@ public class SlithAscendant extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlithAscendant copy() {
         return new SlithAscendant(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java
index aa1c5d3eae..d0f0b07aaa 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlithBloodletter.java
@@ -62,7 +62,7 @@ public class SlithBloodletter extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlithBloodletter copy() {
         return new SlithBloodletter(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java
index e6eaf50e07..c129b2dc3f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlithFirewalker.java
@@ -58,7 +58,7 @@ public class SlithFirewalker extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlithFirewalker copy() {
         return new SlithFirewalker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java
index 97f80ea6fe..37c9e7edbc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlithPredator.java
@@ -58,7 +58,7 @@ public class SlithPredator extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlithPredator copy() {
         return new SlithPredator(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java
index 9f129c8643..7e63807e13 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SlithStrider.java
@@ -59,7 +59,7 @@ public class SlithStrider extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SlithStrider copy() {
         return new SlithStrider(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SolarTide.java b/Mage.Sets/src/mage/sets/mirrodin/SolarTide.java
index 6164aff6d2..4ca6d7f86c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SolarTide.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SolarTide.java
@@ -75,7 +75,7 @@ public class SolarTide extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SolarTide copy() {
         return new SolarTide(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java b/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java
index 51fcef5f56..c1048cd8bc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SoldierReplica.java
@@ -64,7 +64,7 @@ public class SoldierReplica extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SoldierReplica copy() {
         return new SoldierReplica(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java b/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
index fd2af2f987..e0d44cc805 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SolemnSimulacrum.java
@@ -45,7 +45,7 @@ public class SolemnSimulacrum extends mage.sets.magic2012.SolemnSimulacrum {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SolemnSimulacrum copy() {
         return new SolemnSimulacrum(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java
index 2cbd88cb14..33fdc7dbc4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SomberHoverguard.java
@@ -58,7 +58,7 @@ public class SomberHoverguard extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SomberHoverguard copy() {
         return new SomberHoverguard(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java b/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java
index 8e4c6a2879..0ae3d362a2 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SoulFoundry.java
@@ -76,7 +76,7 @@ public class SoulFoundry extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public void adjustCosts(Ability ability, Game game) {
         if (ability instanceof SimpleActivatedAbility) {
             Permanent sourcePermanent = game.getPermanent(ability.getSourceId());
@@ -99,7 +99,7 @@ public class SoulFoundry extends CardImpl {
         }
     }
 
-    @Override
+    @java.lang.Override
     public SoulFoundry copy() {
         return new SoulFoundry(this);
     }
@@ -122,7 +122,7 @@ class SoulFoundryImprintEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
@@ -147,7 +147,7 @@ class SoulFoundryImprintEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public SoulFoundryImprintEffect copy() {
         return new SoulFoundryImprintEffect(this);
     }
@@ -164,7 +164,7 @@ class SoulFoundryEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
@@ -184,7 +184,7 @@ class SoulFoundryEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public SoulFoundryEffect copy() {
         return new SoulFoundryEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java
index 58929dcb71..b0ab572b36 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SpikeshotGoblin.java
@@ -68,7 +68,7 @@ public class SpikeshotGoblin extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SpikeshotGoblin copy() {
         return new SpikeshotGoblin(this);
     }
@@ -84,7 +84,7 @@ class SpikeshotGoblinEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Permanent sourcePermanent = game.getPermanent(source.getSourceId());
         if (sourcePermanent == null) {
@@ -109,7 +109,7 @@ class SpikeshotGoblinEffect extends OneShotEffect {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public SpikeshotGoblinEffect copy() {
         return new SpikeshotGoblinEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
index d2eeb3bd17..6629c14c6f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SpoilsOfTheVault.java
@@ -62,7 +62,7 @@ public class SpoilsOfTheVault extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SpoilsOfTheVault copy() {
         return new SpoilsOfTheVault(this);
     }
@@ -79,12 +79,12 @@ class SpoilsOfTheVaultEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public SpoilsOfTheVaultEffect copy() {
         return new SpoilsOfTheVaultEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         MageObject sourceObject = game.getObject(source.getSourceId());
         Player controller = game.getPlayer(source.getControllerId());
diff --git a/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java b/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
index 718a641d77..aa3a43ba3e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/StalkingStones.java
@@ -45,7 +45,7 @@ public class StalkingStones extends mage.sets.tempest.StalkingStones {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public StalkingStones copy() {
         return new StalkingStones(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java
index dea66f273c..4f63898d32 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SteelWall.java
@@ -54,7 +54,7 @@ public class SteelWall extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SteelWall copy() {
         return new SteelWall(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java b/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
index 43a3d3ead7..f1c72773b6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SunDroplet.java
@@ -45,7 +45,7 @@ public class SunDroplet extends mage.sets.commander2013.SunDroplet {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SunDroplet copy() {
         return new SunDroplet(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java
index 62eec3e8ff..e3743d6204 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SunbeamSpellbomb.java
@@ -63,7 +63,7 @@ public class SunbeamSpellbomb extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SunbeamSpellbomb copy() {
         return new SunbeamSpellbomb(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Swamp1.java b/Mage.Sets/src/mage/sets/mirrodin/Swamp1.java
index d854d42af6..381b620b2f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Swamp1.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Swamp1.java
@@ -45,7 +45,7 @@ public class Swamp1 extends mage.cards.basiclands.Swamp {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Swamp1 copy() {
         return new Swamp1(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Swamp2.java b/Mage.Sets/src/mage/sets/mirrodin/Swamp2.java
index 7bd942df3f..9c31334589 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Swamp2.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Swamp2.java
@@ -45,7 +45,7 @@ public class Swamp2 extends mage.cards.basiclands.Swamp {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Swamp2 copy() {
         return new Swamp2(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Swamp3.java b/Mage.Sets/src/mage/sets/mirrodin/Swamp3.java
index 43839ceed3..459640075b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Swamp3.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Swamp3.java
@@ -45,7 +45,7 @@ public class Swamp3 extends mage.cards.basiclands.Swamp {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Swamp3 copy() {
         return new Swamp3(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Swamp4.java b/Mage.Sets/src/mage/sets/mirrodin/Swamp4.java
index cd33dd5855..da560265cd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Swamp4.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Swamp4.java
@@ -45,7 +45,7 @@ public class Swamp4 extends mage.cards.basiclands.Swamp {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Swamp4 copy() {
         return new Swamp4(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
index cf7921dbde..27c6fa36ec 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
@@ -71,7 +71,7 @@ public class SwordOfKaldra extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SwordOfKaldra copy() {
         return new SwordOfKaldra(this);
     }
@@ -87,17 +87,17 @@ class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl {
             super(ability);
     }
 
-    @Override
+    @java.lang.Override
     public SwordOfKaldraTriggeredAbility copy() {
             return new SwordOfKaldraTriggeredAbility(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == EventType.DAMAGED_CREATURE;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent equipment = game.getPermanent(this.getSourceId());
         if (equipment != null
@@ -111,7 +111,7 @@ class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public String getRule() {
             return "Whenever equipped creature deals damage to a creature, " + super.getRule();
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java b/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
index 5a061a85b1..6acde907ee 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SylvanScrying.java
@@ -45,7 +45,7 @@ public class SylvanScrying extends mage.sets.tenthedition.SylvanScrying {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public SylvanScrying copy() {
         return new SylvanScrying(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java b/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java
index 33a834624f..884f933f93 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TajNarSwordsmith.java
@@ -69,7 +69,7 @@ public class TajNarSwordsmith extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TajNarSwordsmith copy() {
         return new TajNarSwordsmith(this);
     }
@@ -86,12 +86,12 @@ class TajNarSwordsmithEffect extends OneShotEffect {
         super(effect);
     }
     
-    @Override
+    @java.lang.Override
     public TajNarSwordsmithEffect copy() {
         return new TajNarSwordsmithEffect(this);
     }
     
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null && player.chooseUse(Outcome.BoostCreature, "Do you want to to pay {X}?", source, game)) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java
index 8501d95ab3..f22aea13fd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfDominance.java
@@ -62,7 +62,7 @@ public class TalismanOfDominance extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TalismanOfDominance copy() {
         return new TalismanOfDominance(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java
index 1e191f0249..f0072e4c5b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfImpulse.java
@@ -62,7 +62,7 @@ public class TalismanOfImpulse extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TalismanOfImpulse copy() {
         return new TalismanOfImpulse(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java
index 48cbb1c73e..d2b54e4806 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfIndulgence.java
@@ -62,7 +62,7 @@ public class TalismanOfIndulgence extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TalismanOfIndulgence copy() {
         return new TalismanOfIndulgence(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java
index d955bb7b8e..906fe8f676 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfProgress.java
@@ -62,7 +62,7 @@ public class TalismanOfProgress extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TalismanOfProgress copy() {
         return new TalismanOfProgress(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java
index 3b87ca52e9..2be502e301 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TalismanOfUnity.java
@@ -62,7 +62,7 @@ public class TalismanOfUnity extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TalismanOfUnity copy() {
         return new TalismanOfUnity(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java b/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java
index d146518970..c79c011f4d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Tanglebloom.java
@@ -58,7 +58,7 @@ public class Tanglebloom extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Tanglebloom copy() {
         return new Tanglebloom(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java
index 0aa6211b08..2f0dde06bc 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladArchers.java
@@ -60,7 +60,7 @@ public class TelJiladArchers extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TelJiladArchers copy() {
         return new TelJiladArchers(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java
index b6f56f03ca..e86c45d484 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladChosen.java
@@ -57,7 +57,7 @@ public class TelJiladChosen extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TelJiladChosen copy() {
         return new TelJiladChosen(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java
index c05e325568..d7d9230191 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladExile.java
@@ -59,7 +59,7 @@ public class TelJiladExile extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TelJiladExile copy() {
         return new TelJiladExile(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TelJiladStylus.java b/Mage.Sets/src/mage/sets/mirrodin/TelJiladStylus.java
index b6a5e99a57..f29623b9c8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TelJiladStylus.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TelJiladStylus.java
@@ -69,7 +69,7 @@ public class TelJiladStylus extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TelJiladStylus copy() {
         return new TelJiladStylus(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java b/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
index 8affb86117..e24ba4fd08 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TempestOfLight.java
@@ -45,7 +45,7 @@ public class TempestOfLight extends mage.sets.magic2010.TempestOfLight {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TempestOfLight copy() {
         return new TempestOfLight(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TemporalCascade.java b/Mage.Sets/src/mage/sets/mirrodin/TemporalCascade.java
index 8665d7274d..7767cfbe06 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TemporalCascade.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TemporalCascade.java
@@ -67,7 +67,7 @@ public class TemporalCascade extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TemporalCascade copy() {
         return new TemporalCascade(this);
     }
@@ -84,7 +84,7 @@ class TemporalCascadeShuffleEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player sourcePlayer = game.getPlayer(source.getControllerId());
         for (UUID playerId: sourcePlayer.getInRange()) {
@@ -103,7 +103,7 @@ class TemporalCascadeShuffleEffect extends OneShotEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public TemporalCascadeShuffleEffect copy() {
         return new TemporalCascadeShuffleEffect(this);
     }
@@ -120,7 +120,7 @@ class TemporalCascadeDrawEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player sourcePlayer = game.getPlayer(source.getControllerId());
         game.getState().handleSimultaneousEvent(game); // needed here so state based triggered effects 
@@ -133,7 +133,7 @@ class TemporalCascadeDrawEffect extends OneShotEffect {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public TemporalCascadeDrawEffect copy() {
         return new TemporalCascadeDrawEffect(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Terror.java b/Mage.Sets/src/mage/sets/mirrodin/Terror.java
index 057a2ca0c8..ba172bc20f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Terror.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Terror.java
@@ -45,7 +45,7 @@ public class Terror extends mage.sets.tenthedition.Terror {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Terror copy() {
         return new Terror(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java b/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
index 4f3461387e..eae35bffad 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ThirstForKnowledge.java
@@ -45,7 +45,7 @@ public class ThirstForKnowledge extends mage.sets.planechase.ThirstForKnowledge
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ThirstForKnowledge copy() {
         return new ThirstForKnowledge(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java b/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
index 4d90ccc4c2..1197995c4c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Thoughtcast.java
@@ -45,7 +45,7 @@ public class Thoughtcast extends mage.sets.elspethvstezzeret.Thoughtcast {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Thoughtcast copy() {
         return new Thoughtcast(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java b/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java
index 9cb7ff5f6b..610835b34b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TitaniumGolem.java
@@ -59,7 +59,7 @@ public class TitaniumGolem extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TitaniumGolem copy() {
         return new TitaniumGolem(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java b/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
index a50188250a..c9b4b4ab8d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ToothAndNail.java
@@ -45,7 +45,7 @@ public class ToothAndNail extends mage.sets.modernmasters.ToothAndNail {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ToothAndNail copy() {
         return new ToothAndNail(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java
index ba598aff8b..8417487ab1 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ToothOfChissGoria.java
@@ -65,7 +65,7 @@ public class ToothOfChissGoria extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ToothOfChissGoria copy() {
         return new ToothOfChissGoria(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java
index 8da2243911..988534c802 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfChampions.java
@@ -61,7 +61,7 @@ public class TowerOfChampions extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TowerOfChampions copy() {
         return new TowerOfChampions(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java
index 4ae77a5e20..fca55d57ed 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfEons.java
@@ -58,7 +58,7 @@ public class TowerOfEons extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TowerOfEons copy() {
         return new TowerOfEons(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java
index eed8fa34fb..d3d80c565e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfFortunes.java
@@ -58,7 +58,7 @@ public class TowerOfFortunes extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TowerOfFortunes copy() {
         return new TowerOfFortunes(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java
index 74cbf64bce..3c4e4452ef 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TowerOfMurmurs.java
@@ -60,7 +60,7 @@ public class TowerOfMurmurs extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TowerOfMurmurs copy() {
         return new TowerOfMurmurs(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java
index 8653694657..4c1c77b310 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TrashForTreasure.java
@@ -66,7 +66,7 @@ public class TrashForTreasure extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TrashForTreasure copy() {
         return new TrashForTreasure(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java
index 61fca0de6a..c604eb3a7a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TreeOfTales.java
@@ -50,7 +50,7 @@ public class TreeOfTales extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TreeOfTales copy() {
         return new TreeOfTales(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java b/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
index 127256fd0c..b47e3605ac 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Triskelion.java
@@ -45,7 +45,7 @@ public class Triskelion extends mage.sets.magic2011.Triskelion {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Triskelion copy() {
         return new Triskelion(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java
index 19760f938c..acdeea42cd 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TrollAscetic.java
@@ -61,7 +61,7 @@ public class TrollAscetic extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TrollAscetic copy() {
         return new TrollAscetic(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
index b49354cd7c..348bcbce2a 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
@@ -72,7 +72,7 @@ public class TrollsOfTelJilad extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TrollsOfTelJilad copy() {
         return new TrollsOfTelJilad(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
index 06b9939603..e7d9832552 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
@@ -63,7 +63,7 @@ public class TurnToDust extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public TurnToDust copy() {
         return new TurnToDust(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java
index 57203693fd..539d41680f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VaultOfWhispers.java
@@ -50,7 +50,7 @@ public class VaultOfWhispers extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VaultOfWhispers copy() {
         return new VaultOfWhispers(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java b/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java
index 5589557fd2..6ae9ac52b8 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VedalkenArchmage.java
@@ -59,7 +59,7 @@ public class VedalkenArchmage extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VedalkenArchmage copy() {
         return new VedalkenArchmage(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java b/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java
index c9e71165d4..4c289b7e4e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ViridianJoiner.java
@@ -59,7 +59,7 @@ public class ViridianJoiner extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ViridianJoiner copy() {
         return new ViridianJoiner(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java b/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
index 152fb42010..93d6f8f77e 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ViridianShaman.java
@@ -45,7 +45,7 @@ public class ViridianShaman extends mage.sets.tenthedition.ViridianShaman {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public ViridianShaman copy() {
         return new ViridianShaman(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VorracBattlehorns.java b/Mage.Sets/src/mage/sets/mirrodin/VorracBattlehorns.java
index b3033e3265..a4d47e9d1d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VorracBattlehorns.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VorracBattlehorns.java
@@ -75,7 +75,7 @@ public class VorracBattlehorns extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VorracBattlehorns copy() {
         return new VorracBattlehorns(this);
     }
@@ -103,12 +103,12 @@ class CantBeBlockedByMoreThanOneAttachedEffect extends ContinuousEffectImpl {
         this.attachmentType = effect.attachmentType;
     }
 
-    @Override
+    @java.lang.Override
     public CantBeBlockedByMoreThanOneAttachedEffect copy() {
         return new CantBeBlockedByMoreThanOneAttachedEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
         switch (layer) {
             case RulesEffects:
@@ -125,12 +125,12 @@ class CantBeBlockedByMoreThanOneAttachedEffect extends ContinuousEffectImpl {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         return false;
     }
 
-    @Override
+    @java.lang.Override
     public boolean hasLayer(Layer layer) {
         return layer == Layer.RulesEffects;
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java
index 7a2be4fbc2..99142d8b86 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokBattlegear.java
@@ -58,7 +58,7 @@ public class VulshokBattlegear extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VulshokBattlegear copy() {
         return new VulshokBattlegear(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
index 9ee0bff29a..e108be7a73 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokBerserker.java
@@ -45,7 +45,7 @@ public class VulshokBerserker extends mage.sets.magic2011.VulshokBerserker {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VulshokBerserker copy() {
         return new VulshokBerserker(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/VulshokGauntlets.java b/Mage.Sets/src/mage/sets/mirrodin/VulshokGauntlets.java
index d07b4de322..1022f36810 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/VulshokGauntlets.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/VulshokGauntlets.java
@@ -74,7 +74,7 @@ public class VulshokGauntlets extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public VulshokGauntlets copy() {
         return new VulshokGauntlets(this);
     }
@@ -91,22 +91,22 @@ class VulshokGauntletsEffect extends ReplacementEffectImpl {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public VulshokGauntletsEffect copy() {
         return new VulshokGauntletsEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         return true;
     }
 
-    @Override
+    @java.lang.Override
     public boolean checksEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.UNTAP;
     }
     
-    @Override
+    @java.lang.Override
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (game.getTurn().getStepType() == PhaseStep.UNTAP) {
             Permanent equipment = game.getPermanent(source.getSourceId());
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WailOfTheNim.java b/Mage.Sets/src/mage/sets/mirrodin/WailOfTheNim.java
index cbe3b765bd..429360ddf6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WailOfTheNim.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WailOfTheNim.java
@@ -63,7 +63,7 @@ public class WailOfTheNim extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WailOfTheNim copy() {
         return new WailOfTheNim(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java
index 5535457b7f..3e40690215 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WallOfBlood.java
@@ -62,7 +62,7 @@ public class WallOfBlood extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WallOfBlood copy() {
         return new WallOfBlood(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java b/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
index 8fb623dad0..40daf3e301 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WanderguardSentry.java
@@ -45,7 +45,7 @@ public class WanderguardSentry extends mage.sets.ninthedition.WanderguardSentry
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WanderguardSentry copy() {
         return new WanderguardSentry(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java
index ada85339d7..dc1be1047b 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WeldingJar.java
@@ -58,7 +58,7 @@ public class WeldingJar extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WeldingJar copy() {
         return new WeldingJar(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java b/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
index d750a39ba8..b2bdade484 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WizardReplica.java
@@ -45,7 +45,7 @@ public class WizardReplica extends mage.sets.planechase.WizardReplica {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WizardReplica copy() {
         return new WizardReplica(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java b/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
index 3cb17a7e36..6d3883763f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Worldslayer.java
@@ -45,7 +45,7 @@ public class Worldslayer extends mage.sets.magic2012.Worldslayer {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public Worldslayer copy() {
         return new Worldslayer(this);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java
index e03f202fee..48f36ef398 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/WrenchMind.java
@@ -61,7 +61,7 @@ public class WrenchMind extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public WrenchMind copy() {
         return new WrenchMind(this);
     }
@@ -78,12 +78,12 @@ class WrenchMindEffect extends OneShotEffect {
         super(effect);
     }
 
-    @Override
+    @java.lang.Override
     public WrenchMindEffect copy() {
         return new WrenchMindEffect(this);
     }
 
-    @Override
+    @java.lang.Override
     public boolean apply(Game game, Ability source) {
         Player targetPlayer = game.getPlayer(this.getTargetPointer().getFirst(game, source));
         if (targetPlayer != null && !targetPlayer.getHand().isEmpty()) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java b/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java
index 2798163657..c3f142ccc9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/YotianSoldier.java
@@ -55,7 +55,7 @@ public class YotianSoldier extends CardImpl {
         super(card);
     }
 
-    @Override
+    @java.lang.Override
     public YotianSoldier copy() {
         return new YotianSoldier(this);
     }