diff --git a/forge-gui/res/cardsfolder/upcoming/academy_drake.txt b/forge-gui/res/cardsfolder/a/academy_drake.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/academy_drake.txt rename to forge-gui/res/cardsfolder/a/academy_drake.txt diff --git a/forge-gui/res/cardsfolder/upcoming/academy_journeymage.txt b/forge-gui/res/cardsfolder/a/academy_journeymage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/academy_journeymage.txt rename to forge-gui/res/cardsfolder/a/academy_journeymage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/adamant_will.txt b/forge-gui/res/cardsfolder/a/adamant_will.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/adamant_will.txt rename to forge-gui/res/cardsfolder/a/adamant_will.txt diff --git a/forge-gui/res/cardsfolder/upcoming/adeliz_the_cinder_wind.txt b/forge-gui/res/cardsfolder/a/adeliz_the_cinder_wind.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/adeliz_the_cinder_wind.txt rename to forge-gui/res/cardsfolder/a/adeliz_the_cinder_wind.txt diff --git a/forge-gui/res/cardsfolder/upcoming/adventurous_impulse.txt b/forge-gui/res/cardsfolder/a/adventurous_impulse.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/adventurous_impulse.txt rename to forge-gui/res/cardsfolder/a/adventurous_impulse.txt diff --git a/forge-gui/res/cardsfolder/upcoming/amaranthine_wall.txt b/forge-gui/res/cardsfolder/a/amaranthine_wall.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/amaranthine_wall.txt rename to forge-gui/res/cardsfolder/a/amaranthine_wall.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ancient_animus.txt b/forge-gui/res/cardsfolder/a/ancient_animus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ancient_animus.txt rename to forge-gui/res/cardsfolder/a/ancient_animus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arbor_armament.txt b/forge-gui/res/cardsfolder/a/arbor_armament.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arbor_armament.txt rename to forge-gui/res/cardsfolder/a/arbor_armament.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arcane_flight.txt b/forge-gui/res/cardsfolder/a/arcane_flight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arcane_flight.txt rename to forge-gui/res/cardsfolder/a/arcane_flight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/artificers_assistant.txt b/forge-gui/res/cardsfolder/a/artificers_assistant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/artificers_assistant.txt rename to forge-gui/res/cardsfolder/a/artificers_assistant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/arvad_the_cursed.txt b/forge-gui/res/cardsfolder/a/arvad_the_cursed.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/arvad_the_cursed.txt rename to forge-gui/res/cardsfolder/a/arvad_the_cursed.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aryel_knight_of_windgrace.txt b/forge-gui/res/cardsfolder/a/aryel_knight_of_windgrace.txt similarity index 99% rename from forge-gui/res/cardsfolder/upcoming/aryel_knight_of_windgrace.txt rename to forge-gui/res/cardsfolder/a/aryel_knight_of_windgrace.txt index 295da7a1317..061362b590a 100644 --- a/forge-gui/res/cardsfolder/upcoming/aryel_knight_of_windgrace.txt +++ b/forge-gui/res/cardsfolder/a/aryel_knight_of_windgrace.txt @@ -1,7 +1,7 @@ Name:Aryel, Knight of Windgrace ManaCost:2 W B Types:Legendary Creature Human Knight -PT:3/3 +PT:4/4 K:Vigilance A:AB$ Token | Cost$ 2 W T | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight dom | SpellDescription$ Create a 2/2 white Knight creature token with vigilance. A:AB$ Destroy | Cost$ B T tapXType | Announce$ X | ValidTgts$ Creature.powerLEX | TgtPrompt$ Select target creature with power X or less | References$ X | SpellDescription$ Destroy target creature with power X or less. diff --git a/forge-gui/res/cardsfolder/upcoming/aven_sentry.txt b/forge-gui/res/cardsfolder/a/aven_sentry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aven_sentry.txt rename to forge-gui/res/cardsfolder/a/aven_sentry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/baird_steward_of_argive.txt b/forge-gui/res/cardsfolder/b/baird_steward_of_argive.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/baird_steward_of_argive.txt rename to forge-gui/res/cardsfolder/b/baird_steward_of_argive.txt diff --git a/forge-gui/res/cardsfolder/upcoming/baloth_gorger.txt b/forge-gui/res/cardsfolder/b/baloth_gorger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/baloth_gorger.txt rename to forge-gui/res/cardsfolder/b/baloth_gorger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/befuddle.txt b/forge-gui/res/cardsfolder/b/befuddle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/befuddle.txt rename to forge-gui/res/cardsfolder/b/befuddle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/benalish_honor_guard.txt b/forge-gui/res/cardsfolder/b/benalish_honor_guard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/benalish_honor_guard.txt rename to forge-gui/res/cardsfolder/b/benalish_honor_guard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/benalish_marshal.txt b/forge-gui/res/cardsfolder/b/benalish_marshal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/benalish_marshal.txt rename to forge-gui/res/cardsfolder/b/benalish_marshal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blackblade_reforged.txt b/forge-gui/res/cardsfolder/b/blackblade_reforged.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blackblade_reforged.txt rename to forge-gui/res/cardsfolder/b/blackblade_reforged.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blessed_light.txt b/forge-gui/res/cardsfolder/b/blessed_light.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blessed_light.txt rename to forge-gui/res/cardsfolder/b/blessed_light.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blessing_of_belzenlok.txt b/forge-gui/res/cardsfolder/b/blessing_of_belzenlok.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blessing_of_belzenlok.txt rename to forge-gui/res/cardsfolder/b/blessing_of_belzenlok.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blink_of_an_eye.txt b/forge-gui/res/cardsfolder/b/blink_of_an_eye.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blink_of_an_eye.txt rename to forge-gui/res/cardsfolder/b/blink_of_an_eye.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bloodstone_goblin.txt b/forge-gui/res/cardsfolder/b/bloodstone_goblin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bloodstone_goblin.txt rename to forge-gui/res/cardsfolder/b/bloodstone_goblin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bloodtallow_candle.txt b/forge-gui/res/cardsfolder/b/bloodtallow_candle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bloodtallow_candle.txt rename to forge-gui/res/cardsfolder/b/bloodtallow_candle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/board_the_weatherlight.txt b/forge-gui/res/cardsfolder/b/board_the_weatherlight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/board_the_weatherlight.txt rename to forge-gui/res/cardsfolder/b/board_the_weatherlight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/broken_bond.txt b/forge-gui/res/cardsfolder/b/broken_bond.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/broken_bond.txt rename to forge-gui/res/cardsfolder/b/broken_bond.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cabal_evangel.txt b/forge-gui/res/cardsfolder/c/cabal_evangel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cabal_evangel.txt rename to forge-gui/res/cardsfolder/c/cabal_evangel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cabal_paladin.txt b/forge-gui/res/cardsfolder/c/cabal_paladin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cabal_paladin.txt rename to forge-gui/res/cardsfolder/c/cabal_paladin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cabal_stronghold.txt b/forge-gui/res/cardsfolder/c/cabal_stronghold.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cabal_stronghold.txt rename to forge-gui/res/cardsfolder/c/cabal_stronghold.txt diff --git a/forge-gui/res/cardsfolder/upcoming/caligo_skin_witch.txt b/forge-gui/res/cardsfolder/c/caligo_skin_witch.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/caligo_skin_witch.txt rename to forge-gui/res/cardsfolder/c/caligo_skin_witch.txt diff --git a/forge-gui/res/cardsfolder/upcoming/call_the_cavalry.txt b/forge-gui/res/cardsfolder/c/call_the_cavalry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/call_the_cavalry.txt rename to forge-gui/res/cardsfolder/c/call_the_cavalry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cast_down.txt b/forge-gui/res/cardsfolder/c/cast_down.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cast_down.txt rename to forge-gui/res/cardsfolder/c/cast_down.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chainers_torment.txt b/forge-gui/res/cardsfolder/c/chainers_torment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chainers_torment.txt rename to forge-gui/res/cardsfolder/c/chainers_torment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/champion_of_the_flame.txt b/forge-gui/res/cardsfolder/c/champion_of_the_flame.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/champion_of_the_flame.txt rename to forge-gui/res/cardsfolder/c/champion_of_the_flame.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_bold_pyromancer.txt b/forge-gui/res/cardsfolder/c/chandra_bold_pyromancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandra_bold_pyromancer.txt rename to forge-gui/res/cardsfolder/c/chandra_bold_pyromancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandras_outburst.txt b/forge-gui/res/cardsfolder/c/chandras_outburst.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandras_outburst.txt rename to forge-gui/res/cardsfolder/c/chandras_outburst.txt diff --git a/forge-gui/res/cardsfolder/upcoming/charge.txt b/forge-gui/res/cardsfolder/c/charge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/charge.txt rename to forge-gui/res/cardsfolder/c/charge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cloudreader_sphinx.txt b/forge-gui/res/cardsfolder/c/cloudreader_sphinx.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cloudreader_sphinx.txt rename to forge-gui/res/cardsfolder/c/cloudreader_sphinx.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cold_water_snapper.txt b/forge-gui/res/cardsfolder/c/cold_water_snapper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cold_water_snapper.txt rename to forge-gui/res/cardsfolder/c/cold_water_snapper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/corrosive_ooze.txt b/forge-gui/res/cardsfolder/c/corrosive_ooze.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/corrosive_ooze.txt rename to forge-gui/res/cardsfolder/c/corrosive_ooze.txt diff --git a/forge-gui/res/cardsfolder/upcoming/curators_ward.txt b/forge-gui/res/cardsfolder/c/curators_ward.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/curators_ward.txt rename to forge-gui/res/cardsfolder/c/curators_ward.txt diff --git a/forge-gui/res/cardsfolder/upcoming/damping_sphere.txt b/forge-gui/res/cardsfolder/d/damping_sphere.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/damping_sphere.txt rename to forge-gui/res/cardsfolder/d/damping_sphere.txt diff --git a/forge-gui/res/cardsfolder/upcoming/danitha_capashen_paragon.txt b/forge-gui/res/cardsfolder/d/danitha_capashen_paragon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/danitha_capashen_paragon.txt rename to forge-gui/res/cardsfolder/d/danitha_capashen_paragon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/darigaaz_reincarnated.txt b/forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/darigaaz_reincarnated.txt rename to forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt diff --git a/forge-gui/res/cardsfolder/upcoming/daring_archaeologist.txt b/forge-gui/res/cardsfolder/d/daring_archaeologist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/daring_archaeologist.txt rename to forge-gui/res/cardsfolder/d/daring_archaeologist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dark_bargain.txt b/forge-gui/res/cardsfolder/d/dark_bargain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dark_bargain.txt rename to forge-gui/res/cardsfolder/d/dark_bargain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dauntless_bodyguard.txt b/forge-gui/res/cardsfolder/d/dauntless_bodyguard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dauntless_bodyguard.txt rename to forge-gui/res/cardsfolder/d/dauntless_bodyguard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/davenant_trapper.txt b/forge-gui/res/cardsfolder/d/davenant_trapper.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/davenant_trapper.txt rename to forge-gui/res/cardsfolder/d/davenant_trapper.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deathbloom_thallid.txt b/forge-gui/res/cardsfolder/d/deathbloom_thallid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deathbloom_thallid.txt rename to forge-gui/res/cardsfolder/d/deathbloom_thallid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/deep_freeze.txt b/forge-gui/res/cardsfolder/d/deep_freeze.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/deep_freeze.txt rename to forge-gui/res/cardsfolder/d/deep_freeze.txt diff --git a/forge-gui/res/cardsfolder/upcoming/demonic_vigor.txt b/forge-gui/res/cardsfolder/d/demonic_vigor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/demonic_vigor.txt rename to forge-gui/res/cardsfolder/d/demonic_vigor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/demonlord_belzenlok.txt b/forge-gui/res/cardsfolder/d/demonlord_belzenlok.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/demonlord_belzenlok.txt rename to forge-gui/res/cardsfolder/d/demonlord_belzenlok.txt diff --git a/forge-gui/res/cardsfolder/upcoming/diligent_excavator.txt b/forge-gui/res/cardsfolder/d/diligent_excavator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/diligent_excavator.txt rename to forge-gui/res/cardsfolder/d/diligent_excavator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/divest.txt b/forge-gui/res/cardsfolder/d/divest.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/divest.txt rename to forge-gui/res/cardsfolder/d/divest.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dread_shade.txt b/forge-gui/res/cardsfolder/d/dread_shade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dread_shade.txt rename to forge-gui/res/cardsfolder/d/dread_shade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/drudge_sentinel.txt b/forge-gui/res/cardsfolder/d/drudge_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/drudge_sentinel.txt rename to forge-gui/res/cardsfolder/d/drudge_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dub.txt b/forge-gui/res/cardsfolder/d/dub.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dub.txt rename to forge-gui/res/cardsfolder/d/dub.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elfhame_druid.txt b/forge-gui/res/cardsfolder/e/elfhame_druid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elfhame_druid.txt rename to forge-gui/res/cardsfolder/e/elfhame_druid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eviscerate.txt b/forge-gui/res/cardsfolder/e/eviscerate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eviscerate.txt rename to forge-gui/res/cardsfolder/e/eviscerate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/evra_halcyon_witness.txt b/forge-gui/res/cardsfolder/e/evra_halcyon_witness.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/evra_halcyon_witness.txt rename to forge-gui/res/cardsfolder/e/evra_halcyon_witness.txt diff --git a/forge-gui/res/cardsfolder/upcoming/excavation_elephant.txt b/forge-gui/res/cardsfolder/e/excavation_elephant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/excavation_elephant.txt rename to forge-gui/res/cardsfolder/e/excavation_elephant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fall_of_the_thran.txt b/forge-gui/res/cardsfolder/f/fall_of_the_thran.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fall_of_the_thran.txt rename to forge-gui/res/cardsfolder/f/fall_of_the_thran.txt diff --git a/forge-gui/res/cardsfolder/upcoming/feral_abomination.txt b/forge-gui/res/cardsfolder/f/feral_abomination.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/feral_abomination.txt rename to forge-gui/res/cardsfolder/f/feral_abomination.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fervent_strike.txt b/forge-gui/res/cardsfolder/f/fervent_strike.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fervent_strike.txt rename to forge-gui/res/cardsfolder/f/fervent_strike.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fiery_intervention.txt b/forge-gui/res/cardsfolder/f/fiery_intervention.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fiery_intervention.txt rename to forge-gui/res/cardsfolder/f/fiery_intervention.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fight_with_fire.txt b/forge-gui/res/cardsfolder/f/fight_with_fire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fight_with_fire.txt rename to forge-gui/res/cardsfolder/f/fight_with_fire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/final_parting.txt b/forge-gui/res/cardsfolder/f/final_parting.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/final_parting.txt rename to forge-gui/res/cardsfolder/f/final_parting.txt diff --git a/forge-gui/res/cardsfolder/upcoming/firefist_adept.txt b/forge-gui/res/cardsfolder/f/firefist_adept.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/firefist_adept.txt rename to forge-gui/res/cardsfolder/f/firefist_adept.txt diff --git a/forge-gui/res/cardsfolder/upcoming/firesong_and_sunspeaker.txt b/forge-gui/res/cardsfolder/f/firesong_and_sunspeaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/firesong_and_sunspeaker.txt rename to forge-gui/res/cardsfolder/f/firesong_and_sunspeaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/forebears_blade.txt b/forge-gui/res/cardsfolder/f/forebears_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/forebears_blade.txt rename to forge-gui/res/cardsfolder/f/forebears_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_rage.txt b/forge-gui/res/cardsfolder/f/frenzied_rage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/frenzied_rage.txt rename to forge-gui/res/cardsfolder/f/frenzied_rage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fungal_infection.txt b/forge-gui/res/cardsfolder/f/fungal_infection.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fungal_infection.txt rename to forge-gui/res/cardsfolder/f/fungal_infection.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fungal_plots.txt b/forge-gui/res/cardsfolder/f/fungal_plots.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fungal_plots.txt rename to forge-gui/res/cardsfolder/f/fungal_plots.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gaeas_protector.txt b/forge-gui/res/cardsfolder/g/gaeas_protector.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gaeas_protector.txt rename to forge-gui/res/cardsfolder/g/gaeas_protector.txt diff --git a/forge-gui/res/cardsfolder/upcoming/garna_the_bloodflame.txt b/forge-gui/res/cardsfolder/g/garna_the_bloodflame.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/garna_the_bloodflame.txt rename to forge-gui/res/cardsfolder/g/garna_the_bloodflame.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghitu_chronicler.txt b/forge-gui/res/cardsfolder/g/ghitu_chronicler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghitu_chronicler.txt rename to forge-gui/res/cardsfolder/g/ghitu_chronicler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghitu_journeymage.txt b/forge-gui/res/cardsfolder/g/ghitu_journeymage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghitu_journeymage.txt rename to forge-gui/res/cardsfolder/g/ghitu_journeymage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghitu_lavarunner.txt b/forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghitu_lavarunner.txt rename to forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_growth.txt b/forge-gui/res/cardsfolder/g/gift_of_growth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gift_of_growth.txt rename to forge-gui/res/cardsfolder/g/gift_of_growth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_barrage.txt b/forge-gui/res/cardsfolder/g/goblin_barrage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goblin_barrage.txt rename to forge-gui/res/cardsfolder/g/goblin_barrage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_chainwhirler.txt b/forge-gui/res/cardsfolder/g/goblin_chainwhirler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goblin_chainwhirler.txt rename to forge-gui/res/cardsfolder/g/goblin_chainwhirler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grand_warlord_radha.txt b/forge-gui/res/cardsfolder/g/grand_warlord_radha.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grand_warlord_radha.txt rename to forge-gui/res/cardsfolder/g/grand_warlord_radha.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grow_from_the_ashes.txt b/forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grow_from_the_ashes.txt rename to forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grunn_the_lonely_king.txt b/forge-gui/res/cardsfolder/g/grunn_the_lonely_king.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grunn_the_lonely_king.txt rename to forge-gui/res/cardsfolder/g/grunn_the_lonely_king.txt diff --git a/forge-gui/res/cardsfolder/upcoming/guardians_of_koilos.txt b/forge-gui/res/cardsfolder/g/guardians_of_koilos.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/guardians_of_koilos.txt rename to forge-gui/res/cardsfolder/g/guardians_of_koilos.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hallar_the_firefletcher.txt b/forge-gui/res/cardsfolder/h/hallar_the_firefletcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hallar_the_firefletcher.txt rename to forge-gui/res/cardsfolder/h/hallar_the_firefletcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/haphazard_bombardment.txt b/forge-gui/res/cardsfolder/h/haphazard_bombardment.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/haphazard_bombardment.txt rename to forge-gui/res/cardsfolder/h/haphazard_bombardment.txt diff --git a/forge-gui/res/cardsfolder/upcoming/helm_of_the_host.txt b/forge-gui/res/cardsfolder/h/helm_of_the_host.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/helm_of_the_host.txt rename to forge-gui/res/cardsfolder/h/helm_of_the_host.txt diff --git a/forge-gui/res/cardsfolder/upcoming/history_of_benalia.txt b/forge-gui/res/cardsfolder/h/history_of_benalia.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/history_of_benalia.txt rename to forge-gui/res/cardsfolder/h/history_of_benalia.txt diff --git a/forge-gui/res/cardsfolder/upcoming/homarid_explorer.txt b/forge-gui/res/cardsfolder/h/homarid_explorer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/homarid_explorer.txt rename to forge-gui/res/cardsfolder/h/homarid_explorer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/howling_golem.txt b/forge-gui/res/cardsfolder/h/howling_golem.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/howling_golem.txt rename to forge-gui/res/cardsfolder/h/howling_golem.txt diff --git a/forge-gui/res/cardsfolder/upcoming/in_bolass_clutches.txt b/forge-gui/res/cardsfolder/i/in_bolass_clutches.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/in_bolass_clutches.txt rename to forge-gui/res/cardsfolder/i/in_bolass_clutches.txt diff --git a/forge-gui/res/cardsfolder/upcoming/invoke_the_divine.txt b/forge-gui/res/cardsfolder/i/invoke_the_divine.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/invoke_the_divine.txt rename to forge-gui/res/cardsfolder/i/invoke_the_divine.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jaya_ballard.txt b/forge-gui/res/cardsfolder/j/jaya_ballard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jaya_ballard.txt rename to forge-gui/res/cardsfolder/j/jaya_ballard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jayas_immolating_inferno.txt b/forge-gui/res/cardsfolder/j/jayas_immolating_inferno.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jayas_immolating_inferno.txt rename to forge-gui/res/cardsfolder/j/jayas_immolating_inferno.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt b/forge-gui/res/cardsfolder/j/jhoira_weatherlight_captain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jhoira_weatherlight_captain.txt rename to forge-gui/res/cardsfolder/j/jhoira_weatherlight_captain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jhoiras_familiar.txt b/forge-gui/res/cardsfolder/j/jhoiras_familiar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jhoiras_familiar.txt rename to forge-gui/res/cardsfolder/j/jhoiras_familiar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jodah_archmage_eternal.txt b/forge-gui/res/cardsfolder/j/jodah_archmage_eternal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jodah_archmage_eternal.txt rename to forge-gui/res/cardsfolder/j/jodah_archmage_eternal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/josu_vess_lich_knight.txt b/forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/josu_vess_lich_knight.txt rename to forge-gui/res/cardsfolder/j/josu_vess_lich_knight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/jousting_lance.txt b/forge-gui/res/cardsfolder/j/jousting_lance.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/jousting_lance.txt rename to forge-gui/res/cardsfolder/j/jousting_lance.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kamahls_druidic_vow.txt b/forge-gui/res/cardsfolder/k/kamahls_druidic_vow.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kamahls_druidic_vow.txt rename to forge-gui/res/cardsfolder/k/kamahls_druidic_vow.txt diff --git a/forge-gui/res/cardsfolder/upcoming/karn_scion_of_urza.txt b/forge-gui/res/cardsfolder/k/karn_scion_of_urza.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/karn_scion_of_urza.txt rename to forge-gui/res/cardsfolder/k/karn_scion_of_urza.txt diff --git a/forge-gui/res/cardsfolder/upcoming/karns_temporal_sundering.txt b/forge-gui/res/cardsfolder/k/karns_temporal_sundering.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/karns_temporal_sundering.txt rename to forge-gui/res/cardsfolder/k/karns_temporal_sundering.txt diff --git a/forge-gui/res/cardsfolder/upcoming/karplusan_hound.txt b/forge-gui/res/cardsfolder/k/karplusan_hound.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/karplusan_hound.txt rename to forge-gui/res/cardsfolder/k/karplusan_hound.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kazarov_sengir_pureblood.txt b/forge-gui/res/cardsfolder/k/kazarov_sengir_pureblood.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kazarov_sengir_pureblood.txt rename to forge-gui/res/cardsfolder/k/kazarov_sengir_pureblood.txt diff --git a/forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt b/forge-gui/res/cardsfolder/k/keldon_overseer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/keldon_overseer.txt rename to forge-gui/res/cardsfolder/k/keldon_overseer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/keldon_raider.txt b/forge-gui/res/cardsfolder/k/keldon_raider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/keldon_raider.txt rename to forge-gui/res/cardsfolder/k/keldon_raider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/keldon_warcaller.txt b/forge-gui/res/cardsfolder/k/keldon_warcaller.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/keldon_warcaller.txt rename to forge-gui/res/cardsfolder/k/keldon_warcaller.txt diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_grace.txt b/forge-gui/res/cardsfolder/k/knight_of_grace.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/knight_of_grace.txt rename to forge-gui/res/cardsfolder/k/knight_of_grace.txt diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_malice.txt b/forge-gui/res/cardsfolder/k/knight_of_malice.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/knight_of_malice.txt rename to forge-gui/res/cardsfolder/k/knight_of_malice.txt diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_new_benalia.txt b/forge-gui/res/cardsfolder/k/knight_of_new_benalia.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/knight_of_new_benalia.txt rename to forge-gui/res/cardsfolder/k/knight_of_new_benalia.txt diff --git a/forge-gui/res/cardsfolder/upcoming/krosan_druid.txt b/forge-gui/res/cardsfolder/k/krosan_druid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/krosan_druid.txt rename to forge-gui/res/cardsfolder/k/krosan_druid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kwende_pride_of_femeref.txt b/forge-gui/res/cardsfolder/k/kwende_pride_of_femeref.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kwende_pride_of_femeref.txt rename to forge-gui/res/cardsfolder/k/kwende_pride_of_femeref.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lichs_mastery.txt b/forge-gui/res/cardsfolder/l/lichs_mastery.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lichs_mastery.txt rename to forge-gui/res/cardsfolder/l/lichs_mastery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lingering_phantom.txt b/forge-gui/res/cardsfolder/l/lingering_phantom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lingering_phantom.txt rename to forge-gui/res/cardsfolder/l/lingering_phantom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_envoy.txt b/forge-gui/res/cardsfolder/l/llanowar_envoy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/llanowar_envoy.txt rename to forge-gui/res/cardsfolder/l/llanowar_envoy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/llanowar_scout.txt b/forge-gui/res/cardsfolder/l/llanowar_scout.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/llanowar_scout.txt rename to forge-gui/res/cardsfolder/l/llanowar_scout.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lyra_dawnbringer.txt b/forge-gui/res/cardsfolder/l/lyra_dawnbringer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lyra_dawnbringer.txt rename to forge-gui/res/cardsfolder/l/lyra_dawnbringer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mammoth_spider.txt b/forge-gui/res/cardsfolder/m/mammoth_spider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mammoth_spider.txt rename to forge-gui/res/cardsfolder/m/mammoth_spider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/marwyn_the_nurturer.txt b/forge-gui/res/cardsfolder/m/marwyn_the_nurturer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/marwyn_the_nurturer.txt rename to forge-gui/res/cardsfolder/m/marwyn_the_nurturer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memorial_to_folly.txt b/forge-gui/res/cardsfolder/m/memorial_to_folly.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memorial_to_folly.txt rename to forge-gui/res/cardsfolder/m/memorial_to_folly.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memorial_to_genius.txt b/forge-gui/res/cardsfolder/m/memorial_to_genius.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memorial_to_genius.txt rename to forge-gui/res/cardsfolder/m/memorial_to_genius.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memorial_to_glory.txt b/forge-gui/res/cardsfolder/m/memorial_to_glory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memorial_to_glory.txt rename to forge-gui/res/cardsfolder/m/memorial_to_glory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memorial_to_unity.txt b/forge-gui/res/cardsfolder/m/memorial_to_unity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memorial_to_unity.txt rename to forge-gui/res/cardsfolder/m/memorial_to_unity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/memorial_to_war.txt b/forge-gui/res/cardsfolder/m/memorial_to_war.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/memorial_to_war.txt rename to forge-gui/res/cardsfolder/m/memorial_to_war.txt diff --git a/forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt b/forge-gui/res/cardsfolder/m/merfolk_trickster.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/merfolk_trickster.txt rename to forge-gui/res/cardsfolder/m/merfolk_trickster.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mesa_unicorn.txt b/forge-gui/res/cardsfolder/m/mesa_unicorn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mesa_unicorn.txt rename to forge-gui/res/cardsfolder/m/mesa_unicorn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mishras_self_replicator.txt b/forge-gui/res/cardsfolder/m/mishras_self_replicator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mishras_self_replicator.txt rename to forge-gui/res/cardsfolder/m/mishras_self_replicator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mox_amber.txt b/forge-gui/res/cardsfolder/m/mox_amber.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mox_amber.txt rename to forge-gui/res/cardsfolder/m/mox_amber.txt diff --git a/forge-gui/res/cardsfolder/upcoming/muldrotha_the_gravetide.txt b/forge-gui/res/cardsfolder/m/muldrotha_the_gravetide.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/muldrotha_the_gravetide.txt rename to forge-gui/res/cardsfolder/m/muldrotha_the_gravetide.txt diff --git a/forge-gui/res/cardsfolder/upcoming/multani_yavimayas_avatar.txt b/forge-gui/res/cardsfolder/m/multani_yavimayas_avatar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/multani_yavimayas_avatar.txt rename to forge-gui/res/cardsfolder/m/multani_yavimayas_avatar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/naru_meha_master_wizard.txt b/forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/naru_meha_master_wizard.txt rename to forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/navigators_compass.txt b/forge-gui/res/cardsfolder/n/navigators_compass.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/navigators_compass.txt rename to forge-gui/res/cardsfolder/n/navigators_compass.txt diff --git a/forge-gui/res/cardsfolder/upcoming/niambi_faithful_healer.txt b/forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/niambi_faithful_healer.txt rename to forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/oath_of_teferi.txt b/forge-gui/res/cardsfolder/o/oath_of_teferi.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/oath_of_teferi.txt rename to forge-gui/res/cardsfolder/o/oath_of_teferi.txt diff --git a/forge-gui/res/cardsfolder/upcoming/on_serras_wings.txt b/forge-gui/res/cardsfolder/o/on_serras_wings.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/on_serras_wings.txt rename to forge-gui/res/cardsfolder/o/on_serras_wings.txt diff --git a/forge-gui/res/cardsfolder/upcoming/orcish_vandal.txt b/forge-gui/res/cardsfolder/o/orcish_vandal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/orcish_vandal.txt rename to forge-gui/res/cardsfolder/o/orcish_vandal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pardic_wanderer.txt b/forge-gui/res/cardsfolder/p/pardic_wanderer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pardic_wanderer.txt rename to forge-gui/res/cardsfolder/p/pardic_wanderer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pegasus_courser.txt b/forge-gui/res/cardsfolder/p/pegasus_courser.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pegasus_courser.txt rename to forge-gui/res/cardsfolder/p/pegasus_courser.txt diff --git a/forge-gui/res/cardsfolder/upcoming/phyrexian_scriptures.txt b/forge-gui/res/cardsfolder/p/phyrexian_scriptures.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/phyrexian_scriptures.txt rename to forge-gui/res/cardsfolder/p/phyrexian_scriptures.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pierce_the_sky.txt b/forge-gui/res/cardsfolder/p/pierce_the_sky.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pierce_the_sky.txt rename to forge-gui/res/cardsfolder/p/pierce_the_sky.txt diff --git a/forge-gui/res/cardsfolder/upcoming/powerstone_shard.txt b/forge-gui/res/cardsfolder/p/powerstone_shard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/powerstone_shard.txt rename to forge-gui/res/cardsfolder/p/powerstone_shard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/precognition_field.txt b/forge-gui/res/cardsfolder/p/precognition_field.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/precognition_field.txt rename to forge-gui/res/cardsfolder/p/precognition_field.txt diff --git a/forge-gui/res/cardsfolder/upcoming/primevals_glorious_rebirth.txt b/forge-gui/res/cardsfolder/p/primevals_glorious_rebirth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/primevals_glorious_rebirth.txt rename to forge-gui/res/cardsfolder/p/primevals_glorious_rebirth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/primordial_wurm.txt b/forge-gui/res/cardsfolder/p/primordial_wurm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/primordial_wurm.txt rename to forge-gui/res/cardsfolder/p/primordial_wurm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pyromantic_pilgrim.txt b/forge-gui/res/cardsfolder/p/pyromantic_pilgrim.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pyromantic_pilgrim.txt rename to forge-gui/res/cardsfolder/p/pyromantic_pilgrim.txt diff --git a/forge-gui/res/cardsfolder/upcoming/radiating_lightning.txt b/forge-gui/res/cardsfolder/r/radiating_lightning.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/radiating_lightning.txt rename to forge-gui/res/cardsfolder/r/radiating_lightning.txt diff --git a/forge-gui/res/cardsfolder/upcoming/raff_capashen_ships_mage.txt b/forge-gui/res/cardsfolder/r/raff_capashen_ships_mage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/raff_capashen_ships_mage.txt rename to forge-gui/res/cardsfolder/r/raff_capashen_ships_mage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt b/forge-gui/res/cardsfolder/r/rampaging_cyclops.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rampaging_cyclops.txt rename to forge-gui/res/cardsfolder/r/rampaging_cyclops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rat_colony.txt b/forge-gui/res/cardsfolder/r/rat_colony.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rat_colony.txt rename to forge-gui/res/cardsfolder/r/rat_colony.txt diff --git a/forge-gui/res/cardsfolder/upcoming/relic_runner.txt b/forge-gui/res/cardsfolder/r/relic_runner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/relic_runner.txt rename to forge-gui/res/cardsfolder/r/relic_runner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_belzenlok.txt b/forge-gui/res/cardsfolder/r/rite_of_belzenlok.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rite_of_belzenlok.txt rename to forge-gui/res/cardsfolder/r/rite_of_belzenlok.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rona_disciple_of_gix.txt b/forge-gui/res/cardsfolder/r/rona_disciple_of_gix.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rona_disciple_of_gix.txt rename to forge-gui/res/cardsfolder/r/rona_disciple_of_gix.txt diff --git a/forge-gui/res/cardsfolder/upcoming/run_amok.txt b/forge-gui/res/cardsfolder/r/run_amok.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/run_amok.txt rename to forge-gui/res/cardsfolder/r/run_amok.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sanctum_spirit.txt b/forge-gui/res/cardsfolder/s/sanctum_spirit.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sanctum_spirit.txt rename to forge-gui/res/cardsfolder/s/sanctum_spirit.txt diff --git a/forge-gui/res/cardsfolder/upcoming/saproling_migration.txt b/forge-gui/res/cardsfolder/s/saproling_migration.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/saproling_migration.txt rename to forge-gui/res/cardsfolder/s/saproling_migration.txt diff --git a/forge-gui/res/cardsfolder/upcoming/seal_away.txt b/forge-gui/res/cardsfolder/s/seal_away.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/seal_away.txt rename to forge-gui/res/cardsfolder/s/seal_away.txt diff --git a/forge-gui/res/cardsfolder/upcoming/seismic_shift.txt b/forge-gui/res/cardsfolder/s/seismic_shift.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/seismic_shift.txt rename to forge-gui/res/cardsfolder/s/seismic_shift.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sentinel_of_the_pearl_trident.txt b/forge-gui/res/cardsfolder/s/sentinel_of_the_pearl_trident.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sentinel_of_the_pearl_trident.txt rename to forge-gui/res/cardsfolder/s/sentinel_of_the_pearl_trident.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sergeant_at_arms.txt b/forge-gui/res/cardsfolder/s/sergeant_at_arms.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sergeant_at_arms.txt rename to forge-gui/res/cardsfolder/s/sergeant_at_arms.txt diff --git a/forge-gui/res/cardsfolder/upcoming/serra_disciple.txt b/forge-gui/res/cardsfolder/s/serra_disciple.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/serra_disciple.txt rename to forge-gui/res/cardsfolder/s/serra_disciple.txt diff --git a/forge-gui/res/cardsfolder/upcoming/settle_the_score.txt b/forge-gui/res/cardsfolder/s/settle_the_score.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/settle_the_score.txt rename to forge-gui/res/cardsfolder/s/settle_the_score.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shalai_voice_of_plenty.txt b/forge-gui/res/cardsfolder/s/shalai_voice_of_plenty.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shalai_voice_of_plenty.txt rename to forge-gui/res/cardsfolder/s/shalai_voice_of_plenty.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shanna_sisays_legacy.txt b/forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shanna_sisays_legacy.txt rename to forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shield_of_the_realm.txt b/forge-gui/res/cardsfolder/s/shield_of_the_realm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shield_of_the_realm.txt rename to forge-gui/res/cardsfolder/s/shield_of_the_realm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shivan_fire.txt b/forge-gui/res/cardsfolder/s/shivan_fire.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shivan_fire.txt rename to forge-gui/res/cardsfolder/s/shivan_fire.txt diff --git a/forge-gui/res/cardsfolder/upcoming/short_sword.txt b/forge-gui/res/cardsfolder/s/short_sword.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/short_sword.txt rename to forge-gui/res/cardsfolder/s/short_sword.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skittering_surveyor.txt b/forge-gui/res/cardsfolder/s/skittering_surveyor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skittering_surveyor.txt rename to forge-gui/res/cardsfolder/s/skittering_surveyor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/slimefoot_the_stowaway.txt b/forge-gui/res/cardsfolder/s/slimefoot_the_stowaway.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/slimefoot_the_stowaway.txt rename to forge-gui/res/cardsfolder/s/slimefoot_the_stowaway.txt diff --git a/forge-gui/res/cardsfolder/upcoming/slinn_voda_the_rising_deep.txt b/forge-gui/res/cardsfolder/s/slinn_voda_the_rising_deep.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/slinn_voda_the_rising_deep.txt rename to forge-gui/res/cardsfolder/s/slinn_voda_the_rising_deep.txt diff --git a/forge-gui/res/cardsfolder/upcoming/song_of_freyalise.txt b/forge-gui/res/cardsfolder/s/song_of_freyalise.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/song_of_freyalise.txt rename to forge-gui/res/cardsfolder/s/song_of_freyalise.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sorcerers_wand.txt b/forge-gui/res/cardsfolder/s/sorcerers_wand.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sorcerers_wand.txt rename to forge-gui/res/cardsfolder/s/sorcerers_wand.txt diff --git a/forge-gui/res/cardsfolder/upcoming/soul_salvage.txt b/forge-gui/res/cardsfolder/s/soul_salvage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/soul_salvage.txt rename to forge-gui/res/cardsfolder/s/soul_salvage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sparring_construct.txt b/forge-gui/res/cardsfolder/s/sparring_construct.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sparring_construct.txt rename to forge-gui/res/cardsfolder/s/sparring_construct.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spore_swarm.txt b/forge-gui/res/cardsfolder/s/spore_swarm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spore_swarm.txt rename to forge-gui/res/cardsfolder/s/spore_swarm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sporecrown_thallid.txt b/forge-gui/res/cardsfolder/s/sporecrown_thallid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sporecrown_thallid.txt rename to forge-gui/res/cardsfolder/s/sporecrown_thallid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/squee_the_immortal.txt b/forge-gui/res/cardsfolder/s/squee_the_immortal.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/squee_the_immortal.txt rename to forge-gui/res/cardsfolder/s/squee_the_immortal.txt diff --git a/forge-gui/res/cardsfolder/upcoming/steel_leaf_champion.txt b/forge-gui/res/cardsfolder/s/steel_leaf_champion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/steel_leaf_champion.txt rename to forge-gui/res/cardsfolder/s/steel_leaf_champion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/stronghold_confessor.txt b/forge-gui/res/cardsfolder/s/stronghold_confessor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/stronghold_confessor.txt rename to forge-gui/res/cardsfolder/s/stronghold_confessor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sylvan_awakening.txt b/forge-gui/res/cardsfolder/s/sylvan_awakening.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sylvan_awakening.txt rename to forge-gui/res/cardsfolder/s/sylvan_awakening.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tatyova_benthic_druid.txt b/forge-gui/res/cardsfolder/t/tatyova_benthic_druid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tatyova_benthic_druid.txt rename to forge-gui/res/cardsfolder/t/tatyova_benthic_druid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/teferi_hero_of_dominaria.txt b/forge-gui/res/cardsfolder/t/teferi_hero_of_dominaria.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/teferi_hero_of_dominaria.txt rename to forge-gui/res/cardsfolder/t/teferi_hero_of_dominaria.txt diff --git a/forge-gui/res/cardsfolder/upcoming/teferi_timebender.txt b/forge-gui/res/cardsfolder/t/teferi_timebender.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/teferi_timebender.txt rename to forge-gui/res/cardsfolder/t/teferi_timebender.txt diff --git a/forge-gui/res/cardsfolder/upcoming/teferis_sentinel.txt b/forge-gui/res/cardsfolder/t/teferis_sentinel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/teferis_sentinel.txt rename to forge-gui/res/cardsfolder/t/teferis_sentinel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tempest_djinn.txt b/forge-gui/res/cardsfolder/t/tempest_djinn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tempest_djinn.txt rename to forge-gui/res/cardsfolder/t/tempest_djinn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/temporal_machinations.txt b/forge-gui/res/cardsfolder/t/temporal_machinations.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/temporal_machinations.txt rename to forge-gui/res/cardsfolder/t/temporal_machinations.txt diff --git a/forge-gui/res/cardsfolder/upcoming/territorial_allosaurus.txt b/forge-gui/res/cardsfolder/t/territorial_allosaurus.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/territorial_allosaurus.txt rename to forge-gui/res/cardsfolder/t/territorial_allosaurus.txt diff --git a/forge-gui/res/cardsfolder/upcoming/teshar_ancestors_apostle.txt b/forge-gui/res/cardsfolder/t/teshar_ancestors_apostle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/teshar_ancestors_apostle.txt rename to forge-gui/res/cardsfolder/t/teshar_ancestors_apostle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tetsuko_umezawa_fugitive.txt b/forge-gui/res/cardsfolder/t/tetsuko_umezawa_fugitive.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tetsuko_umezawa_fugitive.txt rename to forge-gui/res/cardsfolder/t/tetsuko_umezawa_fugitive.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thallid_omnivore.txt b/forge-gui/res/cardsfolder/t/thallid_omnivore.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thallid_omnivore.txt rename to forge-gui/res/cardsfolder/t/thallid_omnivore.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thallid_soothsayer.txt b/forge-gui/res/cardsfolder/t/thallid_soothsayer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thallid_soothsayer.txt rename to forge-gui/res/cardsfolder/t/thallid_soothsayer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_antiquities_war.txt b/forge-gui/res/cardsfolder/t/the_antiquities_war.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_antiquities_war.txt rename to forge-gui/res/cardsfolder/t/the_antiquities_war.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_eldest_reborn.txt b/forge-gui/res/cardsfolder/t/the_eldest_reborn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_eldest_reborn.txt rename to forge-gui/res/cardsfolder/t/the_eldest_reborn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_first_eruption.txt b/forge-gui/res/cardsfolder/t/the_first_eruption.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_first_eruption.txt rename to forge-gui/res/cardsfolder/t/the_first_eruption.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_flame_of_keld.txt b/forge-gui/res/cardsfolder/t/the_flame_of_keld.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_flame_of_keld.txt rename to forge-gui/res/cardsfolder/t/the_flame_of_keld.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_mending_of_dominaria.txt b/forge-gui/res/cardsfolder/t/the_mending_of_dominaria.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_mending_of_dominaria.txt rename to forge-gui/res/cardsfolder/t/the_mending_of_dominaria.txt diff --git a/forge-gui/res/cardsfolder/upcoming/the_mirari_conjecture.txt b/forge-gui/res/cardsfolder/t/the_mirari_conjecture.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/the_mirari_conjecture.txt rename to forge-gui/res/cardsfolder/t/the_mirari_conjecture.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thran_temporal_gateway.txt b/forge-gui/res/cardsfolder/t/thran_temporal_gateway.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thran_temporal_gateway.txt rename to forge-gui/res/cardsfolder/t/thran_temporal_gateway.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tiana_ships_caretaker.txt b/forge-gui/res/cardsfolder/t/tiana_ships_caretaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tiana_ships_caretaker.txt rename to forge-gui/res/cardsfolder/t/tiana_ships_caretaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/time_of_ice.txt b/forge-gui/res/cardsfolder/t/time_of_ice.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/time_of_ice.txt rename to forge-gui/res/cardsfolder/t/time_of_ice.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tolarian_scholar.txt b/forge-gui/res/cardsfolder/t/tolarian_scholar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tolarian_scholar.txt rename to forge-gui/res/cardsfolder/t/tolarian_scholar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/traxos_scourge_of_kroog.txt b/forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/traxos_scourge_of_kroog.txt rename to forge-gui/res/cardsfolder/t/traxos_scourge_of_kroog.txt diff --git a/forge-gui/res/cardsfolder/upcoming/triumph_of_gerrard.txt b/forge-gui/res/cardsfolder/t/triumph_of_gerrard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/triumph_of_gerrard.txt rename to forge-gui/res/cardsfolder/t/triumph_of_gerrard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/two_headed_giant.txt b/forge-gui/res/cardsfolder/t/two_headed_giant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/two_headed_giant.txt rename to forge-gui/res/cardsfolder/t/two_headed_giant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/untamed_kavu.txt b/forge-gui/res/cardsfolder/u/untamed_kavu.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/untamed_kavu.txt rename to forge-gui/res/cardsfolder/u/untamed_kavu.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unwind.txt b/forge-gui/res/cardsfolder/u/unwind.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unwind.txt rename to forge-gui/res/cardsfolder/u/unwind.txt diff --git a/forge-gui/res/cardsfolder/upcoming/urgoros_the_empty_one.txt b/forge-gui/res/cardsfolder/u/urgoros_the_empty_one.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/urgoros_the_empty_one.txt rename to forge-gui/res/cardsfolder/u/urgoros_the_empty_one.txt diff --git a/forge-gui/res/cardsfolder/upcoming/urzas_ruinous_blast.txt b/forge-gui/res/cardsfolder/u/urzas_ruinous_blast.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/urzas_ruinous_blast.txt rename to forge-gui/res/cardsfolder/u/urzas_ruinous_blast.txt diff --git a/forge-gui/res/cardsfolder/upcoming/urzas_tome.txt b/forge-gui/res/cardsfolder/u/urzas_tome.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/urzas_tome.txt rename to forge-gui/res/cardsfolder/u/urzas_tome.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aesthir_glider.txt b/forge-gui/res/cardsfolder/upcoming/aesthir_glider.txt deleted file mode 100644 index 3def1fbf6a5..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/aesthir_glider.txt +++ /dev/null @@ -1,7 +0,0 @@ -Name:Aesthir Glider -ManaCost:3 -Types:Artifact Creature Bird Construct -PT:2/1 -K:Flying -K:CARDNAME can't block. -Oracle:Flying\nAesthir Glider can't block. diff --git a/forge-gui/res/cardsfolder/upcoming/valduk_keeper_of_the_flame.txt b/forge-gui/res/cardsfolder/v/valduk_keeper_of_the_flame.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/valduk_keeper_of_the_flame.txt rename to forge-gui/res/cardsfolder/v/valduk_keeper_of_the_flame.txt diff --git a/forge-gui/res/cardsfolder/upcoming/verix_bladewing.txt b/forge-gui/res/cardsfolder/v/verix_bladewing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/verix_bladewing.txt rename to forge-gui/res/cardsfolder/v/verix_bladewing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vicious_offering.txt b/forge-gui/res/cardsfolder/v/vicious_offering.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vicious_offering.txt rename to forge-gui/res/cardsfolder/v/vicious_offering.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vodalian_arcanist.txt b/forge-gui/res/cardsfolder/v/vodalian_arcanist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vodalian_arcanist.txt rename to forge-gui/res/cardsfolder/v/vodalian_arcanist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voltaic_servant.txt b/forge-gui/res/cardsfolder/v/voltaic_servant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voltaic_servant.txt rename to forge-gui/res/cardsfolder/v/voltaic_servant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/warcry_phoenix.txt b/forge-gui/res/cardsfolder/w/warcry_phoenix.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/warcry_phoenix.txt rename to forge-gui/res/cardsfolder/w/warcry_phoenix.txt diff --git a/forge-gui/res/cardsfolder/upcoming/warlords_fury.txt b/forge-gui/res/cardsfolder/w/warlords_fury.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/warlords_fury.txt rename to forge-gui/res/cardsfolder/w/warlords_fury.txt diff --git a/forge-gui/res/cardsfolder/upcoming/weatherlight.txt b/forge-gui/res/cardsfolder/w/weatherlight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/weatherlight.txt rename to forge-gui/res/cardsfolder/w/weatherlight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/weight_of_memory.txt b/forge-gui/res/cardsfolder/w/weight_of_memory.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/weight_of_memory.txt rename to forge-gui/res/cardsfolder/w/weight_of_memory.txt diff --git a/forge-gui/res/cardsfolder/upcoming/whisper_blood_liturgist.txt b/forge-gui/res/cardsfolder/w/whisper_blood_liturgist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/whisper_blood_liturgist.txt rename to forge-gui/res/cardsfolder/w/whisper_blood_liturgist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wild_onslaught.txt b/forge-gui/res/cardsfolder/w/wild_onslaught.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wild_onslaught.txt rename to forge-gui/res/cardsfolder/w/wild_onslaught.txt diff --git a/forge-gui/res/cardsfolder/upcoming/windgrace_acolyte.txt b/forge-gui/res/cardsfolder/w/windgrace_acolyte.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/windgrace_acolyte.txt rename to forge-gui/res/cardsfolder/w/windgrace_acolyte.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wizards_lightning.txt b/forge-gui/res/cardsfolder/w/wizards_lightning.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wizards_lightning.txt rename to forge-gui/res/cardsfolder/w/wizards_lightning.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wizards_retort.txt b/forge-gui/res/cardsfolder/w/wizards_retort.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wizards_retort.txt rename to forge-gui/res/cardsfolder/w/wizards_retort.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yargle_glutton_of_urborg.txt b/forge-gui/res/cardsfolder/y/yargle_glutton_of_urborg.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yargle_glutton_of_urborg.txt rename to forge-gui/res/cardsfolder/y/yargle_glutton_of_urborg.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yavimaya_sapherd.txt b/forge-gui/res/cardsfolder/y/yavimaya_sapherd.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yavimaya_sapherd.txt rename to forge-gui/res/cardsfolder/y/yavimaya_sapherd.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yawgmoths_vile_offering.txt b/forge-gui/res/cardsfolder/y/yawgmoths_vile_offering.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yawgmoths_vile_offering.txt rename to forge-gui/res/cardsfolder/y/yawgmoths_vile_offering.txt diff --git a/forge-gui/res/cardsfolder/upcoming/zahid_djinn_of_the_lamp.txt b/forge-gui/res/cardsfolder/z/zahid_djinn_of_the_lamp.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/zahid_djinn_of_the_lamp.txt rename to forge-gui/res/cardsfolder/z/zahid_djinn_of_the_lamp.txt diff --git a/forge-gui/res/cardsfolder/upcoming/zhalfirin_void.txt b/forge-gui/res/cardsfolder/z/zhalfirin_void.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/zhalfirin_void.txt rename to forge-gui/res/cardsfolder/z/zhalfirin_void.txt diff --git a/forge-gui/tools/migrateUpcoming.py b/forge-gui/tools/migrateUpcoming.py index 5204d124292..482e2469934 100644 --- a/forge-gui/tools/migrateUpcoming.py +++ b/forge-gui/tools/migrateUpcoming.py @@ -6,8 +6,12 @@ upcoming = os.path.join(cardsfolder, 'upcoming') for dirName, subdirList, fileList in os.walk(upcoming): for filename in fileList: - if filename.startswith(".") + if filename.startswith("."): continue curLocation = os.path.join(upcoming, filename) newFile = os.path.join(cardsfolder, filename[0], filename) - subprocess.call('git mv %s %s' % (curLocation, newFile), shell=True) \ No newline at end of file + + if os.path.exists(newFile): + subprocess.call('git rm %s' % (newFile), shell=True) + else: + subprocess.call('git mv %s %s' % (curLocation, newFile), shell=True) \ No newline at end of file