external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,850 Commits 33 Branches 187 Tags
08e84cb15ddf6f3e9024adaca832c39800c8f7f6
Commit Graph

46850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
d4049e0833 Merge branch 'soulfire' into 'master' 
CMR: Soulfire Eruption and support

See merge request core-developers/forge!3347
 2020-11-08 04:38:28 +00:00
Michael Kamensky
9dc62397ce Merge branch 'nezahal' into 'master' 
nezahal_primal_tide.txt fix/cleanup

See merge request core-developers/forge!3351
 2020-11-08 04:36:57 +00:00
Tim Mocny
73bff21eea Merge branch 'cmredfix' into 'master' 
editions fix until friarsol MR is in

See merge request core-developers/forge!3353
 2020-11-08 03:19:32 +00:00
Northmoc
523cefdcb2 editions fix until friarsol MR is in 2020-11-07 22:18:20 -05:00
Sol
3f144e8a9d Update avenging_huntbonder.txt 2020-11-08 02:45:27 +00:00
friarsol
31a0d6713f EditionTracking 2020-11-07 14:33:31 -05:00
Northmoc
12e76253a2 nezahal_primal_tide.txt fix/cleanup 2020-11-07 12:39:45 -05:00
Northmoc
30ce827da5 Hanmac - preserve order of targeting for mixed target lists 2020-11-07 10:41:18 -05:00
Northmoc
2bd85c2c74 add RepeatTargeted param to Effect and card 2020-11-07 10:41:17 -05:00
Northmoc
33463d8734 soulfire_eruption.txt 2020-11-07 10:41:17 -05:00
klaxnek
47ec63e894 Merge remote-tracking branch 'core-developers/master' 2020-11-07 16:24:16 +01:00
Michael Kamensky
c060222fe5 Merge branch 'master' into 'master' 
Road of Return fix

See merge request core-developers/forge!3349
 2020-11-07 14:13:03 +00:00
Michael Kamensky
3f84874256 Merge branch 'undyingOnceFix' into 'master' 
Trigger: removed the need for OncePerEffect

See merge request core-developers/forge!3341
 2020-11-07 14:10:25 +00:00
Hans Mackowiak
dffcade964 Trigger: removed the need for OncePerEffect 2020-11-07 14:10:25 +00:00
Hythonia
7d634444fc Road of Return fix 2020-11-07 10:03:25 +00:00
Michael Kamensky
a5033f6627 Merge branch 'master' into 'master' 
CMR: Cards

See merge request core-developers/forge!3345
 2020-11-07 08:45:46 +00:00
Michael Kamensky
8af0f8822b Merge branch 'colors' into 'master' 
CMR: War Room and support

See merge request core-developers/forge!3343
 2020-11-07 04:25:35 +00:00
Michael Kamensky
4582e4280a Merge branch 'cmr6' into 'master' 
CMR - 6 Nov (editions big update)

See merge request core-developers/forge!3348
 2020-11-07 04:24:50 +00:00
Michael Kamensky
9710f1f986 Merge branch 'cmr5' into 'master' 
CMR - 5 Nov

See merge request core-developers/forge!3336
 2020-11-07 04:22:55 +00:00
Michael Kamensky
f1856198ed Merge branch 'draft-multiplayer-desktop' into 'master' 
Allow desktop to play 2-6 multiplayer (not network) draft games

See merge request core-developers/forge!3346
 2020-11-07 04:22:30 +00:00
Northmoc
9020297508 Commander Legends.txt add [commander decks] 2020-11-06 22:44:36 -05:00
friarsol
0801bbc50b Allow desktop to play 2-6 multiplayer (not network) draft games 2020-11-06 18:48:56 -05:00
Northmoc
7c5f9ba896 Commander Legends.txt near complete ready for boosters 2020-11-06 16:25:48 -05:00
Northmoc
7f43c01a85 Anara fix name 2020-11-06 15:07:14 -05:00
Northmoc
49a62b3ef1 glacian_powerstone_engineer.txt (Benjamin) 2020-11-06 14:07:54 -05:00
Northmoc
48fe66a398 aesi_tyrant_of_gyre_strait.txt (guytrash) 2020-11-06 13:15:56 -05:00
Northmoc
990bc3e37c war_room.txt 2020-11-06 13:02:54 -05:00
Northmoc
677dfdaf4d sisay_weatherlight_captain.txt - just cleanup but kind of related 2020-11-06 13:02:53 -05:00
Northmoc
6144add12f Add Count for ColorsColorIdentity 2020-11-06 13:02:53 -05:00
Northmoc
3708b89b29 guildless_commons.txt fix Oracle 2020-11-06 13:01:57 -05:00
Northmoc
cdaae459b2 akromas_will.txt (Marvel) 2020-11-06 13:01:56 -05:00
Northmoc
9c708d0b79 +TriggerController 2020-11-06 13:01:56 -05:00
Northmoc
3f1c25a21a miara_thorn_of_the_glade.txt (medusa) 2020-11-06 13:01:56 -05:00
Northmoc
08b289a51e nadier_agent_of_the_duskenel.txt and nadiers_nightblade.txt (medusa) 2020-11-06 13:01:55 -05:00
Northmoc
5aafe65a35 kangee_sky_warden.txt (medusa) 2020-11-06 13:01:55 -05:00
Northmoc
9b271d61ac abomination_of_llanowar.txt (medusa) 2020-11-06 13:01:54 -05:00
Northmoc
428f5b7fc2 annoyed_altisaur.txt 2020-11-06 13:01:54 -05:00
Northmoc
fc824e886f imoti_celebrant_of_bounty.txt (Cheese) 2020-11-06 13:01:53 -05:00
Northmoc
14d7272c97 ingenuity_engine.txt (Benjamin) 2020-11-06 13:01:53 -05:00
Northmoc
877743a64e - newline 2020-11-06 13:01:52 -05:00
Northmoc
8ab8d67f44 guildless_commons.txt 2020-11-06 13:01:52 -05:00
Northmoc
bb4e07865c pride_of_the_perfect.txt (medusa) 2020-11-06 13:01:52 -05:00
Hythonia
b32453ace5 CMR: Court of Ire 2020-11-06 17:49:12 +00:00
friarsol
abad110caf Editions can generate their own print sheets now 2020-11-06 11:36:04 -05:00
Hythonia
4b7be7c57d Boarding Party 2020-11-06 16:18:54 +00:00
Hythonia
96d8974a2c CMR: Body of Knowledge 2020-11-06 15:49:26 +00:00
Hythonia
6246f602b2 CMR: Jeweled 2020-11-06 15:16:59 +00:00
Hythonia
14908d4b20 CMR: Azure Fleet Admiral 2020-11-06 14:44:16 +00:00
Hans Mackowiak
fe94eecfb9 Merge branch 'pumpCritFix' into 'master' 
PumpEffect: fix keywords using CardManaCost

See merge request core-developers/forge!3342
 2020-11-06 13:02:34 +00:00
Hans Mackowiak
3c0bd8a591 PumpEffect: fix keywords using CardManaCost 2020-11-06 11:46:20 +01:00