[maven-release-plugin] prepare release forge-1.4.2

- Preparing the changes.txt file for the next beta build and release.
- Added new card names to changes.txt.
2025-11-17 19:28:01 +00:00 · 2013-06-28 12:09:45 +00:00 · 2013-06-28 11:57:32 +00:00 · 2013-06-28 11:43:30 +00:00 · 2013-06-28 11:17:49 +00:00 · 2013-06-28 08:55:56 +00:00
13206 changed files with 20402 additions and 39006 deletions
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
--- a/.gitattributes
+++ b/.gitattributes
@@ -92,6 +92,7 @@ res/cardsfolder/a/adun_oakenshield.txt svneol=native#text/plain
 res/cardsfolder/a/advance_scout.txt svneol=native#text/plain
 res/cardsfolder/a/advanced_hoverguard.txt svneol=native#text/plain
 res/cardsfolder/a/advent_of_the_wurm.txt -text
+res/cardsfolder/a/adventurers_guildhouse.txt -text
 res/cardsfolder/a/adventuring_gear.txt svneol=native#text/plain
 res/cardsfolder/a/advice_from_the_fae.txt -text
 res/cardsfolder/a/aegis_angel.txt -text
@@ -828,10 +829,12 @@ res/cardsfolder/b/basilisk_collar.txt svneol=native#text/plain
 res/cardsfolder/b/basking_rootwalla.txt svneol=native#text/plain
 res/cardsfolder/b/bathe_in_light.txt -text
 res/cardsfolder/b/baton_of_courage.txt svneol=native#text/plain
+res/cardsfolder/b/baton_of_morale.txt -text
 res/cardsfolder/b/battered_golem.txt svneol=native#text/plain
 res/cardsfolder/b/batterhorn.txt -text
 res/cardsfolder/b/battering_craghorn.txt svneol=native#text/plain
 res/cardsfolder/b/battering_krasis.txt -text
+res/cardsfolder/b/battering_ram.txt -text
 res/cardsfolder/b/battering_sliver.txt svneol=native#text/plain
 res/cardsfolder/b/battering_wurm.txt svneol=native#text/plain
 res/cardsfolder/b/batterskull.txt svneol=native#text/plain
@@ -881,6 +884,7 @@ res/cardsfolder/b/bearscape.txt svneol=native#text/plain
 res/cardsfolder/b/beast_attack.txt svneol=native#text/plain
 res/cardsfolder/b/beast_hunt.txt svneol=native#text/plain
 res/cardsfolder/b/beast_of_burden.txt svneol=native#text/plain
+res/cardsfolder/b/beast_walkers.txt -text
 res/cardsfolder/b/beast_within.txt svneol=native#text/plain
 res/cardsfolder/b/beastbreaker_of_bala_ged.txt svneol=native#text/plain
 res/cardsfolder/b/beastmaster_ascension.txt svneol=native#text/plain
@@ -912,6 +916,8 @@ res/cardsfolder/b/benalish_cavalry.txt svneol=native#text/plain
 res/cardsfolder/b/benalish_commander.txt -text
 res/cardsfolder/b/benalish_emissary.txt svneol=native#text/plain
 res/cardsfolder/b/benalish_heralds.txt svneol=native#text/plain
+res/cardsfolder/b/benalish_hero.txt -text
+res/cardsfolder/b/benalish_infantry.txt -text
 res/cardsfolder/b/benalish_knight.txt svneol=native#text/plain
 res/cardsfolder/b/benalish_lancer.txt -text
 res/cardsfolder/b/benalish_missionary.txt svneol=native#text/plain
@@ -1110,6 +1116,7 @@ res/cardsfolder/b/bloodied_ghost.txt svneol=native#text/plain
 res/cardsfolder/b/bloodletter_quill.txt svneol=native#text/plain
 res/cardsfolder/b/bloodline_keeper_lord_of_lineage.txt -text
 res/cardsfolder/b/bloodline_shaman.txt -text
+res/cardsfolder/b/bloodlord_of_vaasgoth.txt -text
 res/cardsfolder/b/bloodmark_mentor.txt svneol=native#text/plain
 res/cardsfolder/b/bloodpyre_elemental.txt svneol=native#text/plain
 res/cardsfolder/b/bloodrage_vampire.txt svneol=native#text/plain
@@ -1486,6 +1493,7 @@ res/cardsfolder/c/callow_jushi_jaraku_the_interloper.txt -text
 res/cardsfolder/c/calming_licid.txt -text
 res/cardsfolder/c/calming_verse.txt svneol=native#text/plain
 res/cardsfolder/c/caltrops.txt svneol=native#text/plain
+res/cardsfolder/c/camel.txt -text
 res/cardsfolder/c/cancel.txt svneol=native#text/plain
 res/cardsfolder/c/candelabra_of_tawnos.txt svneol=native#text/plain
 res/cardsfolder/c/candles_of_leng.txt -text svneol=unset#text/plain
@@ -1586,6 +1594,7 @@ res/cardsfolder/c/caterwauling_boggart.txt -text
 res/cardsfolder/c/cathars_crusade.txt -text
 res/cardsfolder/c/cathartic_adept.txt svneol=native#text/plain
 res/cardsfolder/c/cathedral_membrane.txt -text
+res/cardsfolder/c/cathedral_of_serra.txt -text
 res/cardsfolder/c/cathedral_of_war.txt -text
 res/cardsfolder/c/cathedral_sanctifier.txt -text
 res/cardsfolder/c/cathodion.txt svneol=native#text/plain
@@ -2042,6 +2051,7 @@ res/cardsfolder/c/conviction.txt svneol=native#text/plain
 res/cardsfolder/c/convincing_mirage.txt svneol=native#text/plain
 res/cardsfolder/c/convolute.txt svneol=native#text/plain
 res/cardsfolder/c/convulsing_licid.txt -text
+res/cardsfolder/c/cooperation.txt -text
 res/cardsfolder/c/coordinated_barrage.txt svneol=native#text/plain
 res/cardsfolder/c/copper_carapace.txt svneol=native#text/plain
 res/cardsfolder/c/copper_gnomes.txt svneol=native#text/plain
@@ -2369,6 +2379,7 @@ res/cardsfolder/d/dark_offering.txt svneol=native#text/plain
 res/cardsfolder/d/dark_privilege.txt svneol=native#text/plain
 res/cardsfolder/d/dark_revenant.txt -text
 res/cardsfolder/d/dark_ritual.txt svneol=native#text/plain
+res/cardsfolder/d/dark_sphere.txt -text
 res/cardsfolder/d/dark_supplicant.txt -text svneol=unset#text/plain
 res/cardsfolder/d/dark_suspicions.txt -text svneol=unset#text/plain
 res/cardsfolder/d/dark_temper.txt svneol=native#text/plain
@@ -2389,6 +2400,7 @@ res/cardsfolder/d/darksteel_citadel.txt svneol=native#text/plain
 res/cardsfolder/d/darksteel_colossus.txt svneol=native#text/plain
 res/cardsfolder/d/darksteel_forge.txt svneol=native#text/plain
 res/cardsfolder/d/darksteel_gargoyle.txt svneol=native#text/plain
+res/cardsfolder/d/darksteel_garrison.txt -text
 res/cardsfolder/d/darksteel_ingot.txt svneol=native#text/plain
 res/cardsfolder/d/darksteel_juggernaut.txt svneol=native#text/plain
 res/cardsfolder/d/darksteel_myr.txt svneol=native#text/plain
@@ -2723,6 +2735,7 @@ res/cardsfolder/d/dinrova_horror.txt -text
 res/cardsfolder/d/diplomatic_escort.txt svneol=native#text/plain
 res/cardsfolder/d/diplomatic_immunity.txt svneol=native#text/plain
 res/cardsfolder/d/dire_undercurrents.txt svneol=native#text/plain
+res/cardsfolder/d/dire_wolves.txt -text
 res/cardsfolder/d/diregraf_captain.txt -text
 res/cardsfolder/d/diregraf_escort.txt -text
 res/cardsfolder/d/diregraf_ghoul.txt -text
@@ -2806,6 +2819,7 @@ res/cardsfolder/d/divining_witch.txt -text svneol=unset#text/plain
 res/cardsfolder/d/divinity_of_pride.txt svneol=native#text/plain
 res/cardsfolder/d/dizzy_spell.txt svneol=native#text/plain
 res/cardsfolder/d/dizzying_gaze.txt -text
+res/cardsfolder/d/djinn_illuminatus.txt -text
 res/cardsfolder/d/djinn_of_the_lamp.txt svneol=native#text/plain
 res/cardsfolder/d/djinn_of_wishes.txt -text svneol=unset#text/plain
 res/cardsfolder/d/do_or_die.txt svneol=native#text/plain
@@ -3346,6 +3360,7 @@ res/cardsfolder/e/erg_raiders.txt svneol=native#text/plain
 res/cardsfolder/e/erhnam_djinn.txt svneol=native#text/plain
 res/cardsfolder/e/erhnam_djinn_avatar.txt -text
 res/cardsfolder/e/eron_the_relentless.txt svneol=native#text/plain
+res/cardsfolder/e/errand_of_duty.txt -text
 res/cardsfolder/e/errant_doomsayers.txt svneol=native#text/plain
 res/cardsfolder/e/errant_ephemeron.txt svneol=native#text/plain
 res/cardsfolder/e/errantry.txt -text
@@ -3948,8 +3963,10 @@ res/cardsfolder/f/forked_bolt.txt svneol=native#text/plain
 res/cardsfolder/f/forked_branch_garami.txt svneol=native#text/plain
 res/cardsfolder/f/forked_lightning.txt -text
 res/cardsfolder/f/form_of_the_dragon.txt svneol=native#text/plain
+res/cardsfolder/f/formation.txt -text
 res/cardsfolder/f/forsaken_city.txt svneol=native#text/plain
 res/cardsfolder/f/forsaken_wastes.txt svneol=native#text/plain
+res/cardsfolder/f/fortified_area.txt -text
 res/cardsfolder/f/fortify.txt svneol=native#text/plain
 res/cardsfolder/f/fortitude.txt svneol=native#text/plain
 res/cardsfolder/f/fortress_crab.txt -text
@@ -4078,6 +4095,7 @@ res/cardsfolder/g/gaeas_liege.txt svneol=native#text/plain
 res/cardsfolder/g/gaeas_might.txt svneol=native#text/plain
 res/cardsfolder/g/gaeas_revenge.txt svneol=native#text/plain
 res/cardsfolder/g/gaeas_skyfolk.txt svneol=native#text/plain
+res/cardsfolder/g/gaeas_touch.txt -text
 res/cardsfolder/g/gainsay.txt svneol=native#text/plain
 res/cardsfolder/g/gale_force.txt svneol=native#text/plain
 res/cardsfolder/g/galepowder_mage.txt svneol=native#text/plain
@@ -4399,6 +4417,7 @@ res/cardsfolder/g/goblin_fire_fiend.txt -text
 res/cardsfolder/g/goblin_firebug.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_fireslinger.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_firestarter.txt svneol=native#text/plain
+res/cardsfolder/g/goblin_flectomancer.txt -text
 res/cardsfolder/g/goblin_flotilla.txt -text
 res/cardsfolder/g/goblin_furrier.txt -text
 res/cardsfolder/g/goblin_gardener.txt svneol=native#text/plain
@@ -4529,6 +4548,7 @@ res/cardsfolder/g/goretusk_firebeast.txt svneol=native#text/plain
 res/cardsfolder/g/gorger_wurm.txt svneol=native#text/plain
 res/cardsfolder/g/gorgon_flail.txt svneol=native#text/plain
 res/cardsfolder/g/gorgon_recluse.txt svneol=native#text/plain
+res/cardsfolder/g/gorilla_berserkers.txt -text
 res/cardsfolder/g/gorilla_chieftain.txt svneol=native#text/plain
 res/cardsfolder/g/gorilla_pack.txt svneol=native#text/plain
 res/cardsfolder/g/gorilla_shaman.txt svneol=native#text/plain
@@ -4745,6 +4765,7 @@ res/cardsfolder/g/guided_strike.txt svneol=native#text/plain
 res/cardsfolder/g/guiding_spirit.txt -text
 res/cardsfolder/g/guild_feud.txt -text
 res/cardsfolder/g/guildscorn_ward.txt -text
+res/cardsfolder/g/guile.txt -text
 res/cardsfolder/g/guiltfeeder.txt svneol=native#text/plain
 res/cardsfolder/g/guilty_conscience.txt svneol=native#text/plain
 res/cardsfolder/g/guise_of_fire.txt -text
@@ -4971,6 +4992,7 @@ res/cardsfolder/h/hells_caretaker_avatar.txt -text
 res/cardsfolder/h/hells_thunder.txt svneol=native#text/plain
 res/cardsfolder/h/hellspark_elemental.txt svneol=native#text/plain
 res/cardsfolder/h/helm_of_awakening.txt svneol=native#text/plain
+res/cardsfolder/h/helm_of_chatzuk.txt -text
 res/cardsfolder/h/helm_of_kaldra.txt -text
 res/cardsfolder/h/helm_of_obedience.txt -text
 res/cardsfolder/h/helm_of_possession.txt svneol=native#text/plain
@@ -4981,6 +5003,7 @@ res/cardsfolder/h/hematite_talisman.txt svneol=native#text/plain
 res/cardsfolder/h/henchfiend_of_ukor.txt svneol=native#text/plain
 res/cardsfolder/h/henge_guardian.txt svneol=native#text/plain
 res/cardsfolder/h/henge_of_ramos.txt svneol=native#text/plain
+res/cardsfolder/h/herald_of_leshrac.txt -text
 res/cardsfolder/h/herald_of_serra.txt svneol=native#text/plain
 res/cardsfolder/h/herald_of_war.txt -text
 res/cardsfolder/h/herbal_poultice.txt svneol=native#text/plain
@@ -5228,11 +5251,14 @@ res/cardsfolder/i/i_delight_in_your_convulsions.txt -text
 res/cardsfolder/i/i_know_all_i_see_all.txt -text
 res/cardsfolder/i/ib_halfheart_goblin_tactician.txt -text svneol=unset#text/plain
 res/cardsfolder/i/icatian_crier.txt svneol=native#text/plain
