Skip to content

Merge Card-Forge master through #11743 - #80

Merged
delebedev merged 17 commits into
cruciblefrom
sync/upstream-11743
Aug 31, 2026
Merged

Merge Card-Forge master through #11743#80
delebedev merged 17 commits into
cruciblefrom
sync/upstream-11743

Conversation

@delebedev

Copy link
Copy Markdown
Owner

Consumes Card-Forge master through c52c4ba, including the Pump timing and Hashep Oasis fixes.\n\nThe documented research patch set remains intact. PumpAi and TriggerWaiting now match upstream, and the superseded sorcery-tap-pump candidate from #79 is not carried forward.

MostCromulent and others added 17 commits August 28, 2026 16:05
…ard-Forge#11723)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…orge#11700)

* StaticAbilityManaRestriction: better ability for Myr Superion

* remove special None case

* Update StaticAbilityManaRestriction.java

Restrict to just getHostCard

* Update StaticAbilityManaRestriction.java

fix import

* remove ValidSA

* Update hogaak_arisen_necropolis.txt

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: Agetian <stavdev@mail.ru>
Co-authored-by: Agetian <stavdev@mail.ru>
* Refactor render, fix dispose call, add OverlayText

* move screenshot, adventure and classic render on their own class

* update OverlayText, FrameRate, limit Spritebatch capacity

* null check

* unused import
Co-authored-by: tool4EvEr <tool4EvEr@>
@delebedev
delebedev merged commit 6826b22 into crucible Aug 31, 2026
7 checks passed
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.

9 participants