Commit Graph

16661 Commits

Author SHA1 Message Date
tool4EvEr
faeb73d8b7 Clean up 2021-06-01 22:29:15 +02:00
tool4EvEr
beff3d4832 Fix Runaway Carriage 2021-06-01 22:11:01 +02:00
tool4EvEr
931411b6e4 Fix Wandering Archaic 2021-06-01 18:38:26 +02:00
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
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
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
01e51ecb73 Custom Editions are now included in Advanced Search Filters 2021-05-31 10:45:49 +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
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
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
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
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
leriomaggio
62961889d5 Fixed typo in Label Name: RepRints (r missing) 2021-05-30 02:05:09 +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
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
Northmoc
4411910930 junk_winder.txt fix and add to keyword 2021-05-29 10:53:41 -04: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
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