+res/cardsfolder/i/icatian_infantry.txt -text
 res/cardsfolder/i/icatian_javelineers.txt svneol=native#text/plain
 res/cardsfolder/i/icatian_lieutenant.txt svneol=native#text/plain
 res/cardsfolder/i/icatian_moneychanger.txt svneol=native#text/plain
+res/cardsfolder/i/icatian_phalanx.txt -text
 res/cardsfolder/i/icatian_priest.txt svneol=native#text/plain
 res/cardsfolder/i/icatian_scout.txt svneol=native#text/plain
+res/cardsfolder/i/icatian_skirmishers.txt -text
 res/cardsfolder/i/icatian_store.txt svneol=native#text/plain
 res/cardsfolder/i/icatian_town.txt svneol=native#text/plain
 res/cardsfolder/i/ice_cage.txt svneol=native#text/plain
@@ -5623,6 +5649,7 @@ res/cardsfolder/j/journey_of_discovery.txt -text
 res/cardsfolder/j/journey_to_nowhere.txt svneol=native#text/plain
 res/cardsfolder/j/journeyers_kite.txt svneol=native#text/plain
 res/cardsfolder/j/joven.txt svneol=native#text/plain
+res/cardsfolder/j/jovens_ferrets.txt -text
 res/cardsfolder/j/jovens_tools.txt svneol=native#text/plain
 res/cardsfolder/j/jovial_evil.txt svneol=native#text/plain
 res/cardsfolder/j/joyous_respite.txt svneol=native#text/plain
@@ -5855,6 +5882,7 @@ res/cardsfolder/k/kithkin_daggerdare.txt svneol=native#text/plain
 res/cardsfolder/k/kithkin_greatheart.txt svneol=native#text/plain
 res/cardsfolder/k/kithkin_harbinger.txt svneol=native#text/plain
 res/cardsfolder/k/kithkin_healer.txt svneol=native#text/plain
+res/cardsfolder/k/kithkin_mourncaller.txt -text
 res/cardsfolder/k/kithkin_rabble.txt svneol=native#text/plain
 res/cardsfolder/k/kithkin_shielddare.txt svneol=native#text/plain
 res/cardsfolder/k/kithkin_spellduster.txt svneol=native#text/plain
@@ -5872,16 +5900,22 @@ res/cardsfolder/k/kitsune_riftwalker.txt svneol=native#text/plain
 res/cardsfolder/k/kiyomaro_first_to_stand.txt -text
 res/cardsfolder/k/kjeldoran_dead.txt svneol=native#text/plain
 res/cardsfolder/k/kjeldoran_elite_guard.txt -text
+res/cardsfolder/k/kjeldoran_escort.txt -text
 res/cardsfolder/k/kjeldoran_frostbeast.txt -text
 res/cardsfolder/k/kjeldoran_gargoyle.txt svneol=native#text/plain
 res/cardsfolder/k/kjeldoran_guard.txt -text
 res/cardsfolder/k/kjeldoran_home_guard.txt svneol=native#text/plain
 res/cardsfolder/k/kjeldoran_javelineer.txt svneol=native#text/plain
+res/cardsfolder/k/kjeldoran_knight.txt -text
 res/cardsfolder/k/kjeldoran_outpost.txt svneol=native#text/plain
 res/cardsfolder/k/kjeldoran_outrider.txt svneol=native#text/plain
+res/cardsfolder/k/kjeldoran_phalanx.txt -text
 res/cardsfolder/k/kjeldoran_pride.txt -text
 res/cardsfolder/k/kjeldoran_royal_guard.txt -text
+res/cardsfolder/k/kjeldoran_skycaptain.txt -text
+res/cardsfolder/k/kjeldoran_skyknight.txt -text
 res/cardsfolder/k/kjeldoran_war_cry.txt svneol=native#text/plain
+res/cardsfolder/k/kjeldoran_warrior.txt -text
 res/cardsfolder/k/knacksaw_clique.txt -text
 res/cardsfolder/k/knight_captain_of_eos.txt svneol=native#text/plain
 res/cardsfolder/k/knight_errant.txt svneol=native#text/plain
@@ -5905,6 +5939,7 @@ res/cardsfolder/k/knight_of_valor.txt svneol=native#text/plain
 res/cardsfolder/k/knight_watch.txt -text
 res/cardsfolder/k/knighthood.txt svneol=native#text/plain
 res/cardsfolder/k/knightly_valor.txt -text
+res/cardsfolder/k/knights_of_thorn.txt -text
 res/cardsfolder/k/knollspine_dragon.txt -text
 res/cardsfolder/k/knollspine_invocation.txt -text
 res/cardsfolder/k/knotvine_mystic.txt svneol=native#text/plain
@@ -6649,6 +6684,7 @@ res/cardsfolder/m/master_healer.txt svneol=native#text/plain
 res/cardsfolder/m/master_of_arms.txt -text
 res/cardsfolder/m/master_of_cruelties.txt -text
 res/cardsfolder/m/master_of_etherium.txt svneol=native#text/plain
+res/cardsfolder/m/master_of_the_hunt.txt -text
 res/cardsfolder/m/master_of_the_pearl_trident.txt -text
 res/cardsfolder/m/master_of_the_veil.txt -text
 res/cardsfolder/m/master_of_the_wild_hunt.txt svneol=native#text/plain
@@ -6762,6 +6798,7 @@ res/cardsfolder/m/merrow_wavebreakers.txt svneol=native#text/plain
 res/cardsfolder/m/merrow_witsniper.txt svneol=native#text/plain
 res/cardsfolder/m/mesa_enchantress.txt svneol=native#text/plain
 res/cardsfolder/m/mesa_falcon.txt svneol=native#text/plain
+res/cardsfolder/m/mesa_pegasus.txt -text
 res/cardsfolder/m/mesmeric_fiend.txt -text svneol=unset#text/plain
 res/cardsfolder/m/mesmeric_orb.txt svneol=native#text/plain
 res/cardsfolder/m/mesmeric_sliver.txt -text
@@ -6857,6 +6894,7 @@ res/cardsfolder/m/mindlash_sliver.txt svneol=native#text/plain
 res/cardsfolder/m/mindleech_mass.txt -text
 res/cardsfolder/m/mindless_automaton.txt svneol=native#text/plain
 res/cardsfolder/m/mindless_null.txt -text
+res/cardsfolder/m/mindlock_orb.txt -text
 res/cardsfolder/m/mindmoil.txt -text
 res/cardsfolder/m/minds_desire.txt svneol=native#text/plain
 res/cardsfolder/m/minds_eye.txt svneol=native#text/plain
@@ -7113,6 +7151,7 @@ res/cardsfolder/m/mothrider_samurai.txt svneol=native#text/plain
 res/cardsfolder/m/mountain.txt svneol=native#text/plain
 res/cardsfolder/m/mountain_bandit.txt svneol=native#text/plain
 res/cardsfolder/m/mountain_goat.txt svneol=native#text/plain
+res/cardsfolder/m/mountain_stronghold.txt -text
 res/cardsfolder/m/mountain_titan.txt -text svneol=unset#text/plain
 res/cardsfolder/m/mountain_valley.txt svneol=native#text/plain
 res/cardsfolder/m/mountain_yeti.txt svneol=native#text/plain
@@ -7247,6 +7286,7 @@ res/cardsfolder/n/nacre_talisman.txt svneol=native#text/plain
 res/cardsfolder/n/nafs_asp.txt -text
 res/cardsfolder/n/nagao_bound_by_honor.txt svneol=native#text/plain
 res/cardsfolder/n/nakaya_shade.txt -text
+res/cardsfolder/n/nalathni_dragon.txt -text
 res/cardsfolder/n/nameless_inversion.txt svneol=native#text/plain
 res/cardsfolder/n/nameless_one.txt svneol=native#text/plain
 res/cardsfolder/n/nameless_race.txt svneol=native#text/plain
@@ -7280,6 +7320,7 @@ res/cardsfolder/n/natural_order.txt svneol=native#text/plain
 res/cardsfolder/n/natural_selection.txt svneol=native#text/plain
 res/cardsfolder/n/natural_spring.txt svneol=native#text/plain
 res/cardsfolder/n/naturalize.txt svneol=native#text/plain
+res/cardsfolder/n/natures_blessing.txt -text
 res/cardsfolder/n/natures_chosen.txt svneol=native#text/plain
 res/cardsfolder/n/natures_claim.txt svneol=native#text/plain
 res/cardsfolder/n/natures_cloak.txt svneol=native#text/plain
@@ -7466,6 +7507,7 @@ res/cardsfolder/n/no_mercy.txt svneol=native#text/plain
 res/cardsfolder/n/no_rest_for_the_wicked.txt -text
 res/cardsfolder/n/nobilis_of_war.txt svneol=native#text/plain
 res/cardsfolder/n/noble_benefactor.txt svneol=native#text/plain
+res/cardsfolder/n/noble_elephant.txt -text
 res/cardsfolder/n/noble_hierarch.txt svneol=native#text/plain
 res/cardsfolder/n/noble_panther.txt svneol=native#text/plain
 res/cardsfolder/n/noble_purpose.txt svneol=native#text/plain
@@ -7859,6 +7901,7 @@ res/cardsfolder/p/path_of_angers_flame.txt svneol=native#text/plain
 res/cardsfolder/p/path_of_peace.txt svneol=native#text/plain
 res/cardsfolder/p/path_to_exile.txt svneol=native#text/plain
 res/cardsfolder/p/pathbreaker_wurm.txt -text
+res/cardsfolder/p/pathrazer_of_ulamog.txt -text
 res/cardsfolder/p/patriarchs_bidding.txt svneol=native#text/plain
 res/cardsfolder/p/patriarchs_desire.txt -text svneol=unset#text/plain
 res/cardsfolder/p/patricians_scorn.txt -text svneol=unset#text/plain
@@ -7988,6 +8031,7 @@ res/cardsfolder/p/phyrexian_battleflies.txt svneol=native#text/plain
 res/cardsfolder/p/phyrexian_bloodstock.txt svneol=native#text/plain
 res/cardsfolder/p/phyrexian_boon.txt svneol=native#text/plain
 res/cardsfolder/p/phyrexian_broodlings.txt svneol=native#text/plain
+res/cardsfolder/p/phyrexian_colossus.txt -text
 res/cardsfolder/p/phyrexian_crusader.txt svneol=native#text/plain
 res/cardsfolder/p/phyrexian_debaser.txt svneol=native#text/plain
 res/cardsfolder/p/phyrexian_defiler.txt svneol=native#text/plain
@@ -8047,6 +8091,7 @@ res/cardsfolder/p/pianna_nomad_captain.txt svneol=native#text/plain
 res/cardsfolder/p/pierce_strider.txt svneol=native#text/plain
 res/cardsfolder/p/piety.txt svneol=native#text/plain
 res/cardsfolder/p/piety_charm.txt -text
+res/cardsfolder/p/pikemen.txt -text
 res/cardsfolder/p/pilfered_plans.txt -text
 res/cardsfolder/p/pilgrim_of_justice.txt -text
 res/cardsfolder/p/pilgrim_of_virtue.txt -text
@@ -8339,6 +8384,7 @@ res/cardsfolder/p/puffer_extract.txt svneol=native#text/plain
 res/cardsfolder/p/pull_from_eternity.txt -text
 res/cardsfolder/p/pull_under.txt svneol=native#text/plain
 res/cardsfolder/p/pulling_teeth.txt svneol=native#text/plain
+res/cardsfolder/p/pulmonic_sliver.txt -text
 res/cardsfolder/p/pulsating_illusion.txt svneol=native#text/plain
 res/cardsfolder/p/pulse_of_the_dross.txt -text
 res/cardsfolder/p/pulse_of_the_fields.txt svneol=native#text/plain
@@ -8443,6 +8489,7 @@ res/cardsfolder/q/quicksilver_behemoth.txt svneol=native#text/plain
 res/cardsfolder/q/quicksilver_dagger.txt svneol=native#text/plain
 res/cardsfolder/q/quicksilver_gargantuan.txt svneol=native#text/plain
 res/cardsfolder/q/quicksilver_geyser.txt svneol=native#text/plain
+res/cardsfolder/q/quicksilver_sea.txt -text
 res/cardsfolder/q/quicksilver_wall.txt svneol=native#text/plain
 res/cardsfolder/q/quiet_disrepair.txt -text
 res/cardsfolder/q/quiet_purity.txt svneol=native#text/plain
@@ -8703,6 +8750,7 @@ res/cardsfolder/r/red_suns_zenith.txt svneol=native#text/plain
 res/cardsfolder/r/red_ward.txt svneol=native#text/plain
 res/cardsfolder/r/redeem.txt svneol=native#text/plain
 res/cardsfolder/r/redeem_the_lost.txt svneol=native#text/plain
+res/cardsfolder/r/redirect.txt -text
 res/cardsfolder/r/reduce_to_dreams.txt svneol=native#text/plain
 res/cardsfolder/r/redwood_treefolk.txt svneol=native#text/plain
 res/cardsfolder/r/reef_pirates.txt svneol=native#text/plain
@@ -8815,6 +8863,7 @@ res/cardsfolder/r/restless_dead.txt svneol=native#text/plain
 res/cardsfolder/r/restless_dreams.txt -text
 res/cardsfolder/r/restock.txt svneol=native#text/plain
 res/cardsfolder/r/restoration_angel.txt -text
+res/cardsfolder/r/restore_balance.txt -text
 res/cardsfolder/r/restore_the_peace.txt -text
 res/cardsfolder/r/restrain.txt -text
 res/cardsfolder/r/resurrection.txt svneol=native#text/plain
@@ -9450,6 +9499,7 @@ res/cardsfolder/s/sea_snidd.txt -text
 res/cardsfolder/s/sea_spirit.txt svneol=native#text/plain
 res/cardsfolder/s/sea_sprite.txt svneol=native#text/plain
 res/cardsfolder/s/seachrome_coast.txt svneol=native#text/plain
+res/cardsfolder/s/seafarers_quay.txt -text
 res/cardsfolder/s/seafloor_debris.txt svneol=native#text/plain
 res/cardsfolder/s/seahunter.txt svneol=native#text/plain
 res/cardsfolder/s/seal_of_cleansing.txt svneol=native#text/plain
