Commit Graph

51951 Commits

Author SHA1 Message Date
paul_snoops
5a862ab742 RMH1 has been changed to H1R 2021-06-07 15:18:51 +01:00
Michael Kamensky
7e6f077b0a Merge branch 'TRT-master-patch-82400' into 'master'
Update forge-gui/res/cardsfolder/upcoming/search_the_premises.txt

See merge request core-developers/forge!4846
2021-06-07 08:02:42 +00:00
Bug Hunter
b6676c9d58 Update forge-gui/res/cardsfolder/upcoming/search_the_premises.txt 2021-06-07 04:56:28 +00:00
Michael Kamensky
37099156f3 Merge branch 'lion' into 'master'
Diamond Lion: Fix cost

See merge request core-developers/forge!4845
2021-06-07 04:32:08 +00:00
tool4EvEr
018a2c080b Fix cost 2021-06-06 21:46:27 +02:00
Michael Kamensky
890ef37b3f Merge branch 'snowblind' into 'master'
Card fixes

See merge request core-developers/forge!4843
2021-06-06 18:04:04 +00:00
Michael Kamensky
c7de3866c7 Merge branch 'PLIST' into 'master'
Edition updates PLIST and UST

See merge request core-developers/forge!4844
2021-06-06 18:03:49 +00:00
tool4EvEr
4cf11743f2 Fix P/T 2021-06-06 19:36:40 +02:00
tool4EvEr
3ee3a28fd5 Fix cost 2021-06-06 18:54:21 +02:00
paul_snoops
39ba048d07 Updating "The List" edition file and fix dragon token in Unstable 2021-06-06 16:55:56 +01:00
tool4EvEr
40a9229681 Fix check 2021-06-06 15:19:23 +02:00
tool4EvEr
8a7873d0c9 Fix triggers 2021-06-06 15:11:34 +02:00
Bug Hunter
996ddb4360 Merge branch 'twosat-master-patch-69468' into 'master'
Update de-DE.properties

See merge request core-developers/forge!4842
2021-06-06 12:57:58 +00:00
tool4EvEr
eec11c6ec5 Fix Snowblind 2021-06-06 14:57:24 +02:00
Andreas Bendel
197cbb1808 Update de-DE.properties
translated new lines under VAssignGenericAmount
2021-06-06 12:51:06 +00:00
Michael Kamensky
32df7f3eae Merge branch 'fixsuspend' into 'master'
Suspend Fixes

See merge request core-developers/forge!4828
2021-06-06 03:29:09 +00:00
Bug Hunter
4b3839b143 Suspend Fixes 2021-06-06 03:29:08 +00:00
Michael Kamensky
79216eaa8d Merge branch 'mh2_fix' into 'master'
MH2 fixes

See merge request core-developers/forge!4841
2021-06-06 03:28:46 +00:00
Michael Kamensky
ba2998541d Merge branch 'aicleanup' into 'master'
Small fix

See merge request core-developers/forge!4840
2021-06-06 03:28:26 +00:00
Michael Kamensky
d5aaa4dc45 Merge branch 'repeateach' into 'master'
RepeatPlayers - Swap out other remembered while resolving

See merge request core-developers/forge!4834
2021-06-06 03:27:03 +00:00
Bug Hunter
999e4f81ee RepeatPlayers - Swap out other remembered while resolving 2021-06-06 03:27:02 +00:00
Michael Kamensky
c38d2f531c Merge branch 'carth' into 'master'
MH2: Carth the Lion

See merge request core-developers/forge!4760
2021-06-06 03:26:09 +00:00
Michael Kamensky
27d8af3551 Merge branch 'carth' into 'master'
Carth support

See merge request core-developers/forge!4827
2021-06-06 03:26:07 +00:00
Bug Hunter
b10ce1b884 Carth support 2021-06-06 03:26:07 +00:00
Northmoc
18c207f39b arcbound_tracker.txt trim unneeded 2021-06-05 17:03:32 -04:00
tool4EvEr
898df454d5 Small fix 2021-06-05 23:02:34 +02:00
Northmoc
577c5ca055 restore edition labels 2021-06-05 17:01:07 -04:00
Northmoc
04558e93b3 correct lizard name 2021-06-05 17:00:44 -04:00
Michael Kamensky
6b0a88cd95 Merge branch 'phpr-prm-scryfall-editions' into 'master'
Latest Scryfall codes for PHPR and PRM Editions

See merge request core-developers/forge!4838
2021-06-05 19:03:02 +00:00
Michael Kamensky
bd125df278 Merge branch 'smallfix' into 'master'
Small fixes

See merge request core-developers/forge!4837
2021-06-05 19:02:53 +00:00
tool4EvEr
fc31881150 Small fixes 2021-06-05 20:52:59 +02:00
leriomaggio
9a13b06452 Matched with Magic Online Promo 2021-06-05 19:44:24 +01:00
leriomaggio
01e3a726fe Matched all with PHPR Set on Scryfall 2021-06-05 19:44:11 +01:00
leriomaggio
bcaa318941 Matched with Dragon Con on Scryfall 2021-06-05 19:43:46 +01:00
leriomaggio
c64e5c2d5e Merge remote-tracking branch 'upstream/master' into add-scryfallcodes-neweditions 2021-06-05 19:40:42 +01:00
Bug Hunter
caafcf61aa Merge branch 'city' into 'master'
Fix crash with City in a Bottle & Facedown

See merge request core-developers/forge!4836
2021-06-05 18:22:27 +00:00
tool4EvEr
e6280377ce Fix crash with City in a Bottle & Facedown 2021-06-05 20:22:30 +02:00
Bug Hunter
a2e66550bf Merge branch 'add-scryfallcodes-neweditions' into 'master'
Scryfall Code Added

See merge request core-developers/forge!4835
2021-06-05 18:21:31 +00:00
leriomaggio
abad45f874 Scryfall Code Added
(Not really needed, just to keep edition files aligned)
2021-06-05 18:21:31 +00:00
leriomaggio
fa649c1cd0 Scryfall Code Added
(Not really needed, just to keep edition files aligned)
2021-06-05 19:10:39 +01:00
leriomaggio
96ad12a1b7 FIX collector numbers w/ those on scryfall and scryfallcode added 2021-06-05 19:10:08 +01:00
Michael Kamensky
669979531c Merge branch 'patch-imagefetcher-scryfall' into 'master'
FIX performance with ImageFetcher, New ScryfallCodes, and Updated CollectorNumbers

See merge request core-developers/forge!4823
2021-06-05 16:25:51 +00:00
leriomaggio
0c81f5c36c FIX unicode char for alternate in Portal 2021-06-05 17:16:44 +01:00
leriomaggio
7dfc48744c Merge remote-tracking branch 'upstream/master' into patch-imagefetcher-scryfall 2021-06-05 17:00:53 +01:00
leriomaggio
943d95eed0 Added new scryfall codes to latest 67 editions 2021-06-05 16:58:07 +01:00
leriomaggio
4b6e5e32d1 Setup Scryfall Code 2021-06-05 16:54:22 +01:00
leriomaggio
a1132fbe90 Updated latest collector numbers 2021-06-05 16:54:05 +01:00
Michael Kamensky
ea37370738 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 18:13:54 +03:00
Michael Kamensky
3b73f86e1b Merge branch 'Williams-master-patch-27805' into 'master'
MH2 Contributions 04/06

See merge request core-developers/forge!4822
2021-06-05 15:11:24 +00:00
Michael Kamensky
1633dedee3 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 17:34:06 +03:00