Merge branch 'migrate-kaldheim' into 'master'

Browse Source

Migrate Kaldheim from Upcoming

See merge request core-developers/forge!3788

...

This commit is contained in:

Sol

2021-02-09 02:12:14 +00:00

parent 78a76d0f86 c88fd07acd

commit 0f38e714ec

299 changed files with 0 additions and 6 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/absorb_identity.txt → forge-gui/res/cardsfolder/a/absorb_identity.txt

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

forge-gui/res/cardsfolder/upcoming/draugr_thought-thief.txt → forge-gui/res/cardsfolder/d/draugr_thought-thief.txt

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

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