leriomaggio
c465350517
Merge remote-tracking branch 'upstream/master' into fix-smart-card-art-net-decks
2021-10-28 21:36:08 +01:00
leriomaggio
40dac70ebf
QuickFIX deckSection validation in Decks that inhibited the smart card art option to trigger
...
This MR brings a quick FIX to `validateDeferredSections` method in Deck which erroneously considered entries in filtered Card Pool as for the valid deck entries, instead of the original one.
Incidentally this affected only decks with no specified edition, imposing one given by card Db query using default Card Art Preference.
In other word, no card with NO edition was found and smart card art was never triggered.
This now won't be the case!
Another quick fix in `getAllCardNamesWithNoSpecifiedEdition` to skip all sections that are not MAIN | SIDE | Commander for which card art harmonisation is necessary.
2021-10-28 21:35:32 +01:00
Michael Kamensky
d87d609765
Merge branch 'VOW_edition' into 'master'
...
VOW and VOC initial edition files
See merge request core-developers/forge!5664
2021-10-28 19:54:26 +00:00
Michael Kamensky
8f8363f12a
Merge branch 'foiling' into 'master'
...
Fix dropping foil from card when copying
See merge request core-developers/forge!5666
2021-10-28 19:54:20 +00:00
tool4EvEr
2de6fc476c
Fix dropping foil from card when copying
2021-10-28 21:20:45 +02:00
paul_snoops
d1769c12d4
VOW and VOC initial edition files
2021-10-28 19:19:17 +01:00
Michael Kamensky
45ab214cee
Merge branch 'TRT-master-patch-83249' into 'master'
...
Update forge-gui/res/cardsfolder/l/ludevic_necro_alchemist.txt
See merge request core-developers/forge!5663
2021-10-28 14:06:48 +00:00
Bug Hunter
65fd0974ca
Update forge-gui/res/cardsfolder/l/ludevic_necro_alchemist.txt
2021-10-28 13:25:47 +00:00
Michael Kamensky
218c9e4ea1
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-28 07:11:01 +03:00
Sol
0892d6de4a
Update kolvori_god_of_kinship_the_ringhart_crest.txt
2021-10-28 01:24:11 +00:00
Michael Kamensky
bae0675d00
Merge branch 'fury' into 'master'
...
Fix Fury
Closes #1995
See merge request core-developers/forge!5662
2021-10-27 18:39:27 +00:00
tool4EvEr
1d0739d728
Fix Fury
2021-10-27 20:38:15 +02:00
Michael Kamensky
4af9cd9034
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-27 19:47:39 +03:00
Michael Kamensky
0fd1e9256f
Merge branch 'tidy' into 'master'
...
StackDescription tweaks
See merge request core-developers/forge!5661
2021-10-27 16:34:51 +00:00
Bug Hunter
7e28570ed3
Merge branch 'piles' into 'master'
...
TwoPilesEffect fix
See merge request core-developers/forge!5660
2021-10-27 14:51:34 +00:00
Northmoc
04c52e95e6
MillEffect improve StackDesc
2021-10-27 10:51:24 -04:00
Northmoc
49b54e3d30
DigEffect improve StackDesc
2021-10-27 10:51:02 -04:00
Northmoc
24be7eb802
fact_or_fiction.txt improve StackDesc
2021-10-27 10:50:41 -04:00
Northmoc
9353587b89
TwoPilesEffect fix
2021-10-27 10:47:37 -04:00
Michael Kamensky
cdd4947c15
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-27 14:39:29 +03:00
Anthony Calosa
4df02c943e
Merge branch 'master' into 'master'
...
prevent NPE
See merge request core-developers/forge!5659
2021-10-27 05:34:34 +00:00
Anthony Calosa
d921677e60
prevent NPE
2021-10-27 13:33:16 +08:00
Michael Kamensky
1ca7eb6c52
Merge branch 'master' into 'master'
...
Net Decks Archive Updates
See merge request core-developers/forge!5655
2021-10-27 04:22:27 +00:00
Michael Kamensky
7370f2a6cf
Merge branch 'foiling' into 'master'
...
Fix deck loading not restoring foiled status
See merge request core-developers/forge!5656
2021-10-27 04:22:23 +00:00
Michael Kamensky
ac6bdc09e2
Merge branch 'typo' into 'master'
...
sorin_lord_of_innistrad.txt typo
See merge request core-developers/forge!5658
2021-10-27 04:21:54 +00:00
Michael Kamensky
93cd28f40c
Merge branch 'urza' into 'master'
...
Urza, Academy Headmaster
See merge request core-developers/forge!5657
2021-10-27 04:21:39 +00:00
Northmoc
9d02c0c39f
Match.java final Urza work
2021-10-26 20:36:57 -04:00
Northmoc
cd6cf320de
urza tweak
2021-10-26 20:36:56 -04:00
Northmoc
89a91c6df8
placeholder for special param that picks new ability if no legal targets
2021-10-26 20:36:56 -04:00
Northmoc
f3a2f72106
add Urza planeswalker type
2021-10-26 20:36:55 -04:00
Northmoc
63c7852ded
urza_academy_headmaster.txt (need to finish ultimates and change ChangeTo param)
2021-10-26 20:36:55 -04:00
Northmoc
17f3b24fa4
sorin_lord_of_innistrad.txt typo
2021-10-26 20:33:39 -04:00
TRT
cbbdd8584c
Fix NPE when trying to remove card
2021-10-27 01:12:17 +02:00
Churrufli
9bced99419
Net Decks Archive Updates
2021-10-26 22:21:26 +02:00
leriomaggio
c31d4cbb1f
Implementing (deep) deck comparison based on similarity of parts (cardPool)
2021-10-26 17:30:28 +02:00
TRT
5e050765a3
Clean up
2021-10-26 13:41:31 +02:00
Michael Kamensky
58faf536e1
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
...
Conflicts:
forge-gui/res/languages/de-DE.properties
2021-10-26 11:10:29 +03:00
Michael Kamensky
68ae23b494
Merge branch 'twosat-master-patch-67711' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!5654
2021-10-26 03:35:10 +00:00
tool4EvEr
fb88fcfe9c
Fix deck loading not restoring foiled status
2021-10-25 23:54:08 +02:00
Andreas Bendel
bfb5b588ca
Update de-DE.properties
...
translated #FlipOntoBattlefieldEffect
2021-10-25 20:52:20 +00:00
Michael Kamensky
849e3d0719
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-10-25 18:51:05 +03:00
Michael Kamensky
81c288f3fc
- Clarify the new FlipOntoBattlefield mechanics text labels a little (according to the Oracle wording).
2021-10-25 18:50:51 +03:00
Michael Kamensky
f9d933c6bd
Merge branch 'aicombat' into 'master'
...
Fix predictToughnessBonusOfAttacker logic
See merge request core-developers/forge!5653
2021-10-25 12:52:22 +00:00
TRT
f0f6592a38
Fix predictToughnessBonusOfAttacker logic
2021-10-25 13:56:35 +02:00
Michael Kamensky
6ae88ea82b
Merge branch 'java-11plus' into 'master'
...
Update Forge scripts for Java 11+ and Java 17+
See merge request core-developers/forge!5566
2021-10-25 09:41:50 +00:00
Michael Kamensky
130ffde80a
Merge branch 'look' into 'master'
...
Blacker Lotus and Look at Me, I'm the DCI
See merge request core-developers/forge!5630
2021-10-25 09:01:44 +00:00
Tim Mocny
f0c852c54f
Blacker Lotus and Look at Me, I'm the DCI
2021-10-25 09:01:43 +00:00
Michael Kamensky
ff55215016
Merge branch 'master' into 'master'
...
Improve some AI hints for AFR.
See merge request core-developers/forge!5652
2021-10-25 08:58:01 +00:00
Michael Kamensky
668ed97ed1
- Improve some AI hints for AFR.
2021-10-25 11:56:20 +03:00
Michael Kamensky
3ed10fb112
Merge branch 'master' into 'master'
...
Tweak a comment.
See merge request core-developers/forge!5651
2021-10-25 06:14:08 +00:00
