Merge branch 'migratecmr' into 'master'

Browse Source

migrate CMR (and un stuff that was put in Upcoming)

See merge request core-developers/forge!3497

...

This commit is contained in:

Tim Mocny

2020-12-08 00:55:17 +00:00

parent 81954d658c 8e40a9dd23

commit 6fff0ffb02

188 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

forge-gui/res/cardsfolder/upcoming/abomination_of_llanowar.txt → forge-gui/res/cardsfolder/a/abomination_of_llanowar.txt

0

forge-gui/res/cardsfolder/upcoming/aesi_tyrant_of_gyre_strait.txt → forge-gui/res/cardsfolder/a/aesi_tyrant_of_gyre_strait.txt

0

forge-gui/res/cardsfolder/upcoming/akroma_vision_of_ixidor.txt → forge-gui/res/cardsfolder/a/akroma_vision_of_ixidor.txt

0

forge-gui/res/cardsfolder/upcoming/akromas_will.txt → forge-gui/res/cardsfolder/a/akromas_will.txt

0

forge-gui/res/cardsfolder/upcoming/alena_kessig_trapper.txt → forge-gui/res/cardsfolder/a/alena_kessig_trapper.txt

0

forge-gui/res/cardsfolder/upcoming/alharu_solemn_ritualist.txt → forge-gui/res/cardsfolder/a/alharu_solemn_ritualist.txt

0

forge-gui/res/cardsfolder/upcoming/amareth_the_lustrous.txt → forge-gui/res/cardsfolder/a/amareth_the_lustrous.txt

0

forge-gui/res/cardsfolder/upcoming/amateur_auteur.txt → forge-gui/res/cardsfolder/a/amateur_auteur.txt

0

forge-gui/res/cardsfolder/upcoming/amphin_mutineer.txt → forge-gui/res/cardsfolder/a/amphin_mutineer.txt

0

forge-gui/res/cardsfolder/upcoming/anara_wolvid_familiar.txt → forge-gui/res/cardsfolder/a/anara_wolvid_familiar.txt

0

forge-gui/res/cardsfolder/upcoming/annoyed_altisaur.txt → forge-gui/res/cardsfolder/a/annoyed_altisaur.txt

0

forge-gui/res/cardsfolder/upcoming/anointer_of_valor.txt → forge-gui/res/cardsfolder/a/anointer_of_valor.txt

0

forge-gui/res/cardsfolder/upcoming/apex_devastator.txt → forge-gui/res/cardsfolder/a/apex_devastator.txt

0

forge-gui/res/cardsfolder/upcoming/araumi_of_the_dead_tide.txt → forge-gui/res/cardsfolder/a/araumi_of_the_dead_tide.txt

0

forge-gui/res/cardsfolder/upcoming/archelos_lagoon_mystic.txt → forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt

0

forge-gui/res/cardsfolder/upcoming/archon_of_coronation.txt → forge-gui/res/cardsfolder/a/archon_of_coronation.txt

0

forge-gui/res/cardsfolder/upcoming/ardenn_intrepid_archaeologist.txt → forge-gui/res/cardsfolder/a/ardenn_intrepid_archaeologist.txt

0

forge-gui/res/cardsfolder/upcoming/armix_filigree_thrasher.txt → forge-gui/res/cardsfolder/a/armix_filigree_thrasher.txt

0

forge-gui/res/cardsfolder/upcoming/armored_skyhunter.txt → forge-gui/res/cardsfolder/a/armored_skyhunter.txt

0

forge-gui/res/cardsfolder/upcoming/aurora_phoenix.txt → forge-gui/res/cardsfolder/a/aurora_phoenix.txt

0

forge-gui/res/cardsfolder/upcoming/averna_the_chaos_bloom.txt → forge-gui/res/cardsfolder/a/averna_the_chaos_bloom.txt

0

forge-gui/res/cardsfolder/upcoming/azure_fleet_admiral.txt → forge-gui/res/cardsfolder/a/azure_fleet_admiral.txt

0

forge-gui/res/cardsfolder/upcoming/beast_in_show.txt → forge-gui/res/cardsfolder/b/beast_in_show.txt

