kevlahnota
|
c25746b6c4
|
Merge pull request #6550 from kevlahnota/master2
update watermark
|
2024-11-09 10:36:05 +08:00 |
|
Anthony Calosa
|
b130f45fe1
|
update watermark
- show watermark on catalogpage only
|
2024-11-09 10:17:40 +08:00 |
|
Jetz
|
2b5fc37232
|
Remove unused imports
|
2024-11-08 20:02:02 -05:00 |
|
Jetz
|
c6ad1226b0
|
Guava migration - Swap in StreamUtil.stream
|
2024-11-08 19:49:03 -05:00 |
|
Jetz
|
6b7ac1ebef
|
Guava migration - Use Arrays.stream()
|
2024-11-08 19:34:02 -05:00 |
|
Jetz
|
4bbc165460
|
Guava migration - Use .toList()
|
2024-11-08 19:33:45 -05:00 |
|
kevlahnota
|
05b18b34aa
|
Merge pull request #6549 from kevlahnota/master2
fix SealedScreen
|
2024-11-09 08:24:52 +08:00 |
|
Jetz
|
7bb8ccd022
|
Remove unused imports
|
2024-11-08 19:23:28 -05:00 |
|
Jetz
|
c9ba926f45
|
Guava migration - Replace .negate() with Predicate.not(...) in compound predicates.
|
2024-11-08 19:21:25 -05:00 |
|
Anthony Calosa
|
ac15b32f32
|
fix SealedScreen
bind directly the back button to open the LoadSealedScreen on Sealed Editor
|
2024-11-09 08:21:19 +08:00 |
|
Jetz
|
903d636f52
|
Merge remote-tracking branch 'origin/code-cleanup' into code-cleanup
|
2024-11-08 18:41:17 -05:00 |
|
Jetz
|
d6c8e9a692
|
Merge remote-tracking branch 'origin/master' into code-cleanup
# Conflicts:
# forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java
# forge-ai/src/main/java/forge/ai/ability/ScryAi.java
# forge-core/src/main/java/forge/card/DeckHints.java
# forge-core/src/main/java/forge/util/TextUtil.java
# forge-gui-mobile/src/forge/itemmanager/ItemManager.java
# forge-gui/src/main/java/forge/download/AutoUpdater.java
# forge-gui/src/main/java/forge/player/HumanCostDecision.java
|
2024-11-08 18:37:02 -05:00 |
|
kevlahnota
|
f47870a698
|
Update CCombat.java
- closes #6548
|
2024-11-09 06:34:47 +08:00 |
|
Agetian
|
98611a24b7
|
AI for Evolved Sleeper (#6547)
|
2024-11-08 15:10:14 +00:00 |
|
Agetian
|
ee43570ad9
|
- Add FDN planeswalker achievement by Marek. (#6546)
|
2024-11-08 08:07:13 +03:00 |
|
Simisays
|
73c3dd3def
|
Jumpstart 2025 format + new dragon hero sprite + better avatars (#6544)
* update
* Update blocks.txt
* cleanup
|
2024-11-08 07:17:24 +03:00 |
|
kevlahnota
|
b400e612b4
|
Merge pull request #6545 from kevlahnota/master2
fix room choicelist render
|
2024-11-08 10:39:23 +08:00 |
|
Anthony Calosa
|
e9e14360f7
|
fix room choicelist render
|
2024-11-08 10:31:15 +08:00 |
|
Sagar
|
9d2c85f4ee
|
Add back to top button to Wiki (#6427)
* Revamp Readme for more appealing
* revert back to top button only
|
2024-11-07 12:31:46 -05:00 |
|
kevlahnota
|
beb658ae99
|
Update electroduplicate.txt
- closes #6543
|
2024-11-07 14:57:43 +08:00 |
|
kevlahnota
|
216e3df533
|
Merge pull request #6542 from kevlahnota/master2
add confirm to autoSell, update ImageView
|
2024-11-07 14:23:59 +08:00 |
|
Anthony Calosa
|
4abcb0959a
|
Merge branch 'master' into master2
|
2024-11-07 14:02:17 +08:00 |
|
Anthony Calosa
|
2ada458bf5
|
update filter description, add prompt option
|
2024-11-07 13:46:08 +08:00 |
|
Anthony Calosa
|
66e64995e3
|
add confirm dialog to autosell
|
2024-11-07 11:51:06 +08:00 |
|
Anthony Calosa
|
95ca1673b8
|
update ImageView
show NoSell overlay
|
2024-11-07 10:34:34 +08:00 |
|
kevlahnota
|
cd4b2a02e5
|
Merge pull request #6541 from kevlahnota/master2
fix sellAll
|
2024-11-06 23:24:58 +08:00 |
|
Anthony Calosa
|
7f7248f825
|
fix sellAll
|
2024-11-06 23:24:01 +08:00 |
|
Paul Hammerton
|
e7e5f4d9a7
|
Merge pull request #6540 from paulsnoops/master
Edition updates: FDN, J25, PLG24, PMEI
|
2024-11-06 13:41:45 +00:00 |
|
kevlahnota
|
9db592b10a
|
Merge pull request #6539 from kevlahnota/master2
prevent townPriceModifier NPE
|
2024-11-06 21:35:00 +08:00 |
|
Anthony Calosa
|
a8bc8d42e1
|
format
|
2024-11-06 21:30:43 +08:00 |
|
Paul Hammerton
|
eed723bde2
|
Edition updates: FDN, J25, PLG24, PMEI
|
2024-11-06 13:30:37 +00:00 |
|
Anthony Calosa
|
6b31d101db
|
prevent townPriceModifier NPE
|
2024-11-06 21:29:38 +08:00 |
|
kevlahnota
|
a140570752
|
Merge pull request #6538 from kevlahnota/master2
update adventure store/event preview filters
|
2024-11-06 20:15:50 +08:00 |
|
Anthony Calosa
|
e16468ad84
|
Merge branch 'master' into master2
|
2024-11-06 20:11:45 +08:00 |
|
Anthony Calosa
|
d85d00fbfb
|
include ADVENTURE_SIDEBOARD config
|
2024-11-06 20:11:06 +08:00 |
|
Anthony Calosa
|
07d653d99b
|
update adventure store/event preview filters
|
2024-11-06 19:47:33 +08:00 |
|
kevlahnota
|
307cf5a908
|
Merge pull request #6537 from kevlahnota/master2
update format filters for Adventure Deck Editor
|
2024-11-06 13:26:42 +08:00 |
|
Anthony Calosa
|
13eef9434f
|
update filters
|
2024-11-06 13:14:22 +08:00 |
|
Anthony Calosa
|
0a3d2202c0
|
update item manager
|
2024-11-06 12:31:13 +08:00 |
|
Anthony Calosa
|
026913eebe
|
Merge branch 'master' into master2
# Conflicts:
# forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
|
2024-11-06 10:53:31 +08:00 |
|
kevlahnota
|
e59368422e
|
update translation, remove duplicate single quote
|
2024-11-05 21:33:47 -05:00 |
|
Chris H
|
9f07bc9a98
|
Return false instead of throw if an illegal draft choice is made
|
2024-11-05 21:33:47 -05:00 |
|
Anthony Calosa
|
eb3b620858
|
update adventure editor default itemConfig
|
2024-11-06 06:10:22 +08:00 |
|
Anthony Calosa
|
a242f1fe04
|
update format filters for Adventure Deck Editor
use FormatFilter to filter Collections, AutoSell and NoSell cards
|
2024-11-05 22:56:47 +08:00 |
|
Paul Hammerton
|
fe52690f17
|
Merge pull request #6536 from paulsnoops/fix-fdn-edition
Fix FDN edition for boosters
|
2024-11-05 10:31:55 +00:00 |
|
Paul Hammerton
|
fa63d99d05
|
Fix FDN edition for boosters
|
2024-11-05 10:23:23 +00:00 |
|
Paul Hammerton
|
bb2b73d66f
|
Merge pull request #6535 from paulsnoops/edition-updates
Edition updates: FDN
|
2024-11-05 09:39:41 +00:00 |
|
Paul Hammerton
|
d189a03550
|
Edition updates: FDN
|
2024-11-05 09:34:33 +00:00 |
|
Hans Mackowiak
|
a037532cb6
|
Merge pull request #6533 from Card-Forge/fdn-new-release
Fdn edition stuff
|
2024-11-05 09:51:58 +01:00 |
|
kevlahnota
|
e9ad6ef63e
|
Merge pull request #6534 from kevlahnota/master2
reuse headerLabel as marker for loot
|
2024-11-05 15:49:05 +08:00 |
|