@@ -9637,6 +9687,7 @@ res/cardsfolder/s/shades_form.txt svneol=native#text/plain
 res/cardsfolder/s/shadow_alley_denizen.txt -text
 res/cardsfolder/s/shadow_guildmage.txt svneol=native#text/plain
 res/cardsfolder/s/shadow_lance.txt svneol=native#text/plain
+res/cardsfolder/s/shadow_of_doubt.txt -text
 res/cardsfolder/s/shadow_rider.txt svneol=native#text/plain
 res/cardsfolder/s/shadow_rift.txt svneol=native#text/plain
 res/cardsfolder/s/shadow_slice.txt -text
@@ -9685,6 +9736,7 @@ res/cardsfolder/s/shatterskull_giant.txt svneol=native#text/plain
 res/cardsfolder/s/shatterstorm.txt svneol=native#text/plain
 res/cardsfolder/s/shauku_endbringer.txt svneol=native#text/plain
 res/cardsfolder/s/shaukus_minion.txt svneol=native#text/plain
+res/cardsfolder/s/shelkin_brownie.txt -text
 res/cardsfolder/s/shell_of_the_last_kappa.txt -text
 res/cardsfolder/s/shell_skulkin.txt svneol=native#text/plain
 res/cardsfolder/s/shelldock_isle.txt -text
@@ -9695,6 +9747,7 @@ res/cardsfolder/s/sheltering_word.txt -text
 res/cardsfolder/s/sheoldred_whispering_one.txt svneol=native#text/plain
 res/cardsfolder/s/shepherd_of_rot.txt svneol=native#text/plain
 res/cardsfolder/s/shepherd_of_the_lost.txt svneol=native#text/plain
+res/cardsfolder/s/shield_bearer.txt -text
 res/cardsfolder/s/shield_dancer.txt -text
 res/cardsfolder/s/shield_mate.txt svneol=native#text/plain
 res/cardsfolder/s/shield_of_duty_and_reason.txt svneol=native#text/plain
@@ -10211,6 +10264,7 @@ res/cardsfolder/s/soratami_mirror_mage.txt svneol=native#text/plain
 res/cardsfolder/s/soratami_rainshaper.txt svneol=native#text/plain
 res/cardsfolder/s/soratami_savant.txt svneol=native#text/plain
 res/cardsfolder/s/soratami_seer.txt -text
+res/cardsfolder/s/soraya_the_falconer.txt -text
 res/cardsfolder/s/sorcerers_strongbox.txt svneol=native#text/plain
 res/cardsfolder/s/sorceress_queen.txt svneol=native#text/plain
 res/cardsfolder/s/sorcerous_sight.txt svneol=native#text/plain
@@ -10334,6 +10388,7 @@ res/cardsfolder/s/spellgorger_barbarian.txt svneol=native#text/plain
 res/cardsfolder/s/spelljack.txt -text
 res/cardsfolder/s/spellshift.txt -text
 res/cardsfolder/s/spellshock.txt svneol=native#text/plain
+res/cardsfolder/s/spellskite.txt -text
 res/cardsfolder/s/spellstutter_sprite.txt svneol=native#text/plain
 res/cardsfolder/s/spelltithe_enforcer.txt -text
 res/cardsfolder/s/spelltwine.txt -text
@@ -11123,6 +11178,7 @@ res/cardsfolder/t/terashis_cry.txt svneol=native#text/plain
 res/cardsfolder/t/terashis_grasp.txt svneol=native#text/plain
 res/cardsfolder/t/terashis_verdict.txt svneol=native#text/plain
 res/cardsfolder/t/terastodon.txt -text
+res/cardsfolder/t/teremko_griffin.txt -text
 res/cardsfolder/t/terminal_moraine.txt svneol=native#text/plain
 res/cardsfolder/t/terminate.txt svneol=native#text/plain
 res/cardsfolder/t/terminus.txt -text
@@ -11355,6 +11411,7 @@ res/cardsfolder/t/tiger_claws.txt svneol=native#text/plain
 res/cardsfolder/t/tigereye_cameo.txt svneol=native#text/plain
 res/cardsfolder/t/tilling_treefolk.txt svneol=native#text/plain
 res/cardsfolder/t/timber_protector.txt svneol=native#text/plain
+res/cardsfolder/t/timber_wolves.txt -text
 res/cardsfolder/t/timberland_guide.txt -text
 res/cardsfolder/t/timberland_ruins.txt svneol=native#text/plain
 res/cardsfolder/t/timberline_ridge.txt svneol=native#text/plain
@@ -11409,6 +11466,7 @@ res/cardsfolder/t/tobias_andrion.txt svneol=native#text/plain
 res/cardsfolder/t/toil_to_renown.txt svneol=native#text/plain
 res/cardsfolder/t/toil_trouble.txt -text
 res/cardsfolder/t/toils_of_night_and_day.txt svneol=native#text/plain
+res/cardsfolder/t/tolaria.txt -text
 res/cardsfolder/t/tolaria_west.txt svneol=native#text/plain
 res/cardsfolder/t/tolarian_academy.txt svneol=native#text/plain
 res/cardsfolder/t/tolarian_drake.txt -text
@@ -11764,6 +11822,7 @@ res/cardsfolder/u/unforge.txt -text
 res/cardsfolder/u/unfulfilled_desires.txt svneol=native#text/plain
 res/cardsfolder/u/unhallowed_pact.txt -text
 res/cardsfolder/u/unhinge.txt svneol=native#text/plain
+res/cardsfolder/u/unholy_citadel.txt -text
 res/cardsfolder/u/unholy_grotto.txt svneol=native#text/plain
 res/cardsfolder/u/unholy_strength.txt svneol=native#text/plain
 res/cardsfolder/u/unified_strike.txt -text
@@ -11817,6 +11876,7 @@ res/cardsfolder/u/urborg_elf.txt svneol=native#text/plain
 res/cardsfolder/u/urborg_emissary.txt svneol=native#text/plain
 res/cardsfolder/u/urborg_justice.txt svneol=native#text/plain
 res/cardsfolder/u/urborg_mindsucker.txt svneol=native#text/plain
+res/cardsfolder/u/urborg_panther.txt -text
 res/cardsfolder/u/urborg_phantom.txt svneol=native#text/plain
 res/cardsfolder/u/urborg_shambler.txt svneol=native#text/plain
 res/cardsfolder/u/urborg_skeleton.txt svneol=native#text/plain
@@ -11832,9 +11892,11 @@ res/cardsfolder/u/ursapine.txt svneol=native#text/plain
 res/cardsfolder/u/ursine_fylgja.txt svneol=native#text/plain
 res/cardsfolder/u/urza.txt -text
 res/cardsfolder/u/urzas_armor.txt svneol=native#text/plain
+res/cardsfolder/u/urzas_avenger.txt -text
 res/cardsfolder/u/urzas_bauble.txt -text
 res/cardsfolder/u/urzas_blueprints.txt svneol=native#text/plain
 res/cardsfolder/u/urzas_chalice.txt svneol=native#text/plain
+res/cardsfolder/u/urzas_engine.txt -text
 res/cardsfolder/u/urzas_factory.txt svneol=native#text/plain
 res/cardsfolder/u/urzas_filter.txt -text
 res/cardsfolder/u/urzas_guilt.txt svneol=native#text/plain
@@ -12186,6 +12248,7 @@ res/cardsfolder/v/volt_charge.txt svneol=native#text/plain
 res/cardsfolder/v/voltaic_construct.txt svneol=native#text/plain
 res/cardsfolder/v/voltaic_key.txt svneol=native#text/plain
 res/cardsfolder/v/volunteer_militia.txt svneol=native#text/plain
+res/cardsfolder/v/volunteer_reserves.txt -text
 res/cardsfolder/v/voodoo_doll.txt svneol=native#text/plain
 res/cardsfolder/v/voracious_cobra.txt svneol=native#text/plain
 res/cardsfolder/v/voracious_dragon.txt svneol=native#text/plain
@@ -12272,6 +12335,8 @@ res/cardsfolder/w/wall_of_razors.txt svneol=native#text/plain
 res/cardsfolder/w/wall_of_resistance.txt svneol=native#text/plain
 res/cardsfolder/w/wall_of_reverence.txt svneol=native#text/plain
 res/cardsfolder/w/wall_of_roots.txt svneol=native#text/plain
+res/cardsfolder/w/wall_of_shards.txt -text
+res/cardsfolder/w/wall_of_shields.txt -text
 res/cardsfolder/w/wall_of_souls.txt svneol=native#text/plain
 res/cardsfolder/w/wall_of_spears.txt svneol=native#text/plain
 res/cardsfolder/w/wall_of_stone.txt svneol=native#text/plain
@@ -12308,6 +12373,7 @@ res/cardsfolder/w/war_barge.txt -text svneol=unset#text/plain
 res/cardsfolder/w/war_chariot.txt svneol=native#text/plain
 res/cardsfolder/w/war_dance.txt svneol=native#text/plain
 res/cardsfolder/w/war_elemental.txt -text
+res/cardsfolder/w/war_elephant.txt -text
 res/cardsfolder/w/war_falcon.txt -text
 res/cardsfolder/w/war_mammoth.txt svneol=native#text/plain
 res/cardsfolder/w/war_priest_of_thune.txt svneol=native#text/plain
@@ -12497,6 +12563,7 @@ res/cardsfolder/w/wild_nacatl.txt svneol=native#text/plain
 res/cardsfolder/w/wild_ox.txt svneol=native#text/plain
 res/cardsfolder/w/wild_pair.txt -text
 res/cardsfolder/w/wild_research.txt svneol=native#text/plain
+res/cardsfolder/w/wild_ricochet.txt -text
 res/cardsfolder/w/wild_swing.txt -text
 res/cardsfolder/w/wild_wurm.txt svneol=native#text/plain
 res/cardsfolder/w/wilderness_elemental.txt svneol=native#text/plain
@@ -13061,6 +13128,7 @@ res/quest/duels/Betty[!!-~]Rubble[!!-~]3.dck -text
 res/quest/duels/Black[!!-~]Flame[!!-~]3.dck -text
 res/quest/duels/Black[!!-~]Panther[!!-~]2.dck -text
 res/quest/duels/Blackbeard[!!-~]3.dck -text
+res/quest/duels/Blue[!!-~]Devil[!!-~]2.dck -text
 res/quest/duels/Boba[!!-~]Fett[!!-~]3.dck -text
 res/quest/duels/Boris[!!-~]Karloff[!!-~]3.dck -text
 res/quest/duels/Boromir[!!-~]2.dck -text
@@ -13120,6 +13188,7 @@ res/quest/duels/Dino[!!-~]4.dck -text
 res/quest/duels/Doc[!!-~]Holiday[!!-~]1.dck -text
 res/quest/duels/Doc[!!-~]Holiday[!!-~]2.dck -text
 res/quest/duels/Doc[!!-~]Holiday[!!-~]3.dck -text
+res/quest/duels/Doctor[!!-~]John[!!-~]Zoidberg[!!-~]3.dck -text
 res/quest/duels/Dogbert[!!-~]2.dck -text
 res/quest/duels/Doran[!!-~]3.dck -text
 res/quest/duels/Dr[!!-~]Doom[!!-~]3.dck -text
@@ -13209,6 +13278,7 @@ res/quest/duels/Hobbes[!!-~]4.dck -text
 res/quest/duels/Homer[!!-~]Simpson[!!-~]1.dck -text
 res/quest/duels/Homer[!!-~]Simpson[!!-~]2.dck -text
 res/quest/duels/Homer[!!-~]Simpson[!!-~]3.dck -text
+res/quest/duels/Hookah-Smoking[!!-~]Caterpillar[!!-~]2.dck -text
 res/quest/duels/Hugo[!!-~]Drax[!!-~]1.dck -text
 res/quest/duels/Hulk[!!-~]2.dck -text
 res/quest/duels/Iceman[!!-~]3.dck -text
@@ -13274,6 +13344,7 @@ res/quest/duels/Morpheus[!!-~]3.dck -text
 res/quest/duels/Mortivore[!!-~]3.dck -text
 res/quest/duels/Mr[!!-~]Slate[!!-~]2.dck -text
 res/quest/duels/Mr[!!-~]Slate[!!-~]3.dck -text
+res/quest/duels/Mystique[!!-~]2.dck -text
 res/quest/duels/Nagini[!!-~]2.dck -text
 res/quest/duels/Napoleon[!!-~]3.dck -text
 res/quest/duels/Ned[!!-~]Flanders[!!-~]1.dck -text
@@ -13923,10 +13994,13 @@ res/sound/white_land.wav -text
 res/sound/win_duel.wav -text
 src/main/config/Forge.icns -text
 src/main/config/backgroundImage.jpg -text svneol=unset#image/jpeg
+src/main/config/builder/create-dmg.builder -text
 src/main/config/create-dmg -text
+src/main/config/forge.command svneol=native#text/x-sh
 src/main/config/forge.ico -text svneol=unset#image/ico
 src/main/config/forge.sh svneol=native#text/x-sh
 src/main/config/forge_checks.xml svneol=native#text/xml
+src/main/config/support/dmg-license.py svneol=native#text/x-python
 src/main/config/support/template.applescript -text
 src/main/html/connectionTest.html -text
 src/main/html/css/core.css -text
@@ -13954,6 +14028,7 @@ src/main/java/forge/GameLog.java -text
 src/main/java/forge/GameLogEntry.java -text
 src/main/java/forge/GameLogEntryType.java -text
 src/main/java/forge/GameLogFormatter.java -text
+src/main/java/forge/ITargetable.java -text
 src/main/java/forge/ImageCache.java svneol=native#text/plain
 src/main/java/forge/ImageLoader.java -text
 src/main/java/forge/Singletons.java svneol=native#text/plain
@@ -13994,6 +14069,7 @@ src/main/java/forge/card/ability/AbilityApiBased.java -text
 src/main/java/forge/card/ability/AbilityFactory.java svneol=native#text/plain
 src/main/java/forge/card/ability/AbilityUtils.java -text
 src/main/java/forge/card/ability/ApiType.java -text
+src/main/java/forge/card/ability/SaTargetRountines.java -text
 src/main/java/forge/card/ability/SpellAbilityAi.java -text
 src/main/java/forge/card/ability/SpellAbilityEffect.java -text
 src/main/java/forge/card/ability/SpellApiBased.java -text
