Merge remote-tracking branch 'core/master'

Browse Source

...

This commit is contained in:

Anthony Calosa

2022-03-04 22:32:03 +08:00

parent 7c395f5363 2fb0fef4c7

commit a9c3d43e94

322 changed files with 190 additions and 9 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/access_denied.txt → forge-gui/res/cardsfolder/a/access_denied.txt

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

0

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

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