CollinJ
94c75f1e71
Merge branch 'master' into master
2024-10-20 22:05:24 -07:00
kevlahnota
ece5772217
Merge pull request #6394 from kevlahnota/master2
...
fix updater versionstring
2024-10-21 12:58:19 +08:00
Anthony Calosa
59f672225d
update
2024-10-21 12:41:26 +08:00
Anthony Calosa
7203eaa07a
Merge branch 'master' into master2
2024-10-21 12:19:02 +08:00
Anthony Calosa
f82236cc4f
fix updater versionstring
2024-10-21 12:14:17 +08:00
Chris H
2495b02c73
Merge pull request #6393 from Card-Forge/tehdiplomat-patch-4
...
Update snapshots-pc.yml
2024-10-20 23:08:17 -04:00
Chris H
33c85a4f0f
Update snapshots-pc.yml
...
izpack needs to allow jar files
2024-10-20 23:07:11 -04:00
Chris H
4e48daeadb
Merge pull request #6103 from kevlahnota/master2
...
Update Android build (SDK 35), Java 17, LibGDX 1.13.0
2024-10-20 22:55:10 -04:00
Anthony Calosa
1979c23389
update pom
2024-10-21 09:15:57 +08:00
Anthony Calosa
612473c1fb
fix adventure-editor pom
2024-10-21 09:13:45 +08:00
Collin
5de234aacb
Fix the SpellSmith missing some cards.
...
The main issues is that getAllCards returns a card list that is unique
by name. That menas each card only has a single rarity. In this case,
cards like "Forbidden Orchard" and "Choke" de-deuplicate to a version of
the card with 'S' rarity. This means that when filtering by rarity, the
'S' rarity will be filtered out.
Another similar issue is that when a card exists in multiple sets with
different rarities, you might filter to a set in which the card is 'R',
but the de-duped version in allCards has rarity 'U', so using the cardDB
to check the rarity to filter on doesn't work.
When filtering by a specific set, the solution is to use the rarity of
the card in that set.
When not filtering by a set but filtering by rarity, we have to address
the root cause of the de-duping.
WHen de-duping, I changed the logic to ignore 'S' rarities. This fixes
the rarity filter when not filtering by an edition (although if there
are multiple rarities you still have to kind of guess).
This has the side-effect of making the card image used something more
legible. Before 'Choke' de-duped to the MPS_AHK set which has illegible
text. By ignoring 'S' rarities, it not de-dups to 8ED.
More work could probably be done to improve de-duping, but perfect
correctness would probably involve de-duping only after filtering, which
is likely too slow.
2024-10-20 12:29:11 -07:00
Anthony Calosa
e833b9f400
use flatten plugin
2024-10-21 00:03:42 +08:00
Anthony Calosa
9cf06a04da
remove slf4j-simple
2024-10-20 22:23:01 +08:00
Anthony Calosa
7bebf8732c
Merge branch 'master' into master2
2024-10-20 21:56:30 +08:00
Anthony Calosa
5a1f864db0
fix dependency conflict
2024-10-20 21:19:13 +08:00
Paul Hammerton
5a3f2ed607
Merge pull request #6386 from dracontes/rb-sld-2-marvel
...
SLD: Marvel x MTG Superdrop
2024-10-20 13:30:03 +01:00
Anthony Calosa
7b714423d8
remove '-P'
2024-10-20 20:19:30 +08:00
Anthony Calosa
39c8a6af3e
fix compilation
2024-10-20 20:09:29 +08:00
Anthony Calosa
426e63598f
Merge branch 'master' into master2
2024-10-20 18:38:41 +08:00
Anthony Calosa
1f596668f2
cleanup
2024-10-20 18:36:48 +08:00
Anthony Calosa
d1be724896
create forge-installer
2024-10-20 18:27:14 +08:00
tool4EvEr
0186759bf7
Support Black Panther
2024-10-20 12:21:00 +02:00
tool4ever
98c0959d8f
Fix Embodiment of Agonies counting Asmoranomardicadaistinaculdacar ( #6388 )
2024-10-20 10:02:48 +00:00
tool4EvEr
cf7aa54769
Support Captain America
2024-10-20 10:45:16 +02:00
Anthony Calosa
86b58ef479
update dependency
2024-10-20 04:28:09 +08:00
Anthony Calosa
8a7866da87
update plugins
2024-10-20 04:00:07 +08:00
Renato Filipe Vidal Santos
43434e4999
Update TypeLists.txt
2024-10-19 14:29:27 +01:00
Anthony Calosa
5bc364393a
Merge branch 'master' into master2
2024-10-19 20:04:26 +08:00
Renato Filipe Vidal Santos
26281603bb
Add files via upload
2024-10-19 13:02:10 +01:00
Renato Filipe Vidal Santos
28a42b116b
Update iron_man_titan_of_innovation.txt
2024-10-19 12:43:00 +01:00
Renato Filipe Vidal Santos
84eb2f28f5
Update wolverine_best_there_is.txt
2024-10-19 12:42:36 +01:00
Renato Filipe Vidal Santos
0a8c925a71
Update captain_america_first_avenger.txt
2024-10-19 12:41:51 +01:00
Renato Filipe Vidal Santos
9fb4e6e359
Update black_panther_wakandan_king.txt
2024-10-19 12:41:08 +01:00
Renato Filipe Vidal Santos
b0cc6fc49f
Add files via upload
2024-10-19 12:01:29 +01:00
Paul Hammerton
42893234b3
Merge pull request #6385 from paulsnoops/marvel_formats
...
Add Marvel SLD to Vintage & Legacy Archived formats
2024-10-19 10:38:23 +01:00
Paul Hammerton
d9d89e9c0d
Add Marvel SLD to Vintage & Legacy Archived formats
2024-10-19 10:30:37 +01:00
Paul Hammerton
1d6d356e02
Merge pull request #6384 from paulsnoops/edition_updates
...
Edition updates: PSPL, SLD
2024-10-19 10:26:29 +01:00
Paul Hammerton
af5e4eab69
Edition updates: PSPL, SLD
2024-10-19 10:20:17 +01:00
Anthony Calosa
a953818a76
Merge branch 'master' into master2
2024-10-19 15:59:18 +08:00
Agetian
339b04c60a
- Add puzzle PS_DSK2. ( #6382 )
2024-10-19 08:33:38 +03:00
Anthony Calosa
ce7a182911
minor cleanup
2024-10-19 12:39:42 +08:00
Anthony Calosa
677bb7b12c
fix tags
2024-10-19 12:13:43 +08:00
Anthony Calosa
8ad1f41fef
fix name
2024-10-19 12:09:01 +08:00
Anthony Calosa
7f0ce0b4e7
refactor module to map-editor, add gdx particle editor
2024-10-19 12:07:36 +08:00
kevlahnota
8ce2f61390
remove custom manifest entries
2024-10-19 07:19:50 +08:00
Anthony Calosa
a09de0294f
replacer token -> mandatory.java.args
2024-10-19 07:05:10 +08:00
Anthony Calosa
0cdcdeaa49
Merge branch 'master' into master2
2024-10-19 03:08:41 +08:00
Paul Hammerton
4ee2af4e1e
Merge pull request #6377 from Ayora29/fix_token_names
...
WOC : Fix token name
2024-10-18 17:33:12 +01:00
tool4ever
b2ec9c3a49
Update longhorn_firebeast.txt
2024-10-18 16:29:09 +00:00
Anthony Calosa
3455045f2e
update scripts
2024-10-18 23:16:00 +08:00