0

forge-gui/res/cardsfolder/upcoming/belbe_corrupted_observer.txt → forge-gui/res/cardsfolder/b/belbe_corrupted_observer.txt

0

forge-gui/res/cardsfolder/upcoming/bell_borca_spectral_sergeant.txt → forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt

0

forge-gui/res/cardsfolder/upcoming/benevolent_blessing.txt → forge-gui/res/cardsfolder/b/benevolent_blessing.txt

0

forge-gui/res/cardsfolder/upcoming/biowaste_blob.txt → forge-gui/res/cardsfolder/b/biowaste_blob.txt

0

forge-gui/res/cardsfolder/upcoming/bladegriff_prototype.txt → forge-gui/res/cardsfolder/b/bladegriff_prototype.txt

0

forge-gui/res/cardsfolder/upcoming/blast_from_the_past.txt → forge-gui/res/cardsfolder/b/blast_from_the_past.txt

0

forge-gui/res/cardsfolder/upcoming/blazing_sunsteel.txt → forge-gui/res/cardsfolder/b/blazing_sunsteel.txt

0

forge-gui/res/cardsfolder/upcoming/blim_comedic_genius.txt → forge-gui/res/cardsfolder/b/blim_comedic_genius.txt

0

forge-gui/res/cardsfolder/upcoming/boarding_party.txt → forge-gui/res/cardsfolder/b/boarding_party.txt

0

forge-gui/res/cardsfolder/upcoming/body_of_knowledge.txt → forge-gui/res/cardsfolder/b/body_of_knowledge.txt

0

forge-gui/res/cardsfolder/upcoming/breeches_brazen_plunderer.txt → forge-gui/res/cardsfolder/b/breeches_brazen_plunderer.txt

0

forge-gui/res/cardsfolder/upcoming/briarblade_adept.txt → forge-gui/res/cardsfolder/b/briarblade_adept.txt

0

forge-gui/res/cardsfolder/upcoming/brinelin_the_moon_kraken.txt → forge-gui/res/cardsfolder/b/brinelin_the_moon_kraken.txt

0

forge-gui/res/cardsfolder/upcoming/captain_vargus_wrath.txt → forge-gui/res/cardsfolder/c/captain_vargus_wrath.txt

0

forge-gui/res/cardsfolder/upcoming/clambassadors.txt → forge-gui/res/cardsfolder/c/clambassadors.txt

0

forge-gui/res/cardsfolder/upcoming/coastline_marauders.txt → forge-gui/res/cardsfolder/c/coastline_marauders.txt

0

forge-gui/res/cardsfolder/upcoming/coercive_recruiter.txt → forge-gui/res/cardsfolder/c/coercive_recruiter.txt

0

forge-gui/res/cardsfolder/upcoming/colfenor_the_last_yew.txt → forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt

0

forge-gui/res/cardsfolder/upcoming/commanders_plate.txt → forge-gui/res/cardsfolder/c/commanders_plate.txt

0

forge-gui/res/cardsfolder/upcoming/court_of_ambition.txt → forge-gui/res/cardsfolder/c/court_of_ambition.txt

0

forge-gui/res/cardsfolder/upcoming/court_of_bounty.txt → forge-gui/res/cardsfolder/c/court_of_bounty.txt

0

forge-gui/res/cardsfolder/upcoming/court_of_cunning.txt → forge-gui/res/cardsfolder/c/court_of_cunning.txt

0

forge-gui/res/cardsfolder/upcoming/court_of_grace.txt → forge-gui/res/cardsfolder/c/court_of_grace.txt

0

forge-gui/res/cardsfolder/upcoming/court_of_ire.txt → forge-gui/res/cardsfolder/c/court_of_ire.txt

0

forge-gui/res/cardsfolder/upcoming/crimson_fleet_commodore.txt → forge-gui/res/cardsfolder/c/crimson_fleet_commodore.txt

0

forge-gui/res/cardsfolder/upcoming/crow_storm.txt → forge-gui/res/cardsfolder/c/crow_storm.txt

0

