Commit Graph

69691 Commits

Author SHA1 Message Date
Anthony Calosa
b858b48fde remove Collections.synchronized 2024-12-05 16:39:10 +08:00
kevlahnota
d06673e401 Update FCollectionTest.java
prior to the threadsafeiterable restoration
2024-12-05 12:50:53 +08:00
kevlahnota
f637bd970b update check for ItemManagerConfig 2024-12-05 11:49:34 +08:00
kevlahnota
32ba304d11 Update AdventureDeckEditor.java
fix bulk sell menu appearing on other catalogpages
2024-12-05 11:32:45 +08:00
Paul Hammerton
6867a0eaba Merge pull request #6663 from paulsnoops/edition-updates
Edition updates: INR, PIO
2024-12-04 19:32:44 +00:00
Paul Hammerton
9c4333d608 Edition updates: INR, PIO 2024-12-04 19:28:51 +00:00
Agetian
32fc681726 - Add puzzle PS_FDN2. (#6662) 2024-12-04 21:18:18 +03:00
Anthony Calosa
8e16456b2e update comments 2024-12-04 22:12:22 +08:00
Anthony Calosa
36f0021cae revert threadsafeiterable 2024-12-04 22:04:29 +08:00
kevlahnota
a0cad5fa48 fix FCollection (#6657) 2024-12-04 14:45:05 +01:00
Jetz
db2764f1ce Fix Build Errors 2024-12-04 08:27:37 -05:00
Jetz
44cf7dbbea Merge remote-tracking branch 'origin/master' into code-cleanup
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/AiCardMemory.java
#	forge-ai/src/main/java/forge/ai/AiController.java
#	forge-core/src/main/java/forge/card/ICardDatabase.java
#	forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
#	forge-core/src/main/java/forge/util/FileSection.java
#	forge-core/src/main/java/forge/util/collect/FCollection.java
#	forge-game/src/main/java/forge/game/card/CardProperty.java
#	forge-game/src/main/java/forge/game/combat/Combat.java
#	forge-game/src/main/java/forge/game/spellability/SpellAbility.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
#	forge-gui-mobile/src/forge/itemmanager/ItemManager.java
#	forge-gui/src/main/java/forge/deck/DeckgenUtil.java
#	forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
2024-12-04 08:15:30 -05:00
Chris H
a337fd2aed Pay cost verbiage 2024-12-03 21:55:54 -05:00
Paul Hammerton
9fc971c2fb Merge pull request #6659 from paulsnoops/pio_formats
Add PIO to Explorer, Historic & Timeless formats
2024-12-03 09:38:39 +00:00
Paul Hammerton
22ed570cb9 Merge pull request #6658 from paulsnoops/edition-updates
Edition updates: PF25, PIO, PMEI
2024-12-03 09:34:34 +00:00
Paul Hammerton
14ef18ae96 Add PIO to Explorer, Historic & Timeless formats 2024-12-03 09:34:25 +00:00
Paul Hammerton
a94dc8d94f Edition updates: PF25, PIO, PMEI 2024-12-03 09:27:41 +00:00
tool4EvEr
e6deda205c Fully unlocked room traits should still be the same (for once per turn) 2024-12-03 06:30:16 +01:00
tool4ever
739a4ef0bd Fix RollDice (#6653) 2024-12-02 20:44:11 +00:00
tool4ever
560f660925 Update revitalizing_repast_old_growth_grove.txt 2024-12-02 12:51:51 +00:00
tool4ever
ecd2577770 Update embereth_veteran.txt 2024-12-02 12:50:50 +00:00
tool4ever
eb2a584f68 Update treetop_snarespinner.txt 2024-12-02 12:44:34 +00:00
tool4ever
b0fdd39371 Update touch_of_moonglove.txt 2024-12-02 12:43:51 +00:00
tool4ever
c88bdc2e1d Update protect_serve.txt 2024-12-02 12:42:14 +00:00
tool4ever
5008c519a1 Update pollen_shield_hare_hare_raising.txt 2024-12-02 12:28:19 +00:00
kevlahnota
b1c754499d Merge pull request #6651 from kevlahnota/master2
enable timeout on chooseSpellAbilityToPlayFromList
2024-12-02 10:13:17 +08:00
Anthony Calosa
d733b8933e enable timeout on chooseSpellAbilityToPlayFromList 2024-12-02 10:10:00 +08:00
kevlahnota
d1d14c196a Merge pull request #6650 from kevlahnota/master2
prevent crash on Android 11 and below
2024-12-02 09:55:46 +08:00
Anthony Calosa
e8a6d4ce92 prevent crash on Android 11 and below
Completablefuture -> completeOnTimeout
2024-12-02 09:44:29 +08:00
Hans Mackowiak
53541e8f5f Update remove-stale-branches.yml (#6645) 2024-12-01 08:54:58 +01:00
kevlahnota
23d0868e0a Merge pull request #6577 from Card-Forge/AI_ATTACK_TIMEOUT
AI Attack & getSpellAbilityToPlay Timeout
2024-12-01 13:12:24 +08:00
kevlahnota
c6c55a5a6a Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-12-01 12:12:31 +08:00
tool4ever
4fb110939a Update commander_liara_portyr.txt 2024-11-30 19:31:26 +00:00
tool4ever
947d19078b Fix cheating class level 3 by copying level 2 activation (#6643) 2024-11-29 12:22:23 +01:00
tool4ever
4b1ca2449c Update mana_drain.txt 2024-11-29 12:21:08 +01:00
Agetian
143e3c8c75 - Add new genetic decks for Standard and Modern as of November 2024. (#6647) 2024-11-29 13:13:11 +03:00
Ayora29
115276fa56 Update draftable edition sections (#6631)
* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix art index when parsing edition files sections
Add "scheme" section
Add fallback sheet in BoosterGenerator
Rewrite FileSection and Use LinkedHashMap for sections map

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Fix edition txt files

* Convert MKM to BoosterSlots

* Rename "RareMythic" section

* Remove conjured cards that do not have unique artwork.

* Restore basic land order

* Fixes

* parseSections : Fix Index out of bounds error for empty file

* FileSection.java : use for loop instead of do/while

---------

Co-authored-by: Agetian <stavdev@mail.ru>
2024-11-29 12:15:11 +03:00
Paul Hammerton
593af10942 Merge pull request #6644 from Agetian/lda-fdn
LDA update for current Standard & Modern formats
2024-11-28 23:23:03 +00:00
kevlahnota
486e8d37b5 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-29 06:03:51 +08:00
kevlahnota
5b183f5a06 update check for internet
- closes #6640
2024-11-29 05:55:28 +08:00
tool4ever
ea8fb23e9b Update lunar_insight.txt 2024-11-28 21:01:19 +00:00
Agetian
a8caee3b10 Merge branch 'master' into lda-fdn 2024-11-28 21:29:12 +03:00
Agetian
4c87dce4e9 - Update LDA deckgen info for the current Standard and Modern formats. 2024-11-28 21:28:44 +03:00
Agetian
9878544b5a - Kayla's Reconstruction AI hint. (#6642) 2024-11-28 20:56:55 +03:00
Agetian
da46cf785e - Kayla's Reconstruction AI hint. 2024-11-28 20:56:16 +03:00
Myyk Seok
535f175864 Alphabetically sort MTGO Cubes so they are easier to find (#6201)
* chore: move files to be alphabetically sorted

* feat: make the alphabetically stored cube contents match the new file names

* fix: cube name typo in MTGO Legacy Cube 2017-01

---------

Co-authored-by: Agetian <stavdev@mail.ru>
2024-11-28 18:04:37 +03:00
Hans Mackowiak
ad3044133c Class level ai (#6641)
* ClassLevelAi: add first logic

* Update ClassLevelUpAi.java

Check for ClassLevelGained Trigger

* Update ClassLevelUpAi.java

~ fix import
2024-11-28 17:59:18 +03:00
kevlahnota
3971d53746 Update TextRenderer.java
fix symbol out of bounds
2024-11-28 20:00:17 +08:00
Paul Hammerton
1bee1a498f Merge pull request #6639 from paulsnoops/edition-updates
Edition updates: PIO, PMEI, SLD
2024-11-28 09:57:39 +00:00
Paul Hammerton
877fb992c5 Edition updates: PIO, PMEI, SLD 2024-11-28 09:54:10 +00:00