leriomaggio
03d6687c64
Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view
2021-05-31 09:12:32 +01:00
Michael Kamensky
51924d16db
Merge branch 'scrolling' into 'master'
...
Workshop: Add scrollbars
Closes #6
See merge request core-developers/forge!4800
2021-05-31 06:43:25 +00:00
Michael Kamensky
cd167313b7
Merge branch 'Williams-master-patch-52159' into 'master'
...
MH2 Contributions 29/05
See merge request core-developers/forge!4793
2021-05-31 06:43:12 +00:00
John
365142c860
MH2 Contributions 29/05
2021-05-31 06:43:11 +00:00
Michael Kamensky
990f6f148a
Merge branch 'refactor_replace_damage_buffered' into 'master'
...
Refactor replace damage to buffer SA execution
See merge request core-developers/forge!4797
2021-05-31 06:41:17 +00:00
Alumi
1eb6f33207
Refactor replace damage to handle all damage related replacments first, then run all buffered SAs after
2021-05-31 06:41:16 +00:00
tool4EvEr
2d23a5b37d
Add scrollbars
2021-05-30 22:26:35 +02:00
Michael Kamensky
84dfdfc11c
Merge branch 'mh2_29' into 'master'
...
MH2 - 29 May
See merge request core-developers/forge!4795
2021-05-30 05:36:47 +00:00
Michael Kamensky
ecb1cb8a0e
Merge branch 'cleaning' into 'master'
...
Fix mana not replaced when generated for different player
See merge request core-developers/forge!4794
2021-05-30 05:36:23 +00:00
Michael Kamensky
b9a8da1231
Merge branch 'junk' into 'master'
...
Junk Winder - Affinity detail/reminder text updates for more complex affinities
See merge request core-developers/forge!4787
2021-05-30 05:36:19 +00:00
Michael Kamensky
27c9bee138
Merge branch 'patch-sortable-collector-number-non-numerical' into 'master'
...
FIX non-numerical CollectorNumber as Sorting Key
See merge request core-developers/forge!4789
2021-05-30 05:36:09 +00:00
leriomaggio
9902718082
FIX and Impros to CardEdition, CardInSet and Reader
...
- Reader has a new updated regexp to deal with non-numerical collectorNumbers
- CardInSet have been now made sortable based on CollectorNumber.
To do so, collectorNumbers are transformed accordingly to allow for natural ordering (as expected) instead of lexicographic order.
- CardEdition now return cards (CardInSet) as sorted, to allow for correct artIndex matching when creating corresponding `PaperCard` instances.
Moreover, `compareTo` of card edition has been improved to also take into account set name (in cases of same release date).
2021-05-30 05:36:09 +00:00
Michael Kamensky
270ab5e843
Merge branch 'untapp' into 'master'
...
avoid pumping opponent creature
Closes #1134
See merge request core-developers/forge!4792
2021-05-30 05:23:56 +00:00
leriomaggio
62961889d5
Fixed typo in Label Name: RepRints (r missing)
2021-05-30 02:05:09 +01:00
leriomaggio
0217c4b4b2
Support collectorNumber for Cards in Custom sets
...
retrieveCollectorNumber now also considers customEditions when looking for the matching collectorNumber of a PaperCard instance.
2021-05-30 00:21:05 +01:00
leriomaggio
1c950a8a57
ImageView now includes also CustomEditions in Sets Map
...
This fix solves an issue with Custom Editions appearing as "Other" in ImageView. The bug was due to customEditions not being included in sets map.
2021-05-29 23:43:47 +01:00
leriomaggio
f5563ccedb
New method to return the Collection of Custom Editions
2021-05-29 23:42:34 +01:00
Northmoc
0672477817
moderation.txt
2021-05-29 17:08:29 -04:00
Northmoc
c28a1f740e
nettlecyst.txt
2021-05-29 16:59:12 -04:00
Northmoc
e0f3b65251
strike_it_rich.txt
2021-05-29 16:57:16 -04:00
Northmoc
001acda866
fast_furious.txt yank Cost
2021-05-29 16:57:01 -04:00
Northmoc
eb9ceb4dc8
fast_furious.txt
2021-05-29 16:48:42 -04:00
tool4EvEr
d622f9075a
Add ValidActivator
2021-05-29 20:59:49 +02:00
Northmoc
76699ad323
batterbone.txt
2021-05-29 11:14:43 -04:00
tool4EvEr
a5fc5c1e40
Fix mana not replaced when generated for different player
2021-05-29 17:06:08 +02:00
Tim Mocny
cb9302b2fe
Merge branch 'svyelun' into 'master'
...
Svyelun name fix
See merge request core-developers/forge!4791
2021-05-29 15:04:32 +00:00
Northmoc
254ddf8dfb
KeywordWithType.java special parsing for Affinity
2021-05-29 11:00:36 -04:00
Northmoc
4995cc8876
CardFactoryUtil.java implement optional additional param for complex Affinities
2021-05-29 10:59:15 -04:00
Northmoc
1f120a7faf
Affinity reminder text remove extra "you"
2021-05-29 10:58:42 -04:00
Northmoc
4411910930
junk_winder.txt fix and add to keyword
2021-05-29 10:53:41 -04:00
tool4EvEr
931dc04ad2
avoid pumping opponent creature
2021-05-29 12:01:10 +02:00
paul_snoops
e6b390addc
Svyelun name fix
2021-05-29 10:55:46 +01:00
paul_snoops
a4027c0ad8
Svyelun name fix
2021-05-29 10:47:52 +01:00
Bug Hunter
3451fbf42a
Merge branch 'rename' into 'master'
...
Fix card filename
See merge request core-developers/forge!4790
2021-05-29 09:01:44 +00:00
tool4EvEr
65e3c24de6
Fix card filename
2021-05-29 11:01:45 +02:00
Michael Kamensky
90e74c1c3a
Merge branch 'Williams-master-patch-93999' into 'master'
...
MH2 Contributions 28/05
See merge request core-developers/forge!4781
2021-05-29 06:54:18 +00:00
Michael Kamensky
4610729a82
Merge branch 'patch-imagefetcher-scryfall' into 'master'
...
FIX ImageFetcher against Scryfall, so that download can be robust (against different set-codes) and reliable.
See merge request core-developers/forge!4788
2021-05-29 06:54:06 +00:00
Michael Kamensky
ab8c2c8b10
Merge branch 'mh2_28' into 'master'
...
MH2 - 28 May
See merge request core-developers/forge!4786
2021-05-29 06:53:50 +00:00
Michael Kamensky
bf0a5e13ae
Merge branch 'fix' into 'master'
...
Fixes!
See merge request core-developers/forge!4785
2021-05-29 06:52:24 +00:00
Northmoc
e4f8f7852f
naya_soulbeast.txt fix
2021-05-28 21:47:27 -04:00
leriomaggio
348365b8fd
Merge remote-tracking branch 'upstream/master' into patch-imagefetcher-scryfall
2021-05-28 23:30:06 +01:00
leriomaggio
5c2f62defa
FIX Scryfall Download retrieval, that is robust with different set-codes.
...
Imagefetcher now tries MCI code first and if that's not working, tries other set codes until one matching scryfall will be found. If none, the not-working set will be recorded to avoid future computation, and returns.
2021-05-28 23:29:29 +01:00
Northmoc
bd5a98fe13
academy_manufactor.txt
2021-05-28 17:01:44 -04:00
Northmoc
8a0da67705
crawling_barrens.txt tidy up StackDesc
2021-05-28 17:01:14 -04:00
Northmoc
479cbbf671
suspend.txt tighten up, add AI
2021-05-28 17:00:57 -04:00
Northmoc
6708ca00b5
suspend.txt fixup
2021-05-28 16:59:37 -04:00
John
53e08bbf55
Update verdant_command.txt
2021-05-28 20:25:53 +00:00
John
d389050a66
Update underworld_hermit.txt
2021-05-28 20:25:36 +00:00
John
5d4f628b8b
Update tourach_dread_cantor.txt
2021-05-28 20:25:19 +00:00
John
2ecbd26477
Update sweep_the_skies.txt
2021-05-28 20:25:01 +00:00
