Commit Graph

50288 Commits

Author SHA1 Message Date
Michael Kamensky
1382ef1724 Merge branch 'Williams-master-patch-31829' into 'master'
MH2 Contributions 27/05

See merge request core-developers/forge!4773
2021-05-28 03:38:07 +00:00
Michael Kamensky
6004850792 Merge branch 'fix' into 'master'
Various card fixes

See merge request core-developers/forge!4769
2021-05-28 03:36:15 +00:00
John
4df0cf1049 Add new file 2021-05-27 21:03:44 +00:00
John
eb91e10661 Add new file 2021-05-27 21:03:23 +00:00
John
88dbfba282 Add new file 2021-05-27 21:02:43 +00:00
John
f6358f10f2 Add new file 2021-05-27 21:02:03 +00:00
John
51b5c81aac Update so_shiny.txt 2021-05-27 21:00:37 +00:00
Northmoc
20ff40896f infuse_with_vitality.txt fix 2021-05-27 16:47:46 -04:00
John
df78d375fe Update junk_winder.txt 2021-05-27 19:55:53 +00:00
John
206194353c Update arcbound_mouser.txt 2021-05-27 19:55:23 +00:00
John
dcd16704bd Update dress_down.txt 2021-05-27 19:54:26 +00:00
John
2b6b2a5e95 Update arcbound_mouser.txt 2021-05-27 19:53:45 +00:00
John
c767a3b3ad Add new file 2021-05-27 17:11:10 +00:00
John
06a4eac1c9 Add new file 2021-05-27 17:10:27 +00:00
John
ffba3ef18a Add new file 2021-05-27 17:09:41 +00:00
John
1a6d6e1290 Add new file 2021-05-27 17:09:03 +00:00
John
e75dedcffa Add new file 2021-05-27 16:36:16 +00:00
John
a6e50452f0 Add new file 2021-05-27 16:35:40 +00:00
John
008dd2f1d7 Add new file 2021-05-27 16:34:14 +00:00
John
82c3f32a5e Add new file 2021-05-27 16:33:41 +00:00
John
5c0a03e242 Add new file 2021-05-27 16:32:12 +00:00
John
e25ce911ed Add new file 2021-05-27 16:31:46 +00:00
John
b032002c33 Add new file 2021-05-27 16:29:27 +00:00
Tim Mocny
ee05f34963 Merge branch 'editions' into 'master'
MH2 & RMH1 edition updates

See merge request core-developers/forge!4771
2021-05-27 14:17:24 +00:00
paul_snoops
2f6aa3dc0f MH2 & RMH1 edition updates 2021-05-27 14:49:29 +01:00
paul_snoops
c9c5ae0058 MH2 & RMH1 edition updates 2021-05-27 14:43:39 +01:00
Northmoc
04ba6bdd7b add Ultimate tag for PW achievements 2021-05-27 08:30:47 -04:00
Michael Kamensky
f557420c7a Merge branch 'collector-number-in-card-list-and-card-db-refactoring' into 'master'
FIX and Improvements to Card Edition Sorting, Cards Processing from Oracle, and Cards Art Index Matching

See merge request core-developers/forge!4756
2021-05-27 10:38:51 +00:00
leriomaggio
8d2d633f6d 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-27 10:38:51 +00:00
Anthony Calosa
94ec700c78 Merge branch 'kevlahnota-master-patch-24830' into 'master'
Update ChangeTargetsEffect.java

See merge request core-developers/forge!4767
2021-05-27 08:55:13 +00:00
Anthony Calosa
92ac19fa2e Merge branch 'kevlahnota-master-patch-27790' into 'master'
Update CopySpellAbilityEffect.java

See merge request core-developers/forge!4766
2021-05-27 08:55:04 +00:00
Anthony Calosa
c96aeb25e5 Update ChangeTargetsEffect.java 2021-05-27 08:48:52 +00:00
Anthony Calosa
63ebd462b9 Update CopySpellAbilityEffect.java 2021-05-27 08:48:11 +00:00
Michael Kamensky
68fe024d5a Merge branch 'drawai' into 'master'
Fix drawing negative amounts

See merge request core-developers/forge!4761
2021-05-27 04:25:49 +00:00
Michael Kamensky
12c0207f22 Merge branch 'chefs_kiss' into 'master'
MH2: Chef's Kiss and support

See merge request core-developers/forge!4765
2021-05-27 04:25:33 +00:00
Michael Kamensky
402eade4c2 Merge branch 'fix' into 'master'
binding_the_old_gods.txt fix

See merge request core-developers/forge!4762
2021-05-27 04:25:07 +00:00
Northmoc
c3f88773d2 support for RandomTargetRestriction on ChangeTargetsEffect 2021-05-26 23:36:29 -04:00
Northmoc
5c689ebf9b support for RandomTarget and RandomTargetRestriction on CopySpellAbilityEffect 2021-05-26 23:35:47 -04:00
Northmoc
efa99cb9ac chefs_kiss.txt 2021-05-26 23:33:44 -04:00
swordshine
19a96aac00 Merge branch 'suicide' into 'master'
Wheel of Misfortune: Fix suicide

See merge request core-developers/forge!4755
2021-05-27 01:01:03 +00:00
swordshine
6c84d433f6 Merge branch 'young' into 'master'
MH2: Young Necromancer

See merge request core-developers/forge!4759
2021-05-27 01:00:30 +00:00
swordshine
63c4ab822c Merge branch 'mh2_26' into 'master'
MH2 - 26 May

See merge request core-developers/forge!4763
2021-05-27 00:55:37 +00:00
swordshine
f343397a68 Merge branch 'ezellohar-master-patch-51670' into 'master'
Fixed a few typos and other minor improvements

See merge request core-developers/forge!4764
2021-05-27 00:51:39 +00:00
ezellohar
3993f5a715 Fixed a few typos and other minor improvements 2021-05-26 21:33:15 +00:00
Northmoc
ac66b6ac1b young_necromancer.txt "When you do" 2021-05-26 16:04:56 -04:00
Northmoc
de5c07d74b the_underworld_cookbook.txt 2021-05-26 15:53:12 -04:00
Northmoc
4f8a9b4d3f asmoranomardicadaistinaculdacar.txt 2021-05-26 15:52:57 -04:00
Northmoc
1e643b3a99 binding_the_old_gods.txt fix 2021-05-26 15:45:10 -04:00
tool4EvEr
eddbe33f2e Fix drawing negative amounts 2021-05-26 18:19:07 +02:00
Tim Mocny
6b07e07bea Merge branch 'edition_updates' into 'master'
New edition file updates

See merge request core-developers/forge!4757
2021-05-26 13:36:21 +00:00