forked from Card-Forge/forge
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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>
DSK 10 Room cards
these card should be replaced or create a custom card for adventure mode Power Struggle, Necropolis of Azar
Edition updates: SLD
Fix Primo the Indivisible token
Aerie Typo Fix
Add Rampaging Soulrager
Edition updates: YDSK
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.