forge-gui/res/cardsfolder/upcoming/curious_killbot.txt → forge-gui/res/cardsfolder/c/curious_killbot.txt

0

forge-gui/res/cardsfolder/upcoming/dargo_the_shipwrecker.txt → forge-gui/res/cardsfolder/d/dargo_the_shipwrecker.txt

0

forge-gui/res/cardsfolder/upcoming/dawnblade_regent.txt → forge-gui/res/cardsfolder/d/dawnblade_regent.txt

0

forge-gui/res/cardsfolder/upcoming/delighted_killbot.txt → forge-gui/res/cardsfolder/d/delighted_killbot.txt

0

forge-gui/res/cardsfolder/upcoming/demonic_lore.txt → forge-gui/res/cardsfolder/d/demonic_lore.txt

0

forge-gui/res/cardsfolder/upcoming/despondent_killbot.txt → forge-gui/res/cardsfolder/d/despondent_killbot.txt

0

forge-gui/res/cardsfolder/upcoming/distract.txt → forge-gui/res/cardsfolder/d/distract.txt

0

forge-gui/res/cardsfolder/upcoming/drake_stone.txt → forge-gui/res/cardsfolder/d/drake_stone.txt

0

forge-gui/res/cardsfolder/upcoming/earl_of_squirrel.txt → forge-gui/res/cardsfolder/e/earl_of_squirrel.txt

0

forge-gui/res/cardsfolder/upcoming/eligeth_crossroads_augur.txt → forge-gui/res/cardsfolder/e/eligeth_crossroads_augur.txt

0

forge-gui/res/cardsfolder/upcoming/elvish_doomsayer.txt → forge-gui/res/cardsfolder/e/elvish_doomsayer.txt

0

forge-gui/res/cardsfolder/upcoming/elvish_dreadlord.txt → forge-gui/res/cardsfolder/e/elvish_dreadlord.txt

0

forge-gui/res/cardsfolder/upcoming/emberwilde_captain.txt → forge-gui/res/cardsfolder/e/emberwilde_captain.txt

0

forge-gui/res/cardsfolder/upcoming/enraged_killbot.txt → forge-gui/res/cardsfolder/e/enraged_killbot.txt

0

forge-gui/res/cardsfolder/upcoming/enthrall.txt → forge-gui/res/cardsfolder/e/enthrall.txt

0

forge-gui/res/cardsfolder/upcoming/esior_wardwing_familiar.txt → forge-gui/res/cardsfolder/e/esior_wardwing_familiar.txt

0

forge-gui/res/cardsfolder/upcoming/explosion_of_riches.txt → forge-gui/res/cardsfolder/e/explosion_of_riches.txt

0

forge-gui/res/cardsfolder/upcoming/exquisite_huntmaster.txt → forge-gui/res/cardsfolder/e/exquisite_huntmaster.txt

0

forge-gui/res/cardsfolder/upcoming/eyeblight_cullers.txt → forge-gui/res/cardsfolder/e/eyeblight_cullers.txt

0

forge-gui/res/cardsfolder/upcoming/fall_from_favor.txt → forge-gui/res/cardsfolder/f/fall_from_favor.txt

0

forge-gui/res/cardsfolder/upcoming/falthis_shadowcat_familiar.txt → forge-gui/res/cardsfolder/f/falthis_shadowcat_familiar.txt

0

forge-gui/res/cardsfolder/upcoming/fathom_fleet_swordjack.txt → forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt

0

forge-gui/res/cardsfolder/upcoming/feast_of_succession.txt → forge-gui/res/cardsfolder/f/feast_of_succession.txt

0

forge-gui/res/cardsfolder/upcoming/fin_clade_fugitives.txt → forge-gui/res/cardsfolder/f/fin_clade_fugitives.txt

0

forge-gui/res/cardsfolder/upcoming/flamekin_herald.txt → forge-gui/res/cardsfolder/f/flamekin_herald.txt

0

forge-gui/res/cardsfolder/upcoming/forceful_denial.txt → forge-gui/res/cardsfolder/f/forceful_denial.txt

0

forge-gui/res/cardsfolder/upcoming/form_of_the_squirrel.txt → forge-gui/res/cardsfolder/f/form_of_the_squirrel.txt