@@ -14003,6 +14079,7 @@ src/main/java/forge/card/ability/ai/AlwaysPlayAi.java -text
 src/main/java/forge/card/ability/ai/AnimateAi.java -text
 src/main/java/forge/card/ability/ai/AnimateAllAi.java -text
 src/main/java/forge/card/ability/ai/AttachAi.java -text
+src/main/java/forge/card/ability/ai/BalanceAi.java -text
 src/main/java/forge/card/ability/ai/BecomesBlockedAi.java -text
 src/main/java/forge/card/ability/ai/BondAi.java -text
 src/main/java/forge/card/ability/ai/CanPlayAsDrawbackAi.java -text
@@ -14104,6 +14181,7 @@ src/main/java/forge/card/ability/effects/AnimateAllEffect.java -text
 src/main/java/forge/card/ability/effects/AnimateEffect.java -text
 src/main/java/forge/card/ability/effects/AnimateEffectBase.java svneol=native#text/plain
 src/main/java/forge/card/ability/effects/AttachEffect.java -text
+src/main/java/forge/card/ability/effects/BalanceEffect.java -text
 src/main/java/forge/card/ability/effects/BecomesBlockedEffect.java -text
 src/main/java/forge/card/ability/effects/BondEffect.java -text
 src/main/java/forge/card/ability/effects/ChangeTargetsEffect.java -text
@@ -14219,6 +14297,7 @@ src/main/java/forge/card/cost/CostDraw.java -text
 src/main/java/forge/card/cost/CostExile.java -text
 src/main/java/forge/card/cost/CostExileAndPay.java -text
 src/main/java/forge/card/cost/CostExiledMoveToGrave.java -text
+src/main/java/forge/card/cost/CostGainControl.java -text
 src/main/java/forge/card/cost/CostGainLife.java -text
 src/main/java/forge/card/cost/CostMill.java -text
 src/main/java/forge/card/cost/CostPart.java -text
@@ -14250,6 +14329,7 @@ src/main/java/forge/card/mana/ManaCostShard.java -text
 src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain
 src/main/java/forge/card/mana/package-info.java svneol=native#text/plain
 src/main/java/forge/card/package-info.java svneol=native#text/plain
+src/main/java/forge/card/replacement/ReplaceCounter.java -text
 src/main/java/forge/card/replacement/ReplaceDamage.java -text
 src/main/java/forge/card/replacement/ReplaceDestroy.java -text
 src/main/java/forge/card/replacement/ReplaceDiscard.java -text
@@ -14281,8 +14361,8 @@ src/main/java/forge/card/spellability/SpellAbilityRestriction.java svneol=native
 src/main/java/forge/card/spellability/SpellAbilityStackInstance.java svneol=native#text/plain
 src/main/java/forge/card/spellability/SpellAbilityVariables.java svneol=native#text/plain
 src/main/java/forge/card/spellability/SpellPermanent.java svneol=native#text/plain
-src/main/java/forge/card/spellability/Target.java svneol=native#text/plain
 src/main/java/forge/card/spellability/TargetChoices.java svneol=native#text/plain
+src/main/java/forge/card/spellability/TargetRestrictions.java svneol=native#text/plain
 src/main/java/forge/card/spellability/TargetSelection.java svneol=native#text/plain
 src/main/java/forge/card/spellability/package-info.java svneol=native#text/plain
 src/main/java/forge/card/staticability/StaticAbility.java svneol=native#text/plain
@@ -14396,30 +14476,33 @@ src/main/java/forge/game/Match.java -text
 src/main/java/forge/game/PlanarDice.java -text
 src/main/java/forge/game/RegisteredPlayer.java -text
 src/main/java/forge/game/ai/AiAttackController.java svneol=native#text/plain
+src/main/java/forge/game/ai/AiBlockController.java svneol=native#text/plain
 src/main/java/forge/game/ai/AiController.java svneol=native#text/plain
 src/main/java/forge/game/ai/AiProfileUtil.java -text
 src/main/java/forge/game/ai/AiProps.java -text
 src/main/java/forge/game/ai/ComputerUtil.java svneol=native#text/plain
-src/main/java/forge/game/ai/ComputerUtilBlock.java svneol=native#text/plain
 src/main/java/forge/game/ai/ComputerUtilCard.java -text
 src/main/java/forge/game/ai/ComputerUtilCombat.java -text
 src/main/java/forge/game/ai/ComputerUtilCost.java -text
 src/main/java/forge/game/ai/ComputerUtilMana.java -text
+src/main/java/forge/game/combat/AttackingBand.java -text
+src/main/java/forge/game/combat/Combat.java svneol=native#text/plain
+src/main/java/forge/game/combat/CombatLki.java -text
+src/main/java/forge/game/combat/CombatUtil.java svneol=native#text/plain
 src/main/java/forge/game/event/GameEvent.java -text
 src/main/java/forge/game/event/GameEventAnteCardsSelected.java -text
 src/main/java/forge/game/event/GameEventAttackersDeclared.java -text
 src/main/java/forge/game/event/GameEventBlockerAssigned.java -text
 src/main/java/forge/game/event/GameEventBlockersDeclared.java -text
+src/main/java/forge/game/event/GameEventCardChangeZone.java -text
 src/main/java/forge/game/event/GameEventCardDamaged.java -text
 src/main/java/forge/game/event/GameEventCardDestroyed.java -text
-src/main/java/forge/game/event/GameEventCardDiscarded.java -text
 src/main/java/forge/game/event/GameEventCardEquipped.java -text
 src/main/java/forge/game/event/GameEventCardRegenerated.java -text
 src/main/java/forge/game/event/GameEventCardSacrificed.java -text
 src/main/java/forge/game/event/GameEventCardTapped.java -text
 src/main/java/forge/game/event/GameEventCounterAdded.java -text
 src/main/java/forge/game/event/GameEventCounterRemoved.java -text
-src/main/java/forge/game/event/GameEventDrawCard.java -text
 src/main/java/forge/game/event/GameEventFlipCoin.java -text
 src/main/java/forge/game/event/GameEventGameFinished.java -text
 src/main/java/forge/game/event/GameEventGameOutcome.java -text
@@ -14446,7 +14529,6 @@ src/main/java/forge/game/event/package-info.java -text
 src/main/java/forge/game/limited/BoosterDeckBuilder.java -text
 src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain
 src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain
-src/main/java/forge/game/limited/CCnt.java svneol=native#text/plain
 src/main/java/forge/game/limited/CardRankingComparator.java -text
 src/main/java/forge/game/limited/CustomLimited.java svneol=native#text/plain
 src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain
@@ -14460,10 +14542,6 @@ src/main/java/forge/game/limited/SealedCardPoolGenerator.java svneol=native#text
 src/main/java/forge/game/limited/SealedDeckBuilder.java svneol=native#text/plain
 src/main/java/forge/game/limited/package-info.java svneol=native#text/plain
 src/main/java/forge/game/package-info.java -text
-src/main/java/forge/game/phase/Cleanup.java -text
-src/main/java/forge/game/phase/Combat.java svneol=native#text/plain
-src/main/java/forge/game/phase/CombatUtil.java svneol=native#text/plain
-src/main/java/forge/game/phase/EndOfCombat.java svneol=native#text/plain
 src/main/java/forge/game/phase/EndOfTurn.java svneol=native#text/plain
 src/main/java/forge/game/phase/ExtraTurn.java -text
 src/main/java/forge/game/phase/Phase.java svneol=native#text/plain
@@ -14517,7 +14595,6 @@ src/main/java/forge/gui/UnsortedListModel.java -text
 src/main/java/forge/gui/WrapLayout.java -text
 src/main/java/forge/gui/deckeditor/CDeckEditorUI.java -text
 src/main/java/forge/gui/deckeditor/DeckImport.java -text
-src/main/java/forge/gui/deckeditor/MenuCommon.java svneol=native#text/plain
 src/main/java/forge/gui/deckeditor/SEditorIO.java -text
 src/main/java/forge/gui/deckeditor/SEditorUtil.java -text
 src/main/java/forge/gui/deckeditor/SFilterUtil.java -text
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
 #Wed Jul 27 18:40:11 EDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,15 +1,15 @@
-Forge Beta: 06-14-2013 ver 1.4.1
+Forge Beta: 06-28-2013 ver 1.4.2


-12819 cards in total.
+12886 cards in total.


 -------------
 Release Notes
 -------------

- Java 7 -
-The devs are discussing a plan to update the battlefield display code with Java FX 2.2 and this should help to improve a few things. Java FX 2.2 requires Java 7 so please update your Java runtime environment in the nearest future. At some point a new version of Forge will no longer run under Java 6.
+- Forge now requires Java 7 -
+Please update your Java runtime environment. At this point Forge versions 1.4.2 and above will no longer run under Java 6.


 - New M14 cards -
@@ -24,84 +24,85 @@ Sometimes people will decide that they do not like the changes that they made an
 Also use the mentioned measure if your match or deckeditor won't start - it would help in 90% of the cases.


- The AI Drafting has been improved -
-The AI evaluated the basic lands higher than anything else. Fixed. The AI would pick cards with RemAIDeck but only at a much lowered pick rate. For example the best pick in a 250 card set would become the 75th best pick, the 20th best pick would become the 95th and so on. Divided this factor by 3 (so the first pick would become the 25th pick). Please test whether this has improved the draft experience.
+- The Mac OS X application -
+At this time Forge now requires Java 7 and will no longer run under Java 6.
+
+Unfortunately, the Mac OS X builder that we were using does not support Java 7. We hope to find and to use a different Mac OS X builder in order to continue releasing a Mac OS bundled application like we have in the past.
+
+Currently, the windows/unix release of Forge includes a launcher file named "forge.command". Double click on the "forge.command" launcher command file and this will in turn launch the Forge jar file via the terminal application while increasing the Java heap space. This should be a temporary inconvenience.


 ---------
 New Cards
 ---------

-Amulet of Quoz
-Aphetto Dredging
-Archive Trap
-Battlefield Scrounger
-Chain Stasis
-Chancellor of the Annex
-Chisei, Heart of Oceans
-Choking Vines
-Cobra Trap
-Defensive Formation
-Dream Chisel
-Dream Leash
-Exiled Doomsayer
-Fossil Find
-Gemstone Caverns
-Grave Consequences
-Grimoire Thief
-Hankyu
-Hibernation's End
-Indentured Djinn
-Ion Storm
-Jester's Scepter
-Jetting Glasskite
-Jotun Grunt
-Kira, Great Glass Spinner
-Kithkin Armor
-Krark's Thumb
-Leashling
-Liquid Fire
-Martyr of Bones
-Master Warcraft
-Melee
-Minion of Leshrac
-Odric, Master Tactician
-Patron of the Akki
-Patron of the Kitsune
-Patron of the Moon
-Patron of the Nezumi
-Patron of the Orochi
-Penance
-Power Conduit
-Prowling Pangolin
-Psychic Vortex
-Research // Development
-Search for Survivors
-Shimmering Glasskite
-Spinning Darkness
-Summoning Trap
-Tainted Specter
-Teferi's Curse
-Temporary Truce
-Thelon's Chant
-Thought Lash
-Thran Turbine
-Tidal Influence
-Time and Tide
-Tourach's Chant
-Truce
-Uba Mask
-Void Maw
-
-
----------
-New Planes
----------
-
-Furnace Layer
-Kharasha Foothills
-Mimano
-Mirrored Depths
+Adventurers' Guildhouse
+Baton of Morale
+Battering Ram
+Beast Walkers
+Benalish Hero
+Benalish Infantry
+Bloodlord of Vaasgoth
+Camel
+Cathedral of Serra
+Cooperation
+Dark Sphere
+Darksteel Garrison
+Dire Wolves
+Djinn Illuminatus
+Errand of Duty
+Formation
+Fortified Area
+Gaea's Touch
+Goblin Flectomancer
+Gorilla Berserkers
+Guile
+Helm of Chatzuk
+Herald of Leshrac
+Icatian Infantry
+Icatian Phalanx
+Icatian Skirmishers
+Joven's Ferrets
+Kithkin Mourncaller
+Kjeldoran Escort
+Kjeldoran Knight
+Kjeldoran Phalanx
+Kjeldoran Skycaptain
+Kjeldoran Skyknight
+Kjeldoran Warrior
+Knights of Thorn
+Master of the Hunt
+Mesa Pegasus
+Mindlock Orb
+Mountain Stronghold
+Nalathni Dragon
+Nature's Blessing
+Noble Elephant
+Pathrazer of Ulamog
+Phyrexian Colossus
+Pikemen
+Pulmonic Sliver
+Quicksilver Sea
+Redirect
+Restore Balance
+Seafarer's Quay
+Shadow of Doubt
+Shelkin Brownie
+Shield Bearer
+Soraya the Falconer
+Spellskite
+Teremko Griffin
+Timber Wolves
+Tolaria
+Unholy Citadel
+Urborg Panther
+Urza's Avenger
+Urza's Engine
+Volunteer Reserves
+Wall of Shards
+Wall of Shields
+War Elephant
+Wild Ricochet


 --------------------
@@ -116,6 +117,7 @@ Awaken the Ancient
 Battle Sliver
 Blur Sliver
 Bonescythe Sliver
+Burning Earth
 Charging Grffin
 Corpse Hauler
 Dawnstrike Paladin
@@ -124,7 +126,9 @@ Devout Invocation
 Elvish Mystic
 Enlarge
 Fleshpulper Giant
+Garruk, Caller of Beasts
 Glimpse the Future
+Goblin Diplomats
 Grim Return
 Groundshaker Sliver
 Guardian of the Ages
@@ -137,6 +141,7 @@ Liliana's Reaver
 Marauding Maulhorn
 Master of Diversion
 Megantic Sliver
+Messenger Drake
 Molten Birth
 Ogre Battledriver
 Predatory Sliver
@@ -144,7 +149,10 @@ Primeval Bounty
 Regathan Firecat
 Ring of Three Wishes
 Rise of the Dark Realms
+Rumbling Baloth
 Scourge of Valkas
+Seacoast Drake
+Seismic Stomp
 Sentinel Sliver
 Seraph of the Sword
 Shadowborn Apostle
@@ -164,6 +172,7 @@ Undead Minotaur
 Vampire Warlord
 Vastwood Hydra
 Vial of Poison
+Warden of Evos Isle
 Windreader Sphinx
 Woodborn Behemoth
 Young Pyromancer
