Merge branch 'migrate_global_series' into 'master'

Migrate upcoming for Global Series set See merge request core-developers/forge!661
2025-11-18 11:48:02 +00:00 · 2018-06-21 03:39:48 +00:00
parent f5c119e27c bdc44a4395
commit ce2841b05e
30 changed files with 0 additions and 0 deletions
--- a/forge-gui/res/cardsfolder/upcoming/aggressive_instinct.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aggressive_instinct.txt
--- a/forge-gui/res/cardsfolder/upcoming/ancestor_dragon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ancestor_dragon.txt
--- a/forge-gui/res/cardsfolder/upcoming/armored_whirl_turtle.txt
+++ b/forge-gui/res/cardsfolder/upcoming/armored_whirl_turtle.txt
--- a/forge-gui/res/cardsfolder/upcoming/breath_of_fire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/breath_of_fire.txt
--- a/forge-gui/res/cardsfolder/upcoming/cleansing_screech.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cleansing_screech.txt
--- a/forge-gui/res/cardsfolder/upcoming/colorful_feiyi_sparrow.txt
+++ b/forge-gui/res/cardsfolder/upcoming/colorful_feiyi_sparrow.txt
--- a/forge-gui/res/cardsfolder/upcoming/confidence_from_strength.txt
+++ b/forge-gui/res/cardsfolder/upcoming/confidence_from_strength.txt
--- a/forge-gui/res/cardsfolder/upcoming/dragons_presence.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dragons_presence.txt
--- a/forge-gui/res/cardsfolder/upcoming/drown_in_shapelessness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/drown_in_shapelessness.txt
--- a/forge-gui/res/cardsfolder/upcoming/earth_origin_yak.txt
+++ b/forge-gui/res/cardsfolder/upcoming/earth_origin_yak.txt
--- a/forge-gui/res/cardsfolder/upcoming/earthshaking_si.txt
+++ b/forge-gui/res/cardsfolder/upcoming/earthshaking_si.txt
--- a/forge-gui/res/cardsfolder/upcoming/feiyi_snake.txt
+++ b/forge-gui/res/cardsfolder/upcoming/feiyi_snake.txt
--- a/forge-gui/res/cardsfolder/upcoming/ferocious_zheng.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ferocious_zheng.txt
--- a/forge-gui/res/cardsfolder/upcoming/fire_omen_crane.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fire_omen_crane.txt
--- a/forge-gui/res/cardsfolder/upcoming/hardened_scale_armor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hardened_scale_armor.txt
--- a/forge-gui/res/cardsfolder/upcoming/heavenly_qilin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/heavenly_qilin.txt
--- a/forge-gui/res/cardsfolder/upcoming/jiang_yanggu.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jiang_yanggu.txt
--- a/forge-gui/res/cardsfolder/upcoming/journey_for_the_elixir.txt
+++ b/forge-gui/res/cardsfolder/upcoming/journey_for_the_elixir.txt
--- a/forge-gui/res/cardsfolder/upcoming/leopard_spotted_jiao.txt
+++ b/forge-gui/res/cardsfolder/upcoming/leopard_spotted_jiao.txt
--- a/forge-gui/res/cardsfolder/upcoming/moon_eating_dog.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moon_eating_dog.txt
--- a/forge-gui/res/cardsfolder/upcoming/mu_yanling.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mu_yanling.txt
--- a/forge-gui/res/cardsfolder/upcoming/nine_tail_white_fox.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nine_tail_white_fox.txt
--- a/forge-gui/res/cardsfolder/upcoming/purple_crystal_crab.txt
+++ b/forge-gui/res/cardsfolder/upcoming/purple_crystal_crab.txt
--- a/forge-gui/res/cardsfolder/upcoming/qilins_blessing.txt
+++ b/forge-gui/res/cardsfolder/upcoming/qilins_blessing.txt
--- a/forge-gui/res/cardsfolder/upcoming/reckless_pangolin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/reckless_pangolin.txt
--- a/forge-gui/res/cardsfolder/upcoming/rhythmic_water_vortex.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rhythmic_water_vortex.txt
--- a/forge-gui/res/cardsfolder/upcoming/sacred_white_deer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sacred_white_deer.txt
--- a/forge-gui/res/cardsfolder/upcoming/screeching_phoenix.txt
+++ b/forge-gui/res/cardsfolder/upcoming/screeching_phoenix.txt
--- a/forge-gui/res/cardsfolder/upcoming/stormcloud_spirit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/stormcloud_spirit.txt
--- a/forge-gui/res/cardsfolder/upcoming/vivid_flying_fish.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vivid_flying_fish.txt