0

forge-gui/res/cardsfolder/upcoming/frenzied_saddlebrute.txt → forge-gui/res/cardsfolder/f/frenzied_saddlebrute.txt

0

forge-gui/res/cardsfolder/upcoming/ghen_arcanum_weaver.txt → forge-gui/res/cardsfolder/g/ghen_arcanum_weaver.txt

0

forge-gui/res/cardsfolder/upcoming/ghost_of_ramirez_depietro.txt → forge-gui/res/cardsfolder/g/ghost_of_ramirez_depietro.txt

0

forge-gui/res/cardsfolder/upcoming/gilanra_caller_of_wirewood.txt → forge-gui/res/cardsfolder/g/gilanra_caller_of_wirewood.txt

0

forge-gui/res/cardsfolder/upcoming/glacian_powerstone_engineer.txt → forge-gui/res/cardsfolder/g/glacian_powerstone_engineer.txt

0

forge-gui/res/cardsfolder/upcoming/gnostro_voice_of_the_crags.txt → forge-gui/res/cardsfolder/g/gnostro_voice_of_the_crags.txt

0

forge-gui/res/cardsfolder/upcoming/gor_muldrak_amphinologist.txt → forge-gui/res/cardsfolder/g/gor_muldrak_amphinologist.txt

0

forge-gui/res/cardsfolder/upcoming/guildless_commons.txt → forge-gui/res/cardsfolder/g/guildless_commons.txt

0

forge-gui/res/cardsfolder/upcoming/halana_kessig_ranger.txt → forge-gui/res/cardsfolder/h/halana_kessig_ranger.txt

0

forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt → forge-gui/res/cardsfolder/h/hamza_guardian_of_arashin.txt

0

forge-gui/res/cardsfolder/upcoming/hans_eriksson.txt → forge-gui/res/cardsfolder/h/hans_eriksson.txt

0

forge-gui/res/cardsfolder/upcoming/hellkite_courser.txt → forge-gui/res/cardsfolder/h/hellkite_courser.txt

0

forge-gui/res/cardsfolder/upcoming/horizon_stone.txt → forge-gui/res/cardsfolder/h/horizon_stone.txt

0

forge-gui/res/cardsfolder/upcoming/hullbreacher.txt → forge-gui/res/cardsfolder/h/hullbreacher.txt

0

forge-gui/res/cardsfolder/upcoming/ich_tekik_salvage_splicer.txt → forge-gui/res/cardsfolder/i/ich_tekik_salvage_splicer.txt

0

forge-gui/res/cardsfolder/upcoming/imoti_celebrant_of_bounty.txt → forge-gui/res/cardsfolder/i/imoti_celebrant_of_bounty.txt

0

forge-gui/res/cardsfolder/upcoming/impulsive_pilferer.txt → forge-gui/res/cardsfolder/i/impulsive_pilferer.txt

0

forge-gui/res/cardsfolder/upcoming/ingenuity_engine.txt → forge-gui/res/cardsfolder/i/ingenuity_engine.txt

0

forge-gui/res/cardsfolder/upcoming/jackknight.txt → forge-gui/res/cardsfolder/j/jackknight.txt

0

forge-gui/res/cardsfolder/upcoming/jared_carthalion_true_heir.txt → forge-gui/res/cardsfolder/j/jared_carthalion_true_heir.txt

0

forge-gui/res/cardsfolder/upcoming/jeska_thrice_reborn.txt → forge-gui/res/cardsfolder/j/jeska_thrice_reborn.txt

0

forge-gui/res/cardsfolder/upcoming/jeskas_will.txt → forge-gui/res/cardsfolder/j/jeskas_will.txt

0

forge-gui/res/cardsfolder/upcoming/jeweled_lotus.txt → forge-gui/res/cardsfolder/j/jeweled_lotus.txt

0

forge-gui/res/cardsfolder/upcoming/juri_master_of_the_revue.txt → forge-gui/res/cardsfolder/j/juri_master_of_the_revue.txt

Some files were not shown because too many files have changed in this diff Show More