Merge branch 'master' into 'master'

Browse Source

Migrate "upcoming" for MH1 in preparation for the upcoming M20 development.

See merge request core-developers/forge!1848

...

This commit is contained in:

Michael Kamensky

2019-06-13 04:05:34 +00:00

parent a14f5269ef 7f3da042ea

commit a85a340312

209 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/abominable_treefolk.txt → forge-gui/res/cardsfolder/a/abominable_treefolk.txt

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

forge-gui/res/cardsfolder/upcoming/kayas_guile.txt → forge-gui/res/cardsfolder/k/kayas_guile.txt

0

forge-gui/res/cardsfolder/upcoming/king_of_the_pride.txt → forge-gui/res/cardsfolder/k/king_of_the_pride.txt

0

forge-gui/res/cardsfolder/upcoming/knight_of_old_benalia.txt → forge-gui/res/cardsfolder/k/knight_of_old_benalia.txt

0

forge-gui/res/cardsfolder/upcoming/lancer_sliver.txt → forge-gui/res/cardsfolder/l/lancer_sliver.txt

0

forge-gui/res/cardsfolder/upcoming/lavabelly_sliver.txt → forge-gui/res/cardsfolder/l/lavabelly_sliver.txt

0

forge-gui/res/cardsfolder/upcoming/lesser_masticore.txt → forge-gui/res/cardsfolder/l/lesser_masticore.txt

0

forge-gui/res/cardsfolder/upcoming/lightning_skelemental.txt → forge-gui/res/cardsfolder/l/lightning_skelemental.txt

0

forge-gui/res/cardsfolder/upcoming/llanowar_tribe.txt → forge-gui/res/cardsfolder/l/llanowar_tribe.txt

0

forge-gui/res/cardsfolder/upcoming/magmatic_sinkhole.txt → forge-gui/res/cardsfolder/m/magmatic_sinkhole.txt

0

forge-gui/res/cardsfolder/upcoming/marit_lages_slumber.txt → forge-gui/res/cardsfolder/m/marit_lages_slumber.txt

0

forge-gui/res/cardsfolder/upcoming/martyrs_soul.txt → forge-gui/res/cardsfolder/m/martyrs_soul.txt

0

forge-gui/res/cardsfolder/upcoming/mind_rake.txt → forge-gui/res/cardsfolder/m/mind_rake.txt

0

forge-gui/res/cardsfolder/upcoming/mirrodin_besieged.txt → forge-gui/res/cardsfolder/m/mirrodin_besieged.txt

0

forge-gui/res/cardsfolder/upcoming/mist_syndicate_naga.txt → forge-gui/res/cardsfolder/m/mist_syndicate_naga.txt

0

forge-gui/res/cardsfolder/upcoming/mob.txt → forge-gui/res/cardsfolder/m/mob.txt

0

forge-gui/res/cardsfolder/upcoming/moonblade_shinobi.txt → forge-gui/res/cardsfolder/m/moonblade_shinobi.txt

0

forge-gui/res/cardsfolder/upcoming/morophon_the_boundless.txt → forge-gui/res/cardsfolder/m/morophon_the_boundless.txt

0

forge-gui/res/cardsfolder/upcoming/mother_bear.txt → forge-gui/res/cardsfolder/m/mother_bear.txt

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