Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into edition_sections branch #1

Merged
merged 50 commits into from
Oct 10, 2024
Merged

Conversation

Ayora29
Copy link
Owner

@Ayora29 Ayora29 commented Oct 10, 2024

No description provided.

kevlahnota and others added 30 commits October 4, 2024 11:33
* Add files via upload

* Update 1996_world_champion.txt

* Add files via upload

* Add files via upload
* Room: First Spell 

----

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
these card should be replaced or create a custom card for adventure mode
Power Struggle, Necropolis of Azar
tehdiplomat and others added 20 commits October 8, 2024 09:07
* Support for icons in dialogs.
Mana abilities show chosen mana via icons.
Thread safety for showOptionDialog

* Ensure EventDispatchThread for showInputDialog

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
* Add I Am Never Alone

* Update i_am_never_alone.txt

* Update i_am_never_alone.txt

---------

Co-authored-by: loperjchris <christopher.loper1990@gmail.com>
* Added Your Plans Mean Nothing

Tested with teammates to ensure that if a teammate is targeted they do not get to draw cards but they do discard their hand.

* Update your_plans_mean_nothing.txt
* Add Demonic Covenant and supporting changes

* Updated changes

* Update demonic_covenant.txt

* Addressing PR comments

---------

Co-authored-by: loperjchris <christopher.loper1990@gmail.com>
* Add Rendmaw Creaking Nest, supporting property numTypes, and black 2/2 bird flying token

* Updated accoring to PR requests

* Update rendmaw_creaking_nest.txt

* Added landplayed trigger

---------

Co-authored-by: loperjchris <christopher.loper1990@gmail.com>
@Ayora29 Ayora29 merged commit 03e2acd into edition_sections Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.