@@ -173,8 +182,6 @@ Young Pyromancer
 Known Issues
 ------------

-A small number of cards including Wall of Corpses, Abu Ja'far and others with a similar ability are not functional. The common issue here is actually that they check the blocker/attacker after being removed from the battlefield. Probably need to use LKI. Regular destroy/destroy all effects work just fine. The problem cards are caring about battlefield specific properties, that no longer apply when the base card is no longer on the battlefield.
-
 Several people have noticed that the cards displayed on the battlefield will fail to be displayed when the number of cards on the battlefield increases. Maximizing the human panel can help to re-display the cards.

 Some time was spent turning the static ETB triggers into the proper ETB replacement effects they should be, mainly to interact correctly with each other. This work is not yet finished. As a result there is currently some inconsistencies with "Enters the battlefield with counters" (Not incredibly noticeable).
@@ -182,8 +189,6 @@ Some time was spent turning the static ETB triggers into the proper ETB replacem
 A recent contribution to the code base should fix some of the bugs that people noticed with cloning type abilities. At this time there is one remaining issue that we hope will be addressed in the near future:
 Copies of cards that setup Zone Change triggers via addComesIntoPlayCommand and addLeavesPlayCommand will not function correctly.

-Forge is likely to be compatible with Java 7 at this time. Some people have used forge with Java 7 and have not reported any problems that are related to Java 7. If you would like to upgrade to Java 7 and have held off because of Forge then you may upgrade as we do not think that it will cause an incompatibility type of problem. We will continue to try to maintain compatibility with Java 6 for the foreseeable future.
-
 The Forge archive includes a readme.txt file and we ask that you spend a few minutes reading this file as it contains some information that may prove useful. We do tend to update this file at times and you should quickly read this file and look for new information for each and every new release. Thank you.

 The archive format used for the Forge distribution is ".tar.bz2". There are utilities for Windows, Mac OS and the various *nix's that can be used to extract/decompress these ".tar.bz2" archives. We recommend that you extract/decompress the Forge archive into a new and unused folder.
@@ -197,16 +202,15 @@ Contributors to This Release

 Agetian
 Asepetci
-Diogenes
+Dave
 Gos
-Hellfish
+jsv
 Marc
 Max
 Nordos
-RedDeckWins
-Sidereal
 Sloth
 Sol
+squee1968
 Swordshine
 Chris H

--- a/README.txt
+++ b/README.txt
@@ -401,6 +401,7 @@ Draw [*] - draw.wav - triggered when a player draws a card.
 Enchantment [*] - enchant.wav - triggered when an enchantment is played.
 EndOfTurn [*] - end_of_turn.wav - triggered at the end of turn.
 Equip [*] - equip.wav - triggered when an equipment is equipped.
+Exile - exile.wav - triggered when a card is exiled.
 FlipCoin [*] - flip_coin.wav - triggered when a coin is flipped.
 GreenLand [*] - green_land.wav - triggered when a land with the "G" mana ability is played.
 Instant [*] - instant.wav - triggered when an instant is played.
@@ -694,6 +695,10 @@ Targeting Overlay:
 Targeting arrows will now be shown for equipments equipping permanents currently under opponent's control (for those rare cases when e.g. an equipped creature gets Switcheroo'd for something else).


+- The AI Drafting has been improved -
+The AI evaluated the basic lands higher than anything else. Fixed. The AI would pick cards with RemAIDeck but only at a much lowered pick rate. For example the best pick in a 250 card set would become the 75th best pick, the 20th best pick would become the 95th and so on. Divided this factor by 3 (so the first pick would become the 25th pick). Please test whether this has improved the draft experience.
+
+
 Our Lawyers Made Us Do This:
 ----------------------------

--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
    <artifactId>forge</artifactId>
    <packaging>jar</packaging>
    <name>Forge</name>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
    <description>
        Forge lets you play the card game Magic: The Gathering against a computer opponent
        using all of the rules.
@@ -28,7 +28,7 @@
            ISO-8859-1
        </project.reporting.outputEncoding>
        <configSourceDirectory>src/main/config</configSourceDirectory>
-        <jettyVersion>8.1.10.v20130312</jettyVersion>
+        <jettyVersion>8.1.11.v20130520</jettyVersion>
    </properties>
    <developers>
        <developer>
@@ -153,9 +153,9 @@
    </licenses>

    <scm>
-        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.1</connection>
-        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.1</developerConnection>
-        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.4.1?repname=forge</url>
+        <connection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.2</connection>
+        <developerConnection>scm:svn:http://svn.slightlymagic.net/forge/tags/forge-1.4.2</developerConnection>
+        <url>http://svn.slightlymagic.net/websvn/listing.php/tags/forge-1.4.2?repname=forge</url>
    </scm>

    <prerequisites>
@@ -246,7 +246,7 @@

            <plugin>
                <artifactId>maven-release-plugin</artifactId>
-                <version>2.3.2</version><!--$NO-MVN-MAN-VER$-->
+                <version>2.4.1</version><!--$NO-MVN-MAN-VER$-->
                <configuration>
                    <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
                </configuration>
@@ -263,8 +263,8 @@
            </plugin>
            <plugin>
                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.4.1</version>
+                <artifactId>replacer</artifactId>
+                <version>1.5.2</version>
                <executions>
                    <execution>
                        <phase>package</phase>
@@ -274,8 +274,10 @@
                    </execution>
                </executions>
                <configuration>
-                    <file>${configSourceDirectory}/forge.sh</file>
-                    <outputFile>${project.build.directory}/forge.sh</outputFile>
+                    <basedir>${configSourceDirectory}</basedir>
+                    <filesToInclude>forge.sh, forge.command</filesToInclude>
+                    <outputBasedir>${project.build.directory}</outputBasedir>
+                    <outputDir>.</outputDir>
                    <regex>false</regex>
                    <replacements>
                        <replacement>
@@ -319,19 +321,9 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.0</version>
                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <compilerId>groovy-eclipse-compiler</compilerId>
-							      <!-- set verbose to be true if you want lots of uninteresting messages -->
-							      <!-- <verbose>true</verbose> -->
+                    <source>1.7</source>
+                    <target>1.7</target>
                </configuration>
-						    <dependencies>
-						      <dependency>
-						        <groupId>org.codehaus.groovy</groupId>
-						        <artifactId>groovy-eclipse-compiler</artifactId>
-						        <version>2.7.0-01</version>
-						      </dependency>
-						    </dependencies>
            </plugin>

            <plugin>
@@ -437,12 +429,12 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>2.8</version>
                </plugin>

                <plugin>
                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>2.4.1</version>
                </plugin>

                <plugin>
@@ -574,7 +566,7 @@

            <plugin>
                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.8</version>
                <reportSets>
                    <reportSet>
                        <reports>
@@ -624,7 +616,7 @@
                    <linkXRef>true</linkXRef>
                    <sourceEncoding>utf-8</sourceEncoding>
                    <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.6</targetJdk>
+                    <targetJdk>1.7</targetJdk>
                </configuration>
            </plugin>

@@ -708,7 +700,7 @@
        <dependency>
            <groupId>com.google.code.gson</groupId>
            <artifactId>gson</artifactId>
-            <version>2.2.3</version>
+            <version>2.2.4</version>
        </dependency>
        <dependency>
            <groupId>com.thoughtworks.xstream</groupId>
@@ -718,7 +710,7 @@
        <dependency>
            <groupId>org.testng</groupId>
            <artifactId>testng</artifactId>
-            <version>6.8.1</version>
+            <version>6.8.5</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -746,7 +738,13 @@
            <artifactId>minlog</artifactId>
            <version>1.2</version>
        </dependency>
-
+        <!--dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>javafx</artifactId>
+            <version>2.2</version>
+            <systemPath>${java.home}/lib/jfxrt.jar</systemPath>
+            <scope>system</scope>
+        </dependency-->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
@@ -814,7 +812,7 @@
                    <plugin>
                        <groupId>com.akathist.maven.plugins.launch4j</groupId>
                        <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>1.3.4</version>
+                        <version>1.5.2</version>
                        <executions>
                            <execution>
                                <id>l4j-gui</id>
@@ -835,7 +833,7 @@
                                        <preCp>anything</preCp>
                                    </classPath>
                                    <jre>
-                                        <minVersion>1.6.0</minVersion>
+                                        <minVersion>1.7.0</minVersion>
                                        <maxHeapSize>1024</maxHeapSize>
                                    </jre>
                                    <versionInfo>
@@ -880,6 +878,7 @@
                                        <mkdir dir="${project.build.directory}/${project.build.finalName}" />
                                        <copy todir="${project.build.directory}/${project.build.finalName}">
                                            <fileset dir="${project.build.directory}" includes="forge.sh" />
+                                            <fileset dir="${project.build.directory}" includes="forge.command" />
                                            <fileset dir="${basedir}" includes="forge.profile.properties.example" />
                                            <fileset dir="${basedir}" includes="LICENSE.txt" />
                                            <fileset dir="${basedir}" includes="README.txt" />
@@ -894,15 +893,18 @@
                                        <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
                                        <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
                                        <tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
                                            <tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
                                                <include name="forge.sh" />
+                                                <include name="forge.command" />
                                                <include name="forge.exe" />
                                            </tarfileset>
                                            <tarfileset dir="${project.build.directory}/${project.build.finalName}">
                                                <include name="**" />
                                                <exclude name="forge.sh" />
+                                                <exclude name="forge.command" />
                                                <exclude name="forge.exe" />
                                            </tarfileset>
                                        </tar>
--- a/res/blockdata/formats.txt
+++ b/res/blockdata/formats.txt
@@ -6,7 +6,7 @@ Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
 Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep

 [Modern]
-Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
+Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
 Banned:Ancestral Vision; Ancient Den; Bitterblossom; Blazing Shoal; Bloodbraid Elf; Chrome Mox; Cloudpost; Dark Depths; Dread Return; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Jace, the Mind Sculptor; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Seething Song; Sensei's Divining Top; Stoneforge Mystic; Skullclamp; Sword of the Meek; Tree of Tales; Umezawa's Jitte; Vault of Whispers; Wild Nacatl

 [Legacy]
--- a/res/cardsfolder/a/a_display_of_my_dark_power.txt
+++ b/res/cardsfolder/a/a_display_of_my_dark_power.txt
@@ -6,5 +6,4 @@ SVar:DarkEffect:AB$ Effect | Cost$ 0 | Name$ Dark Power Scheme | Duration$ Until
 SVar:DarkPower:Mode$ TapsForMana | ValidCard$ Land | Execute$ DarkMana | TriggerZones$ Command | Static$ True | TriggerDescription$ Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
 SVar:DarkMana:AB$ ManaReflected | Cost$ 0 | ColorOrType$ Type | Valid$ Defined.Triggered | ReflectProperty$ Produced | Defined$ TriggeredPlayer
 SVar:Picture:http://www.cardforge.org/fpics/lq_schemes/a_display_of_my_dark_power.jpg
-Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
-SetInfo:ARC Common
+Oracle:When you set this scheme in motion, until your next turn, whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
--- a/res/cardsfolder/a/abandon_hope.txt
+++ b/res/cardsfolder/a/abandon_hope.txt
@@ -5,5 +5,4 @@ A:SP$ Discard | Cost$ X 1 B Discard<X/Card/card> | ValidTgts$ Opponent | Mode$ R
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandon_hope.jpg
-Oracle:As an additional cost to cast Abandon Hope, discard X cards.\nLook at target opponent's hand and choose X cards from it. That player discards those cards.
-SetInfo:TMP Uncommon
+Oracle:As an additional cost to cast Abandon Hope, discard X cards.\nLook at target opponent's hand and choose X cards from it. That player discards those cards.
--- a/res/cardsfolder/a/abandoned_outpost.txt
+++ b/res/cardsfolder/a/abandoned_outpost.txt
@@ -5,5 +5,4 @@ A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abandoned_outpost.jpg
-Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
-SetInfo:ODY Common
+Oracle:Abandoned Outpost enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\n{T}, Sacrifice Abandoned Outpost: Add one mana of any color to your mana pool.
--- a/res/cardsfolder/a/abattoir_ghoul.txt
+++ b/res/cardsfolder/a/abattoir_ghoul.txt
@@ -7,5 +7,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TriggeredCard$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abattoir_ghoul.jpg
-Oracle:First strike\nWhenever a creature dealt damage by Abattoir Ghoul this turn dies, you gain life equal to that creature's toughness.
-SetInfo:ISD Uncommon
+Oracle:First strike\nWhenever a creature dealt damage by Abattoir Ghoul this turn dies, you gain life equal to that creature's toughness.
--- a/res/cardsfolder/a/abbey_gargoyles.txt
+++ b/res/cardsfolder/a/abbey_gargoyles.txt
@@ -5,6 +5,4 @@ PT:3/4
 K:Flying
 K:Protection from red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_gargoyles.jpg
-Oracle:Flying, protection from red
-SetInfo:5ED Uncommon
-SetInfo:HML Uncommon
+Oracle:Flying, protection from red
--- a/res/cardsfolder/a/abbey_griffin.txt
+++ b/res/cardsfolder/a/abbey_griffin.txt
@@ -5,5 +5,4 @@ PT:2/2
 K:Flying
 K:Vigilance
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_griffin.jpg
-Oracle:Flying, vigilance
-SetInfo:ISD Common
+Oracle:Flying, vigilance
--- a/res/cardsfolder/a/abbey_matron.txt
+++ b/res/cardsfolder/a/abbey_matron.txt
@@ -4,5 +4,4 @@ Types:Creature Human Cleric
 PT:1/3
 A:AB$ Pump | Cost$ W T | NumDef$ +3 | SpellDescription$ CARDNAME gets +0/+3 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abbey_matron.jpg
-Oracle:{W}, {T}: Abbey Matron gets +0/+3 until end of turn.
-SetInfo:HML Common x2
+Oracle:{W}, {T}: Abbey Matron gets +0/+3 until end of turn.
--- a/res/cardsfolder/a/abduction.txt
+++ b/res/cardsfolder/a/abduction.txt
@@ -10,6 +10,4 @@ T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destina
 SVar:TrigReturnOwner:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abduction.jpg
