external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 32 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

14448 Commits

Author SHA1 Message Date
leriomaggio
838f817be7 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-14 08:27:09 +01:00
Michael Kamensky
f6b8a41775 Merge branch 'small_fixes' into 'master' 
Small edition fixes

See merge request core-developers/forge!5219
 2021-08-14 04:27:39 +00:00
Michael Kamensky
01da67676d Merge branch 'lost' into 'master' 
Fix life lost triggers

See merge request core-developers/forge!5218
 2021-08-14 04:27:08 +00:00
Bug Hunter
c9d88ae384 Fixes for Grist 2021-08-14 04:26:30 +00:00
leriomaggio
017a4c579e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-14 00:12:27 +01:00
paul_snoops
d9411ae2a2 Small edition fixes 2021-08-13 23:27:07 +01:00
tool4EvEr
be81ba5e15 Fix life lost triggers 2021-08-13 21:25:24 +02:00
Bug Hunter
1084a972c1 Fix Conspiracy Theorist 2021-08-13 11:46:55 +00:00
leriomaggio
258f57e080 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-13 11:25:38 +01:00
Michael Kamensky
678bd9a9e1 Merge branch 'osgir' into 'master' 
Fix Osgir looping too much

See merge request core-developers/forge!5214
 2021-08-12 19:48:19 +00:00
leriomaggio
bd2971d6e9 Smart Card Art Selection Options and Preferred Art Updated for all Languages 2021-08-12 17:41:25 +01:00
Michael Kamensky
39722f9e26 Merge branch 'TRT-master-patch-54796' into 'master' 
Update forge-gui/res/cardsfolder/h/hellrider.txt

See merge request core-developers/forge!5215
 2021-08-12 11:57:02 +00:00
Hans Mackowiak
f935b30632 Mercurial Transformation: remove Card and Sub Types 2021-08-12 11:03:25 +00:00
Bug Hunter
3522220938 Update forge-gui/res/cardsfolder/h/hellrider.txt 2021-08-12 06:19:17 +00:00
tool4EvEr
aaa195ca38 Fix Osgir looping too much 2021-08-11 23:54:40 +02:00
Michael Kamensky
dc03ff599c Merge branch 'editions_update' into 'master' 
Update J21 and SLD

See merge request core-developers/forge!5211
 2021-08-11 18:21:55 +00:00
John
491826004c Update Judge Gift Cards 2021.txt 2021-08-11 06:27:58 +00:00
Michael Kamensky
3681a0ac43 Merge branch 'combat' into 'master' 
Small combat fixes for Planeswalkers

See merge request core-developers/forge!5210
 2021-08-11 03:56:58 +00:00
Michael Kamensky
2fde82502b Merge branch 'egon' into 'master' 
Fix Egon exiling single card

See merge request core-developers/forge!5209
 2021-08-11 03:56:31 +00:00
Michael Kamensky
69358cd77f Merge branch 'fix' into 'master' 
various fixes

See merge request core-developers/forge!5208
 2021-08-11 03:56:01 +00:00
Sol
a3049e1d3e Fix missing booster definition crash 2021-08-11 00:55:21 +00:00
paul_snoops
a0332dda19 Update J21 and SLD 2021-08-10 23:42:03 +01:00
tool4EvEr
805e65d30c Small combat fixes for Planeswalkers 2021-08-10 21:10:45 +02:00
tool4EvEr
41ce9920ae Fix Egon exiling single card 2021-08-10 19:28:38 +02:00
Northmoc
f25e51d8f2 koma_cosmos_serpent.txt fix stackdesc 2021-08-10 12:49:52 -04:00
Northmoc
931ed2b4ef rals_dispersal.txt fix typo 2021-08-10 12:44:06 -04:00
Northmoc
baf7c84bf9 runeforge_champion.txt - add OriginAlternative$ Graveyard 2021-08-10 12:43:48 -04:00
Michael Kamensky
b049c8c09b Merge branch 'narfi' into 'master' 
Narfi round 2

See merge request core-developers/forge!5206
 2021-08-10 16:09:07 +00:00
Alumi
8c1a1da2ee Update Skyshroud Ambush implementation 2021-08-10 16:08:52 +00:00
Northmoc
05fa2bb7be king_narfis_betrayal.txt v 2.0 2021-08-09 19:04:10 -04:00
Sol
eacda0596c Update toralf_god_of_fury_toralfs_hammer.txt 2021-08-09 15:18:37 +00:00
Michael Kamensky
723c38e7bd Merge branch 'reset' into 'master' 
Clear manaPaid before Targeting

See merge request core-developers/forge!5203
 2021-08-08 16:53:44 +00:00
Michael Kamensky
e3e201ddc0 Merge branch 'narfi' into 'master' 
king_narfis_betrayal.txt tidy up Exile process

See merge request core-developers/forge!5199
 2021-08-08 16:52:16 +00:00
tool4EvEr
aae01f913e Fix chooser 2021-08-08 16:55:58 +02:00
CCTV-1
e77c869ae7 fix translate key:'lblNetArchivePauperDecks' missspell. 2021-08-08 20:50:15 +08:00
Northmoc
64cbeec265 king_narfis_betrayal.txt tidy up Exile process 2021-08-08 08:35:42 -04:00
Michael Kamensky
0b08b15617 Merge branch 'ambush' into 'master' 
J21: Skyshroud Ambush

See merge request core-developers/forge!5191
 2021-08-08 02:10:22 +00:00
Michael Kamensky
6e90ccf579 Merge branch 'maylook' into 'master' 
Fix looking at cards too early

See merge request core-developers/forge!5189
 2021-08-08 02:07:43 +00:00
tool4EvEr
8f62c5f8f0 Clean up 2021-08-07 21:11:22 +02:00
tool4EvEr
f78c3ba441 Fix drawn card being revealed during ability resolve 2021-08-07 16:30:26 +02:00
tool4EvEr
d805393514 Remove useless SVar 2021-08-07 16:30:24 +02:00
paul_snoops
351e23818c Update Historic format 2021-08-07 12:20:59 +01:00
Bug Hunter
4a850c8808 Merge branch 'card_fix' into 'master' 
fix planar_ally.txt

See merge request core-developers/forge!5194
 2021-08-07 06:51:46 +00:00
CCTV-1
c09cf436f1 fix trigger description. 2021-08-07 12:47:46 +08:00
Michael Kamensky
21d0614e62 Merge branch 'mid_edition' into 'master' 
Add Innistrad: Midnight Hunt edition file and cards

See merge request core-developers/forge!5185
 2021-08-07 04:12:06 +00:00
Michael Kamensky
6687ad0b76 Merge branch 'eldrainequest' into 'master' 
Eldraine Quest World! – by Xyx

See merge request core-developers/forge!5186
 2021-08-07 04:11:41 +00:00
Michael Kamensky
307c8e5dd1 Merge branch 'prey' into 'master' 
prey_upon.txt cleanup descs

See merge request core-developers/forge!5192
 2021-08-07 03:20:36 +00:00
Northmoc
4d4c427ca9 prey_upon.txt cleanup descs 2021-08-06 20:47:01 -04:00
Northmoc
dd89e0eb64 skyshroud_ambush.txt initial try 2021-08-06 19:51:16 -04:00
Snoops
8c1ad25c7d Update Jumpstart Historic Horizons.txt 2021-08-06 17:11:48 +00:00