tool4EvEr
8157172a9f
Fix City in a Bottle
2021-06-01 17:53:53 +02:00
Michael Kamensky
5ac73d9f90
Merge branch 'fix-deck-editor-custom-editions-image-view' into 'master'
...
Improvements to Deck Editor for Custom Editions
See merge request core-developers/forge!4796
2021-06-01 04:26:05 +00:00
Michael Kamensky
27085243c4
Merge branch 'historic-formats' into 'master'
...
Update the "historic" formats
See merge request core-developers/forge!4802
2021-06-01 04:25:39 +00:00
Michael Kamensky
16b2fd93d8
Merge branch 'spellcast' into 'master'
...
Fix missing intrinsic Cast trigger from copied host
See merge request core-developers/forge!4754
2021-06-01 04:25:28 +00:00
Bug Hunter
edce6ed9e8
Fix missing intrinsic Cast trigger from copied host
2021-06-01 04:25:27 +00:00
Rob Schnautz
e9b6db6994
erroneous date/name
2021-05-31 20:30:24 +00:00
Rob Schnautz
f5a1671e86
Catching up old formats
2021-05-31 20:04:04 +00:00
leriomaggio
560d8ec5c0
Refactored duplicate code in StaticData w/ new getCardEdition method
...
StaticData now includes a new method, namely `getCardEdition` which looks for a CardEdition instance into editions and customeditions given an input set code.
This new method has been refactored and used throughout the new changes in Advanced Search and Filters.
2021-05-31 19:57:33 +01:00
leriomaggio
4e7a3fe515
Updated Chinese translation after CCTV-1 suggestions in MR comments
2021-05-31 19:30:43 +01:00
leriomaggio
1ac28b5203
Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view
2021-05-31 19:25:20 +01:00
Michael Kamensky
9b69d79a78
Merge branch 'Williams-master-patch-60436' into 'master'
...
MH2 Contributions 30/05
See merge request core-developers/forge!4801
2021-05-31 16:53:19 +00:00
John
9e78a4ef99
Update tireless_provisioner.txt
2021-05-31 13:17:30 +00:00
John
8d2ef41d54
Update tide_shaper.txt
2021-05-31 13:17:03 +00:00
John
c507e960fd
Update thought_monitor.txt
2021-05-31 13:16:05 +00:00
John
490f700e37
Update skyblades_boon.txt
2021-05-31 13:15:47 +00:00
John
355f379f21
Update combine_chrysalis.txt
2021-05-31 13:13:34 +00:00
Michael Kamensky
e69f8a2e7a
Merge branch 'fixes' into 'master'
...
Some card fixes
Closes #1860
See merge request core-developers/forge!4798
2021-05-31 11:10:12 +00:00
Bug Hunter
450d5b6144
Some card fixes
2021-05-31 11:10:11 +00:00
John
41fdc485b4
Add new file
2021-05-31 10:33:54 +00:00
John
4d25aee6dc
Add new file
2021-05-31 10:33:16 +00:00
John
46574f8137
Add new file
2021-05-31 10:32:35 +00:00
John
71cbd1221b
Add new file
2021-05-31 10:31:22 +00:00
John
7386a9b614
Add new file
2021-05-31 10:30:50 +00:00
John
d5cfc39744
Add new file
2021-05-31 10:29:35 +00:00
leriomaggio
8a1770ffda
FIX Editions in Checkboxlist sorted (latest to earliest)
2021-05-31 11:19:08 +01:00
leriomaggio
01e51ecb73
Custom Editions are now included in Advanced Search Filters
2021-05-31 10:45:49 +01:00
leriomaggio
43a62813e6
Custom Editions are now included in GameFormat when checking for sets
2021-05-31 10:44:48 +01:00
leriomaggio
1b25438fca
New Extra Panel with Checkbox list for Custom Edition
...
Besides: since Custom Editions can be sometimes not that many, the number of displayed rows in Checkbox lists has been fixed to 20 to have all panels of same height.
2021-05-31 10:39:31 +01:00
leriomaggio
5858de4860
ColumnDef now includes Custom Editionsi in sorting
2021-05-31 10:36:11 +01:00
leriomaggio
8128a3374b
New Label for Other and Custom Sets for Advanced Filter Panel
2021-05-31 10:35:23 +01:00
leriomaggio
32cc860eda
Changed getSortedEditions to now also include Custom Sets
2021-05-31 10:18:21 +01:00
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
tool4EvEr
65f400cf46
Fix NPE
2021-05-30 18:34:44 +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