-Oracle:Enchant creature\nWhen Abduction enters the battlefield, untap enchanted creature.\nYou control enchanted creature.\nWhen enchanted creature dies, return that card to the battlefield under its owner's control.
-SetInfo:WTH Uncommon
-SetInfo:6ED Uncommon
+Oracle:Enchant creature\nWhen Abduction enters the battlefield, untap enchanted creature.\nYou control enchanted creature.\nWhen enchanted creature dies, return that card to the battlefield under its owner's control.
--- a/res/cardsfolder/a/abeyance.txt
+++ b/res/cardsfolder/a/abeyance.txt
@@ -4,7 +4,6 @@ Types:Instant
 A:SP$ Effect | Cost$ 1 W | ValidTgts$ Player | Name$ Abeyance Effect | StaticAbilities$ STCantBeCast,STCantBeActivated | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
 SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ Player.IsRemembered | EffectZone$ Command | Description$ Target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
 SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | Activator$ Player.IsRemembered | EffectZone$ Command | NonMana$ True
-SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abeyance.jpg
-Oracle:Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.\nDraw a card.
-SetInfo:WTH Rare
+Oracle:Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.\nDraw a card.
--- a/res/cardsfolder/a/abjure.txt
+++ b/res/cardsfolder/a/abjure.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Counter | Cost$ U Sac<1/Permanent.Blue/blue permanent> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abjure.jpg
-Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
-SetInfo:WTH Common
+Oracle:As an additional cost to cast Abjure, sacrifice a blue permanent.\nCounter target spell.
--- a/res/cardsfolder/a/abolish.txt
+++ b/res/cardsfolder/a/abolish.txt
@@ -4,6 +4,4 @@ Types:Instant
 A:SP$ Destroy | Cost$ 1 W W | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:AltCost:Cost$ Discard<1/Plains>
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abolish.jpg
-Oracle:You may discard a Plains card rather than pay Abolish's mana cost.\nDestroy target artifact or enchantment.
-SetInfo:PCY Uncommon
-SetInfo:DDF Uncommon
+Oracle:You may discard a Plains card rather than pay Abolish's mana cost.\nDestroy target artifact or enchantment.
--- a/res/cardsfolder/a/abomination.txt
+++ b/res/cardsfolder/a/abomination.txt
@@ -9,6 +9,4 @@ SVar:DelTrigBlocker:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execu
 SVar:TrigDestroyBlocked:AB$ Destroy | Cost$ 0 | Defined$ TriggeredAttacker
 SVar:TrigDestroyBlocker:AB$ Destroy | Cost$ 0 | Defined$ TriggeredBlocker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
-Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
-SetInfo:LEG Uncommon
-SetInfo:4ED Uncommon
+Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
--- a/res/cardsfolder/a/aboroth.txt
+++ b/res/cardsfolder/a/aboroth.txt
@@ -4,5 +4,4 @@ Types:Creature Elemental
 PT:9/9
 K:Cumulative upkeep:AddCounter<1/M1M1>:Put a -1/-1 counter on CARDNAME.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboroth.jpg
-Oracle:Cumulative upkeep-Put a -1/-1 counter on Aboroth. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
-SetInfo:WTH Rare
+Oracle:Cumulative upkeep-Put a -1/-1 counter on Aboroth. (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)
--- a/res/cardsfolder/a/aboshan_cephalid_emperor.txt
+++ b/res/cardsfolder/a/aboshan_cephalid_emperor.txt
@@ -5,5 +5,4 @@ PT:3/3
 A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
 A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshan_cephalid_emperor.jpg
-Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
-SetInfo:ODY Rare
+Oracle:Tap an untapped Cephalid you control: Tap target permanent.\n{U}{U}{U}: Tap all creatures without flying.
--- a/res/cardsfolder/a/aboshans_desire.txt
+++ b/res/cardsfolder/a/aboshans_desire.txt
@@ -6,5 +6,4 @@ A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | Description$ Enchanted creature has flying.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Shroud | Condition$ Threshold | Description$ Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aboshans_desire.jpg
-Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
-SetInfo:ODY Common
+Oracle:Enchant creature\nEnchanted creature has flying.\nThreshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. (It can't be the target of spells or abilities.)
--- a/res/cardsfolder/a/about_face.txt
+++ b/res/cardsfolder/a/about_face.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch target creature's power and toughness until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/about_face.jpg
-Oracle:Switch target creature's power and toughness until end of turn.
-SetInfo:ULG Common
+Oracle:Switch target creature's power and toughness until end of turn.
--- a/res/cardsfolder/a/abrupt_decay.txt
+++ b/res/cardsfolder/a/abrupt_decay.txt
@@ -4,5 +4,4 @@ Types:Instant
 K:CARDNAME can't be countered.
 A:SP$ Destroy | Cost$ B G | ValidTgts$ Permanent.nonLand+cmcLE3 | TgtPrompt$ Select target nonland permanent with converted mana cost 3 or less | SpellDescription$ Destroy target nonland permanent with converted mana cost 3 or less.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abrupt_decay.jpg
-Oracle:Abrupt Decay can't be countered by spells or abilities.\nDestroy target nonland permanent with converted mana cost 3 or less.
-SetInfo:RTR Rare
+Oracle:Abrupt Decay can't be countered by spells or abilities.\nDestroy target nonland permanent with converted mana cost 3 or less.
--- a/res/cardsfolder/a/absolute_grace.txt
+++ b/res/cardsfolder/a/absolute_grace.txt
@@ -5,5 +5,4 @@ S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from black | De
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_grace.jpg
-Oracle:All creatures have protection from black.
-SetInfo:USG Uncommon
+Oracle:All creatures have protection from black.
--- a/res/cardsfolder/a/absolute_law.txt
+++ b/res/cardsfolder/a/absolute_law.txt
@@ -5,5 +5,4 @@ S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Protection from red | Desc
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absolute_law.jpg
-Oracle:All creatures have protection from red.
-SetInfo:USG Uncommon
+Oracle:All creatures have protection from red.
--- a/res/cardsfolder/a/absolver_thrull.txt
+++ b/res/cardsfolder/a/absolver_thrull.txt
@@ -5,5 +5,4 @@ PT:2/3
 K:Haunt:TrigDestroy:Destroy target enchantment.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment
 Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Absolver Thrull enters the battlefield or the creature it haunts dies, destroy target enchantment.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/absolver_thrull.jpg
-SetInfo:GPT Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/absolver_thrull.jpg
--- a/res/cardsfolder/a/absorb.txt
+++ b/res/cardsfolder/a/absorb.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Counter | Cost$ W U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell. You gain 3 life. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
 SVar:Picture:http://resources.wizards.com/magic/cards/in/en-us/card23155.jpg
-Oracle:Counter target spell. You gain 3 life.
-SetInfo:INV Rare
+Oracle:Counter target spell. You gain 3 life.
--- a/res/cardsfolder/a/absorb_vis.txt
+++ b/res/cardsfolder/a/absorb_vis.txt
@@ -5,6 +5,4 @@ K:TypeCycling:Basic:1 B
 A:SP$ LoseLife | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 4 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 4 life and you gain 4 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/absorb_vis.jpg
-Oracle:Target player loses 4 life and you gain 4 life.\nBasic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
-SetInfo:DDK Common
-SetInfo:CFX Common
+Oracle:Target player loses 4 life and you gain 4 life.\nBasic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
--- a/res/cardsfolder/a/abu_jafar.txt
+++ b/res/cardsfolder/a/abu_jafar.txt
@@ -5,6 +5,4 @@ PT:0/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
-Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
-SetInfo:CHR Uncommon
-SetInfo:ARN Uncommon
+Oracle:When Abu Ja'far dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
--- a/res/cardsfolder/a/abuna_acolyte.txt
+++ b/res/cardsfolder/a/abuna_acolyte.txt
@@ -5,5 +5,4 @@ PT:1/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target creature or player this turn.
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature.Artifact | Amount$ 2 | TgtPrompt$ Select target artifact creature | SpellDescription$ Prevent the next 2 damage that would be dealt to target artifact creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abuna_acolyte.jpg
-Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
-SetInfo:SOM Uncommon
+Oracle:{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.\n{T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
--- a/res/cardsfolder/a/abunas_chant.txt
+++ b/res/cardsfolder/a/abunas_chant.txt
@@ -7,5 +7,4 @@ A:SP$ GainLife | Cost$ 5 W | PrecostDesc$ Entwine | CostDesc$ 2 | LifeAmount$ 5
 SVar:DBPreventDamage:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
-Oracle:Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
-SetInfo:5DN Common
+Oracle:Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)
--- a/res/cardsfolder/a/abundance.txt
+++ b/res/cardsfolder/a/abundance.txt
@@ -7,6 +7,4 @@ SVar:DigLand:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | FoundDes
 SVar:DigNonland:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ nonLand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundance.jpg
-Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
-SetInfo:10E Rare
-SetInfo:USG Rare
+Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
--- a/res/cardsfolder/a/abundant_growth.txt
+++ b/res/cardsfolder/a/abundant_growth.txt
@@ -4,9 +4,8 @@ Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
-SVar:FreeCard:DB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:FreeCard:DB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "T: Add one mana of any color to your mana pool."
 SVar:AbundantGrowthTap:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundant_growth.jpg
-Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
-SetInfo:AVR Common
+Oracle:Enchant land\nWhen Abundant Growth enters the battlefield, draw a card.\nEnchanted land has "{T}: Add one mana of any color to your mana pool."
--- a/res/cardsfolder/a/abyssal_gatekeeper.txt
+++ b/res/cardsfolder/a/abyssal_gatekeeper.txt
@@ -5,6 +5,4 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player sacrifices a creature.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ Each
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_gatekeeper.jpg
-Oracle:When Abyssal Gatekeeper dies, each player sacrifices a creature.
-SetInfo:DDC Common
-SetInfo:WTH Common
+Oracle:When Abyssal Gatekeeper dies, each player sacrifices a creature.
--- a/res/cardsfolder/a/abyssal_horror.txt
+++ b/res/cardsfolder/a/abyssal_horror.txt
@@ -4,9 +4,6 @@ Types:Creature Horror
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
-SVar:TrigDiscard:DB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
+SVar:TrigDiscard:DB$ Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg
-Oracle:Flying\nWhen Abyssal Horror enters the battlefield, target player discards two cards.
-SetInfo:S99 Rare
-SetInfo:7ED Rare
-SetInfo:USG Rare
+Oracle:Flying\nWhen Abyssal Horror enters the battlefield, target player discards two cards.
--- a/res/cardsfolder/a/abyssal_hunter.txt
+++ b/res/cardsfolder/a/abyssal_hunter.txt
@@ -6,6 +6,4 @@ A:AB$ DealDamage | Cost$ B T | ValidTgts$ Creature | TgtPrompt$ Select target cr
 SVar:DBTap:DB$ Tap | Defined$ Targeted
 SVar:X:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_hunter.jpg
-Oracle:{B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
-SetInfo:MIR Rare
-SetInfo:6ED Rare
+Oracle:{B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
--- a/res/cardsfolder/a/abyssal_nightstalker.txt
+++ b/res/cardsfolder/a/abyssal_nightstalker.txt
@@ -5,5 +5,4 @@ PT:2/2
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDiscards | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player discards a card.
 SVar:TrigDiscards:AB$ Discard | Cost$ 0 | Defined$ DefendingPlayer | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://serv4.tcgimages.eu/img/cards/Portal_Second_Age/abyssal_nightstalker.jpg
-Oracle:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
-SetInfo:PO2 Uncommon
+Oracle:Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
--- a/res/cardsfolder/a/abyssal_nocturnus.txt
+++ b/res/cardsfolder/a/abyssal_nocturnus.txt
@@ -5,5 +5,4 @@ PT:2/2
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever an opponent discards a card, CARDNAME gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | KW$ Fear
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_nocturnus.jpg
-Oracle:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
-SetInfo:GPT Rare
+Oracle:Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
--- a/res/cardsfolder/a/abyssal_persecutor.txt
+++ b/res/cardsfolder/a/abyssal_persecutor.txt
@@ -8,5 +8,4 @@ S:Mode$ Continuous | Affected$ You | AddKeyword$ You can't win the game. | Descr
 S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ You can't lose the game. | Description$ Your opponents can't lose the game.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_persecutor.jpg
-Oracle:Flying, trample\nYou can't win the game and your opponents can't lose the game.
-SetInfo:WWK Mythic
+Oracle:Flying, trample\nYou can't win the game and your opponents can't lose the game.
--- a/res/cardsfolder/a/abyssal_specter.txt
+++ b/res/cardsfolder/a/abyssal_specter.txt
@@ -6,10 +6,4 @@ K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player discards a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abyssal_specter.jpg
-Oracle:Flying\nWhenever Abyssal Specter deals damage to a player, that player discards a card.
-SetInfo:8ED Uncommon
-SetInfo:7ED Uncommon
-SetInfo:6ED Uncommon
-SetInfo:5ED Uncommon
-SetInfo:ICE Uncommon
-SetInfo:DDC Uncommon
+Oracle:Flying\nWhenever Abyssal Specter deals damage to a player, that player discards a card.
--- a/res/cardsfolder/a/academy_at_tolaria_west.txt
+++ b/res/cardsfolder/a/academy_at_tolaria_west.txt
@@ -6,5 +6,4 @@ SVar:AcademicDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 7
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll Chaos, discard your hand.
 SVar:RolledChaos:AB$ Discard | Cost$ 0 | Mode$ Hand | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_at_tolaria_west.jpg
-Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever you roll {C}, discard your hand.
-SetInfo:HOP Common
+Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever you roll {C}, discard your hand.
--- a/res/cardsfolder/a/academy_rector.txt
+++ b/res/cardsfolder/a/academy_rector.txt
@@ -9,5 +9,4 @@ SVar:SacMe:4
 SVar:RemRandomDeck:True
 DeckNeeds:Type$Enchantment
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_rector.jpg
-Oracle:When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
-SetInfo:UDS Rare
+Oracle:When Academy Rector dies, you may exile it. If you do, search your library for an enchantment card, put that card onto the battlefield, then shuffle your library.
--- a/res/cardsfolder/a/academy_researchers.txt
+++ b/res/cardsfolder/a/academy_researchers.txt
@@ -5,6 +5,4 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Aura.CanEnchantSource | AttachedTo$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_researchers.jpg
-Oracle:When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
-SetInfo:10E Uncommon
-SetInfo:USG Uncommon
+Oracle:When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
--- a/res/cardsfolder/a/academy_ruins.txt
+++ b/res/cardsfolder/a/academy_ruins.txt
@@ -4,5 +4,4 @@ Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ ChangeZone | Cost$ 1 U T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/academy_ruins.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
-SetInfo:TSP Rare
+Oracle:{T}: Add {1} to your mana pool.\n{1}{U}, {T}: Put target artifact card from your graveyard on top of your library.
--- a/res/cardsfolder/a/accelerate.txt
+++ b/res/cardsfolder/a/accelerate.txt
@@ -2,7 +2,6 @@ Name:Accelerate
 ManaCost:1 R
 Types:Instant
 A:SP$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SubAbility$ DBDraw | SpellDescription$ Target creature gains haste until end of turn.
-SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerate.jpg
-Oracle:Target creature gains haste until end of turn.\nDraw a card.
-SetInfo:TOR Common
+Oracle:Target creature gains haste until end of turn.\nDraw a card.
--- a/res/cardsfolder/a/accelerated_mutation.txt
+++ b/res/cardsfolder/a/accelerated_mutation.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Pump | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | References$ X | SpellDescription$ Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
 SVar:X:Count$MaxCMCYouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accelerated_mutation.jpg
-Oracle:Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
-SetInfo:SCG Common
+Oracle:Target creature gets +X/+X until end of turn, where X is the highest converted mana cost among permanents you control.
--- a/res/cardsfolder/a/acceptable_losses.txt
+++ b/res/cardsfolder/a/acceptable_losses.txt
@@ -3,5 +3,4 @@ ManaCost:3 R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 R Discard<1/Random> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acceptable_losses.jpg
-Oracle:As an additional cost to cast Acceptable Losses, discard a card at random.\nAcceptable Losses deals 5 damage to target creature.
-SetInfo:ODY Common
+Oracle:As an additional cost to cast Acceptable Losses, discard a card at random.\nAcceptable Losses deals 5 damage to target creature.
--- a/res/cardsfolder/a/accorder_paladin.txt
+++ b/res/cardsfolder/a/accorder_paladin.txt
@@ -5,5 +5,4 @@ PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigBattleCry | TriggerDescription$ Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
 SVar:TrigBattleCry:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.attacking+Other | NumAtt$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorder_paladin.jpg
-Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
-SetInfo:MBS Uncommon
+Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)
--- a/res/cardsfolder/a/accorders_shield.txt
+++ b/res/cardsfolder/a/accorders_shield.txt
@@ -4,5 +4,4 @@ Types:Artifact Equipment
 K:Equip 3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Equipped creature gets +0/+3 and has vigilance.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accorders_shield.jpg
-Oracle:Equipped creature gets +0/+3 and has vigilance.\nEquip {3}
-SetInfo:SOM Common
+Oracle:Equipped creature gets +0/+3 and has vigilance.\nEquip {3}
--- a/res/cardsfolder/a/accumulated_knowledge.txt
+++ b/res/cardsfolder/a/accumulated_knowledge.txt
@@ -2,8 +2,7 @@ Name:Accumulated Knowledge
 ManaCost:1 U
 Types:Instant
 A:SP$ Draw | Cost$ 1 U | Defined$ You | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ Draw a card, then draw cards equal to the number of cards named CARDNAME in all graveyards.
-SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ X | References$ X
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
 SVar:X:Count$NamedInAllYards.Accumulated Knowledge
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accumulated_knowledge.jpg
-Oracle:Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
-SetInfo:NMS Common
+Oracle:Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
--- a/res/cardsfolder/a/accursed_centaur.txt
+++ b/res/cardsfolder/a/accursed_centaur.txt
@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ You | SacValid$ Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/accursed_centaur.jpg
-Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
-SetInfo:ONS Common
+Oracle:When Accursed Centaur enters the battlefield, sacrifice a creature.
--- a/res/cardsfolder/a/acid_rain.txt
+++ b/res/cardsfolder/a/acid_rain.txt
@@ -4,5 +4,4 @@ Types:Sorcery
 A:SP$ DestroyAll | Cost$ 3 U | ValidCards$ Forest | SpellDescription$ Destroy all Forests.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_rain.jpg
-Oracle:Destroy all Forests.
-SetInfo:LEG Rare
+Oracle:Destroy all Forests.
--- a/res/cardsfolder/a/acid_web_spider.txt
+++ b/res/cardsfolder/a/acid_web_spider.txt
@@ -4,8 +4,7 @@ Types:Creature Spider
 PT:3/5
 K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target Equipment.
-SVar:TrigDestroy:DB$Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment.
+SVar:TrigDestroy:DB$ Destroy | Cost$ 0 | ValidTgts$ Equipment | TgtPrompt$ Choose target equipment.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acid_web_spider.jpg
-Oracle:Reach\nWhen Acid Web Spider enters the battlefield, you may destroy target Equipment.
-SetInfo:SOM Uncommon
+Oracle:Reach\nWhen Acid Web Spider enters the battlefield, you may destroy target Equipment.
--- a/res/cardsfolder/a/acidic_dagger.txt
+++ b/res/cardsfolder/a/acidic_dagger.txt
@@ -9,5 +9,4 @@ SVar:TrigSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_dagger.jpg
-Oracle:{4}, {T}: Whenever target creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger. Activate this ability only before blockers are declared.
-SetInfo:MIR Rare
+Oracle:{4}, {T}: Whenever target creature deals combat damage to a non-Wall creature this turn, destroy that non-Wall creature. When the targeted creature leaves the battlefield this turn, sacrifice Acidic Dagger. Activate this ability only before blockers are declared.
--- a/res/cardsfolder/a/acidic_slime.txt
+++ b/res/cardsfolder/a/acidic_slime.txt
@@ -4,12 +4,7 @@ Types:Creature Ooze
 PT:2/2
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact, enchantment, or land.
-SVar:TrigDestroy:DB$Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_slime.jpg
-Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
-SetInfo:M11 Uncommon
-SetInfo:M10 Uncommon
-SetInfo:M12 Uncommon
-SetInfo:COM Uncommon
-SetInfo:M13 Uncommon
+Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
--- a/res/cardsfolder/a/acidic_sliver.txt
+++ b/res/cardsfolder/a/acidic_sliver.txt
@@ -6,6 +6,4 @@ S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Damage | Description$ All Sl
 SVar:Damage:AB$DealDamage | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:BuffedBy:Sliver
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_sliver.jpg
-Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
-SetInfo:H09 Uncommon
-SetInfo:STH Uncommon
+Oracle:All Slivers have "{2}, Sacrifice this permanent: This permanent deals 2 damage to target creature or player."
--- a/res/cardsfolder/a/acidic_soil.txt
+++ b/res/cardsfolder/a/acidic_soil.txt
@@ -7,5 +7,4 @@ SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:AIPlayForSub:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg
-Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
-SetInfo:USG Uncommon
+Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
--- a/res/cardsfolder/a/acolyte_of_xathrid.txt
+++ b/res/cardsfolder/a/acolyte_of_xathrid.txt
@@ -4,5 +4,4 @@ Types:Creature Human Cleric
 PT:0/1
 A:AB$ LoseLife | Cost$ 1 B T | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SpellDescription$ Target player loses 1 life.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acolyte_of_xathrid.jpg
-Oracle:{1}{B}, {T}: Target player loses 1 life.
-SetInfo:M10 Common
+Oracle:{1}{B}, {T}: Target player loses 1 life.
--- a/res/cardsfolder/a/acorn_catapult.txt
+++ b/res/cardsfolder/a/acorn_catapult.txt
@@ -6,5 +6,4 @@ SVar:SquirrelTokenCtrl:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenT
 SVar:SquirrelTokenPlayer:DB$ Token | TokenAmount$ 1 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ TargetedController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Creature | ConditionCompare$ GE1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_catapult.jpg
-Oracle:{1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
-SetInfo:COM Rare
+Oracle:{1}, {T}: Acorn Catapult deals 1 damage to target creature or player. That creature's controller or that player puts a 1/1 green Squirrel creature token onto the battlefield.
--- a/res/cardsfolder/a/acorn_harvest.txt
+++ b/res/cardsfolder/a/acorn_harvest.txt
@@ -4,5 +4,4 @@ Types:Sorcery
 K:Flashback 1 G PayLife<3>
 A:SP$ Token | Cost$ 3 G | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put two 1/1 green Squirrel creature tokens onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_harvest.jpg
-Oracle:Put two 1/1 green Squirrel creature tokens onto the battlefield.\nFlashback-{1}{G}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
-SetInfo:TOR Common
+Oracle:Put two 1/1 green Squirrel creature tokens onto the battlefield.\nFlashback-{1}{G}, Pay 3 life. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
--- a/res/cardsfolder/a/acquire.txt
+++ b/res/cardsfolder/a/acquire.txt
@@ -3,5 +3,4 @@ ManaCost:3 U U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 U U | Origin$ Library | Destination$ Battlefield | ValidTgts$ Opponent | ChangeType$ Artifact | ChangeNum$ 1 | GainControl$ True | IsCurse$ True | StackDescription$ SpellDescription | SpellDescription$ Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acquire.jpg
-Oracle:Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
-SetInfo:5DN Rare
+Oracle:Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
--- a/res/cardsfolder/a/acridian.txt
+++ b/res/cardsfolder/a/acridian.txt
@@ -4,5 +4,4 @@ Types:Creature Insect
 PT:2/4
 K:Echo:1 G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acridian.jpg
-Oracle:Echo {1}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
-SetInfo:USG Common
+Oracle:Echo {1}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
--- a/res/cardsfolder/a/act_of_aggression.txt
+++ b/res/cardsfolder/a/act_of_aggression.txt
@@ -3,5 +3,4 @@ ManaCost:3 PR PR
 Types:Instant
 A:SP$ GainControl | Cost$ 3 PR PR | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls. | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_aggression.jpg
-Oracle:({R/P} can be paid with either {R} or 2 life.)\nGain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
-SetInfo:NPH Uncommon
+Oracle:({R/P} can be paid with either {R} or 2 life.)\nGain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
--- a/res/cardsfolder/a/act_of_treason.txt
+++ b/res/cardsfolder/a/act_of_treason.txt
@@ -3,8 +3,4 @@ ManaCost:2 R
 Types:Sorcery
 A:SP$ GainControl | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_treason.jpg
-Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
-SetInfo:M11 Common
-SetInfo:M10 Uncommon
-SetInfo:GTC Common
-SetInfo:M12 Common
+Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
--- a/res/cardsfolder/a/active_volcano.txt
+++ b/res/cardsfolder/a/active_volcano.txt
@@ -6,6 +6,4 @@ A:SP$ ChangeZone | Cost$ R | ValidTgts$ Island | TgtPrompt$ Select target Island
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/active_volcano.jpg
-Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
-SetInfo:CHR Common
-SetInfo:LEG Common
+Oracle:Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
--- a/res/cardsfolder/a/ad_nauseam.txt
+++ b/res/cardsfolder/a/ad_nauseam.txt
@@ -8,5 +8,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ad_nauseam.jpg
-Oracle:Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times.
-SetInfo:ALA Rare
+Oracle:Reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost. You may repeat this process any number of times.
--- a/res/cardsfolder/a/adamaro_first_to_desire.txt
+++ b/res/cardsfolder/a/adamaro_first_to_desire.txt
@@ -6,5 +6,4 @@ S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$
 SVar:X:Count$InOppHand
 SVar:AntiBuffedBy:Card
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adamaro_first_to_desire.jpg
-Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
-SetInfo:SOK Rare
+Oracle:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
--- a/res/cardsfolder/a/adaptive_automaton.txt
+++ b/res/cardsfolder/a/adaptive_automaton.txt
@@ -7,5 +7,4 @@ SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputer
 S:Mode$ Continuous | Affected$ Card.Self | AddType$ ChosenType | Description$ CARDNAME is the chosen type in addition to its other types.
 S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control of the chosen type get +1/+1.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_automaton.jpg
-Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.
-SetInfo:M12 Rare
+Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.
--- a/res/cardsfolder/a/adaptive_snapjaw.txt
+++ b/res/cardsfolder/a/adaptive_snapjaw.txt
@@ -4,5 +4,4 @@ Types:Creature Lizard Beast
 PT:6/2
 K:Evolve
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_snapjaw.jpg
-Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
-SetInfo:GTC Common
+Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)
--- a/res/cardsfolder/a/adarkar_sentinel.txt
+++ b/res/cardsfolder/a/adarkar_sentinel.txt
@@ -4,5 +4,4 @@ Types:Artifact Creature Soldier
 PT:3/3
 A:AB$ Pump | Cost$ 1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_sentinel.jpg
-Oracle:{1}: Adarkar Sentinel gets +0/+1 until end of turn.
-SetInfo:ICE Uncommon
+Oracle:{1}: Adarkar Sentinel gets +0/+1 until end of turn.
--- a/res/cardsfolder/a/adarkar_valkyrie.txt
+++ b/res/cardsfolder/a/adarkar_valkyrie.txt
@@ -8,5 +8,4 @@ A:AB$ Effect | Cost$ T | Name$ Adarkar Valkyrie Effect | ValidTgts$ Creature.Oth
 SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.IsRemembered | Execute$ TrigChangeZone | TriggerDescription$ If the targeted creature of Adarkar Valkyrie dies this turn, return it to the battlefield and you gain control of it.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121196.jpg
-Oracle:Flying, vigilance\n{T}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
-SetInfo:CSP Rare
+Oracle:Flying, vigilance\n{T}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
--- a/res/cardsfolder/a/adarkar_wastes.txt
+++ b/res/cardsfolder/a/adarkar_wastes.txt
@@ -4,12 +4,6 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBPain | SpellDescription$ Add U to your mana pool. CARDNAME deals 1 damage to you.
-SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
+SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_wastes.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
-SetInfo:7ED Rare
-SetInfo:6ED Rare
-SetInfo:9ED Rare
-SetInfo:10E Rare
-SetInfo:5ED Rare
-SetInfo:ICE Rare
+Oracle:{T}: Add {1} to your mana pool.\n{T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
--- a/res/cardsfolder/a/adarkar_windform.txt
+++ b/res/cardsfolder/a/adarkar_windform.txt
@@ -6,5 +6,4 @@ K:Flying
 A:AB$ Debuff | Cost$ 1 S | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Flying | SpellDescription$ Target creature loses flying until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adarkar_windform.jpg
-Oracle:Flying\n{1}{S}: Target creature loses flying until end of turn. ({S} can be paid with one mana from a snow permanent.)
-SetInfo:CSP Uncommon
+Oracle:Flying\n{1}{S}: Target creature loses flying until end of turn. ({S} can be paid with one mana from a snow permanent.)
--- a/res/cardsfolder/a/adder_staff_boggart.txt
+++ b/res/cardsfolder/a/adder_staff_boggart.txt
@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigClash:AB$Clash | Cost$ 0 | WinSubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adder_staff_boggart.jpg
-Oracle:When Adder-Staff Boggart enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Adder-Staff Boggart. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
-SetInfo:LRW Common
+Oracle:When Adder-Staff Boggart enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Adder-Staff Boggart. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
--- a/res/cardsfolder/a/addle.txt
+++ b/res/cardsfolder/a/addle.txt
@@ -5,5 +5,4 @@ A:SP$ ChooseColor | Cost$ 1 B | Defined$ You | AILogic$ MostProminentInHumanDeck
 SVar:DBRevealDiscard:DB$ Discard | Mode$ RevealYouChoose | NumCards$ 1 | DiscardValid$ Card.ChosenColor | ValidTgts$ Player | TgtPrompt$ Select target player
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/addle.jpg
-Oracle:Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
-SetInfo:INV Uncommon
+Oracle:Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
--- a/res/cardsfolder/a/admonition_angel.txt
+++ b/res/cardsfolder/a/admonition_angel.txt
@@ -10,5 +10,4 @@ SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile |
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/admonition_angel.jpg
-Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
-SetInfo:WWK Mythic
+Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
--- a/res/cardsfolder/a/adun_oakenshield.txt
+++ b/res/cardsfolder/a/adun_oakenshield.txt
@@ -4,5 +4,4 @@ Types:Legendary Creature Human Knight
 PT:1/2
 A:AB$ ChangeZone | Cost$ B R G T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl  | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adun_oakenshield.jpg
-Oracle:{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
-SetInfo:LEG Rare
+Oracle:{B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
--- a/res/cardsfolder/a/advance_scout.txt
+++ b/res/cardsfolder/a/advance_scout.txt
@@ -5,5 +5,4 @@ PT:1/1
 K:First Strike
 A:AB$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advance_scout.jpg
-Oracle:First strike\n{W}: Target creature gains first strike until end of turn.
-SetInfo:TMP Common
+Oracle:First strike\n{W}: Target creature gains first strike until end of turn.
--- a/res/cardsfolder/a/advanced_hoverguard.txt
+++ b/res/cardsfolder/a/advanced_hoverguard.txt
@@ -5,5 +5,4 @@ PT:2/2
 K:Flying
 A:AB$ Pump | Cost$ U | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advanced_hoverguard.jpg
-Oracle:Flying\n{U}: Advanced Hoverguard gains shroud until end of turn. (It can't be the target of spells or abilities.)
-SetInfo:5DN Common
+Oracle:Flying\n{U}: Advanced Hoverguard gains shroud until end of turn. (It can't be the target of spells or abilities.)
--- a/res/cardsfolder/a/advent_of_the_wurm.txt
+++ b/res/cardsfolder/a/advent_of_the_wurm.txt
@@ -3,5 +3,4 @@ ManaCost:1 G G W
 Types:Instant
 A:SP$ Token | Cost$ 1 G G W | TokenImage$ g 5 5 wurm rtr | TokenName$ Wurm | TokenAmount$ 1 | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample | SpellDescription$ Put a 5/5 green Wurm creature token with trample onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advent_of_the_wurm.jpg
-Oracle:Put a 5/5 green Wurm creature token with trample onto the battlefield.
-SetInfo:DGM Rare
+Oracle:Put a 5/5 green Wurm creature token with trample onto the battlefield.
--- a/res/cardsfolder/a/adventurers_guildhouse.txt
+++ b/res/cardsfolder/a/adventurers_guildhouse.txt
@@ -0,0 +1,7 @@
+Name:Adventurers' Guildhouse
+ManaCost:no cost
+Types:Land
+S:Mode$ Continuous | Affected$ Creature.Green+Legendary | AddKeyword$ Bands with Other Legendary Creatures | Description$ Green legendary creatures you control have "bands with other legendary creatures." (Any legendary creatures can attack in a band as long as at least one has "bands with other legendary creatures." Bands are blocked as a group. If at least two legendary creatures you control, one of which has "bands with other legendary creatures," are blocking or being blocked by the same creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/adventurers_guildhouse.jpg
+Oracle:Green legendary creatures you control have "bands with other legendary creatures." (Any legendary creatures can attack in a band as long as at least one has "bands with other legendary creatures." Bands are blocked as a group. If at least two legendary creatures you control, one of which has "bands with other legendary creatures," are blocking or being blocked by the same creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
--- a/res/cardsfolder/a/adventuring_gear.txt
+++ b/res/cardsfolder/a/adventuring_gear.txt
@@ -6,5 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Equipped | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adventuring_gear.jpg
-Oracle:Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-SetInfo:ZEN Common
+Oracle:Landfall - Whenever a land enters the battlefield under your control, equipped creature gets +2/+2 until end of turn.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
--- a/res/cardsfolder/a/advice_from_the_fae.txt
+++ b/res/cardsfolder/a/advice_from_the_fae.txt
@@ -7,5 +7,4 @@ SVar:X:Count$Valid Creature.YouCtrl
 SVar:Y:PlayerCountOther$HighestValid Creature.YouCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/advice_from_the_fae.jpg
-Oracle:({2/U} can be paid with any two mana or with {U}. This card's converted mana cost is 6.)\nLook at the top five cards of your library. If you control more creatures than each other player, put two of those cards into your hand. Otherwise, put one of them into your hand. Then put the rest on the bottom of your library in any order.
-SetInfo:SHM Uncommon
+Oracle:({2/U} can be paid with any two mana or with {U}. This card's converted mana cost is 6.)\nLook at the top five cards of your library. If you control more creatures than each other player, put two of those cards into your hand. Otherwise, put one of them into your hand. Then put the rest on the bottom of your library in any order.
--- a/res/cardsfolder/a/aegis_angel.txt
+++ b/res/cardsfolder/a/aegis_angel.txt
@@ -4,8 +4,7 @@ Types:Creature Angel
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target permanent is indestructible for as long as you control CARDNAME. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
-SVar:TrigPump:AB$ Pump |  Cost$ 0 | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
+SVar:TrigPump:AB$ Pump |  Cost$ 0 | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ Indestructible | UntilLoseControlOfHost$ True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_angel.jpg
-Oracle:Flying\nWhen Aegis Angel enters the battlefield, another target permanent is indestructible for as long as you control Aegis Angel. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
-SetInfo:M12 Rare
+Oracle:Flying\nWhen Aegis Angel enters the battlefield, another target permanent is indestructible for as long as you control Aegis Angel. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
--- a/res/cardsfolder/a/aegis_of_the_meek.txt
+++ b/res/cardsfolder/a/aegis_of_the_meek.txt
@@ -3,5 +3,4 @@ ManaCost:3
 Types:Artifact
 A:AB$ Pump | Cost$ 1 T | NumAtt$ 1 | NumDef$ 2 | ValidTgts$ Creature.powerEQ1+toughnessEQ1 | TgtPrompt$ Select target 1/1 Creature | SpellDescription$ Target 1/1 creature gets +1/+2 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_of_the_meek.jpg
-Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
-SetInfo:ICE Rare
+Oracle:{1}, {T}: Target 1/1 creature gets +1/+2 until end of turn.
--- a/res/cardsfolder/a/aeolipile.txt
+++ b/res/cardsfolder/a/aeolipile.txt
@@ -3,5 +3,4 @@ ManaCost:2
 Types:Artifact
 A:AB$ DealDamage | Cost$ 1 T Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeolipile.jpg
-Oracle:{1}, {T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
-SetInfo:FEM Rare
+Oracle:{1}, {T}, Sacrifice Aeolipile: Aeolipile deals 2 damage to target creature or player.
--- a/res/cardsfolder/a/aeon_chronicler.txt
+++ b/res/cardsfolder/a/aeon_chronicler.txt
@@ -11,5 +11,4 @@ SVar:X:Count$xPaid
 SVar:Y:Count$InYourHand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aeon_chronicler.jpg
-Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X-{X}{3}{U}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{U} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
-SetInfo:PLC Rare
+Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X-{X}{3}{U}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{U} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.
--- a/res/cardsfolder/a/aerathi_berserker.txt
+++ b/res/cardsfolder/a/aerathi_berserker.txt
@@ -4,5 +4,4 @@ Types:Creature Human Berserker
 PT:2/4
 K:Rampage 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerathi_berserker.jpg
-Oracle:Rampage 3 (Whenever this creature becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
-SetInfo:LEG Uncommon
+Oracle:Rampage 3 (Whenever this creature becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
--- a/res/cardsfolder/a/aerial_caravan.txt
+++ b/res/cardsfolder/a/aerial_caravan.txt
@@ -7,5 +7,4 @@ A:AB$ Dig | Cost$ 1 U U | DigNum$ 1 | ChangeNum$ All | ChangeValid$ Card | Desti
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played | PumpZone$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_caravan.jpg
-Oracle:Flying\n{1}{U}{U}: Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
-SetInfo:MMQ Rare
+Oracle:Flying\n{1}{U}{U}: Exile the top card of your library. Until end of turn, you may play that card. (Reveal the card as you exile it.)
--- a/res/cardsfolder/a/aerial_maneuver.txt
+++ b/res/cardsfolder/a/aerial_maneuver.txt
@@ -3,5 +3,4 @@ ManaCost:1 W
 Types:Instant
 A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Flying & First Strike | SpellDescription$ Target creature gets +1/+1 and gains flying and first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_maneuver.jpg
-Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
-SetInfo:GTC Common
+Oracle:Target creature gets +1/+1 and gains flying and first strike until end of turn.
--- a/res/cardsfolder/a/aerial_predation.txt
+++ b/res/cardsfolder/a/aerial_predation.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SubAbility$ NaturalLife | SpellDescription$ Destroy target creature with flying. You gain 2 life
 SVar:NaturalLife:DB$GainLife | Defined$ You | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerial_predation.jpg
-Oracle:Destroy target creature with flying. You gain 2 life.
-SetInfo:RTR Common
+Oracle:Destroy target creature with flying. You gain 2 life.
--- a/res/cardsfolder/a/aerie_mystics.txt
+++ b/res/cardsfolder/a/aerie_mystics.txt
@@ -5,5 +5,4 @@ PT:3/3
 K:Flying
 A:AB$ PumpAll | Cost$ 1 G U | ValidCards$ Creature.YouCtrl | KW$ Shroud | SpellDescription$ Creatures you control gain shroud until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerie_mystics.jpg
-Oracle:Flying\n{1}{G}{U}: Creatures you control gain shroud until end of turn.
-SetInfo:CFX Uncommon
+Oracle:Flying\n{1}{G}{U}: Creatures you control gain shroud until end of turn.
--- a/res/cardsfolder/a/aerie_ouphes.txt
+++ b/res/cardsfolder/a/aerie_ouphes.txt
@@ -6,5 +6,4 @@ K:Persist
 A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature with flying.
 SVar:X:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aerie_ouphes.jpg
-Oracle:Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
-SetInfo:EVE Common
+Oracle:Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
--- a/res/cardsfolder/a/aesthir_glider.txt
+++ b/res/cardsfolder/a/aesthir_glider.txt
@@ -5,5 +5,4 @@ PT:2/1
 K:CARDNAME can't block.
 K:Flying
 SVar:Picture:http://resources.wizards.com/magic/cards/al/en-us/card3040.jpg
-Oracle:Flying\nAesthir Glider can't block.
-SetInfo:ALL Common x2
+Oracle:Flying\nAesthir Glider can't block.
--- a/res/cardsfolder/a/aether_adept.txt
+++ b/res/cardsfolder/a/aether_adept.txt
@@ -5,6 +5,4 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
 SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_adept.jpg
-Oracle:When AEther Adept enters the battlefield, return target creature to its owner's hand.
-SetInfo:M11 Common
-SetInfo:M12 Common
+Oracle:When AEther Adept enters the battlefield, return target creature to its owner's hand.
--- a/res/cardsfolder/a/aether_barrier.txt
+++ b/res/cardsfolder/a/aether_barrier.txt
@@ -5,5 +5,4 @@ T:Mode$ SpellCast | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ T
 SVar:TrigSac:AB$Sacrifice | Cost$ 0 | UnlessCost$ 1 | UnlessPayer$ TriggeredActivator | Defined$ TriggeredActivator | SacValid$ Permanent
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_barrier.jpg
-Oracle:Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}.
-SetInfo:NMS Rare
+Oracle:Whenever a player casts a creature spell, that player sacrifices a permanent unless he or she pays {1}.
--- a/res/cardsfolder/a/aether_burst.txt
+++ b/res/cardsfolder/a/aether_burst.txt
@@ -4,5 +4,4 @@ Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | References$ X | SpellDescription$ Return up to X target creatures to their owners' hands, where X is one plus the number of cards named CARDNAME in all graveyards as you cast CARDNAME.
 SVar:X:Count$NamedInAllYards.AEther Burst/Plus.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_burst.jpg
-Oracle:Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst.
-SetInfo:ODY Common
+Oracle:Return up to X target creatures to their owners' hands, where X is one plus the number of cards named AEther Burst in all graveyards as you cast AEther Burst.
--- a/res/cardsfolder/a/aether_charge.txt
+++ b/res/cardsfolder/a/aether_charge.txt
@@ -5,5 +5,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Beast.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | DamageSource$ TriggeredCard | ValidTgts$ Opponent | NumDmg$ 4
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_charge.jpg
-Oracle:Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
-SetInfo:ONS Uncommon
+Oracle:Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
--- a/res/cardsfolder/a/aether_figment.txt
+++ b/res/cardsfolder/a/aether_figment.txt
@@ -7,5 +7,4 @@ K:Kicker 3
 K:etbCounter:P1P1:2:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with two +1/+1 counters on it.
 SVar:WasKicked:Count$Kicked.1.0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_figment.jpg
-Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAEther Figment is unblockable.\nIf AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it.
-SetInfo:ZEN Uncommon
+Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAEther Figment is unblockable.\nIf AEther Figment was kicked, it enters the battlefield with two +1/+1 counters on it.
--- a/Show More
+++ b/Show More