external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,469 Commits 31 Branches 187 Tags
b7f15da799d1d9866c92f7f61013ee9e55e2c82b
Commit Graph

19651 Commits

Author SHA1 Message Date
paul_snoops
82fc79cefb NEC edition update 2022-02-09 00:35:23 +00:00
paul_snoops
b777af5540 WAR edition citizen token fix 2022-02-08 23:58:09 +00:00
TRT
b44530d296 Vigor Mortis counters 2022-02-08 17:38:46 +01:00
Michael Kamensky
c2ff0bcbcd Merge branch 'fix' into 'master' 
c_a_treasure_sac.txt desc fix

See merge request core-developers/forge!6186
 2022-02-08 12:41:46 +00:00
Bug Hunter
0eb952715e Fix Inventive Iteration 2022-02-08 09:40:11 +00:00
Northmoc
a72ac6d3ae c_a_treasure_sac.txt desc fix 2022-02-07 23:42:16 -05:00
Michael Kamensky
7272856f93 Merge branch 'strings' into 'master' 
Fixing/adding flexibility to ChangeZoneEffect stack description builder

See merge request core-developers/forge!6136
 2022-02-08 04:16:28 +00:00
Tim Mocny
254ba8ed81 Fixing/adding flexibility to ChangeZoneEffect stack description builder 2022-02-08 04:16:27 +00:00
Michael Kamensky
e27e4e4de8 Merge branch 'neo_7' into 'master' 
NEO – 7 Feb

See merge request core-developers/forge!6184
 2022-02-08 04:14:30 +00:00
Tim Mocny
bb7331a708 NEO – 7 Feb 2022-02-08 04:14:26 +00:00
Tim Mocny
a9abb8c30b NEO: Reckoner Bankbuster tweaks 2022-02-08 04:13:52 +00:00
Michael Kamensky
3f848abd5a Merge branch 'mMR' into 'master' 
Cleanup meetsManaRestrictions

See merge request core-developers/forge!6182
 2022-02-07 18:45:47 +00:00
Bug Hunter
2da9647021 Cleanup meetsManaRestrictions 2022-02-07 18:45:46 +00:00
Michael Kamensky
f1e6e868bf Merge branch 'neo_mindlink' into 'master' 
NEO: Mindlink Mech and support

See merge request core-developers/forge!6181
 2022-02-07 18:44:45 +00:00
Tim Mocny
223cecca97 NEO: Mindlink Mech and support 2022-02-07 18:44:44 +00:00
Michael Kamensky
dbf5a5a386 Merge branch 'neo_mechtitan' into 'master' 
NEO: Mechtitan Core + Mechtitan token and support

See merge request core-developers/forge!6162
 2022-02-07 18:43:43 +00:00
Tim Mocny
c41d72044f NEO: Mechtitan Core + Mechtitan token and support 2022-02-07 18:43:40 +00:00
Michael Kamensky
1ae9cc65e1 Merge branch 'freshmaster' into 'master' 
Tested card scripts for NEO (2022-06-06)

See merge request core-developers/forge!6179
 2022-02-07 04:36:44 +00:00
Michael Kamensky
2514d857f9 Merge branch 'neo_6' into 'master' 
NEO – 6 Feb

See merge request core-developers/forge!6174
 2022-02-07 04:36:13 +00:00
Tim Mocny
9db08ea013 NEO – 6 Feb 2022-02-07 04:36:10 +00:00
Renato Santos
d23b38b18a Requested corrections 2022-02-07 04:25:16 +00:00
Renato Santos
9c0d347679 New tested card scripts (2022-06-06) 2022-02-07 00:13:21 +00:00
Northmoc
dc2683fde9 ascent_of_the_worthy.txt finish SpellDesc for III 2022-02-06 16:11:53 -05:00
Michael Kamensky
621039b1c3 Merge branch 'johnwilliams7-master-patch-49806' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6172
 2022-02-06 14:03:42 +00:00
John Williams
0adf9e666c Update Secret Lair Drop Series.txt 2022-02-06 12:43:35 +00:00
paul_snoops
53b35c6424 Saiba Trespassers name fix in edition 2022-02-06 10:44:20 +00:00
Michael Kamensky
2baca7f34a Merge branch 'neo_5' into 'master' 
NEO – 5 Feb

See merge request core-developers/forge!6165
 2022-02-06 09:37:41 +00:00
Tim Mocny
4c2497c084 NEO – 5 Feb 2022-02-06 09:37:40 +00:00
Michael Kamensky
12dafa6ec7 - Added puzzle PS_VOW4. 2022-02-06 08:15:49 +03:00
Michael Kamensky
27227c6a16 Merge branch 'neo_hidetsugu_saga' into 'master' 
NEO: Hidetsugu Consumes All // Vessel of the All-Consuming and support

See merge request core-developers/forge!6150
 2022-02-06 05:00:39 +00:00
Tim Mocny
bd7b76ddb3 NEO: Hidetsugu Consumes All // Vessel of the All-Consuming and support 2022-02-06 05:00:36 +00:00
Michael Kamensky
72b1c9002e Merge branch 'freshmaster' into 'master' 
Tested card scripts for NEO (2022-02-05)

See merge request core-developers/forge!6159
 2022-02-06 04:58:16 +00:00
Michael Kamensky
9b78a66e0c Merge branch 'thauma' into 'master' 
Battlefield Thaumaturge fixes

See merge request core-developers/forge!6164
 2022-02-06 04:58:06 +00:00
Michael Kamensky
c9eb46a5c5 Merge branch 'paco_deckeditorloadingtimes' into 'master' 
Fix Deck Editor filter update times

See merge request core-developers/forge!6160
 2022-02-06 04:57:34 +00:00
Paco Ito
5d46763df9 Fix Deck Editor filter update times 2022-02-06 04:57:33 +00:00
Michael Kamensky
3471dcd7d6 Merge branch 'conddesc' into 'master' 
fix some ConditionDescriptions

See merge request core-developers/forge!6166
 2022-02-06 04:56:40 +00:00
Tim Mocny
def76d2b3e fix some ConditionDescriptions 2022-02-06 04:56:37 +00:00
Tim Mocny
bcdddb36f0 refactor the "all colors" Citizen token from WAR 2022-02-06 04:55:42 +00:00
tool4EvEr
d0d3723d43 Battlefield Thaumaturge fixes 2022-02-05 23:09:34 +01:00
Renato Santos
03cfd6cd1b Requested corrections 2022-02-05 19:51:43 +00:00
Renato Santos
ffb55c606f Requested correction 2022-02-05 18:32:12 +00:00
Renato Santos
f05b3cb118 Requested corrections 2022-02-05 18:01:41 +00:00
Renato Santos
05d041c6e9 New tested card scripts 2022-02-05 10:48:39 +00:00
paul_snoops
2eab1ebc62 final 2022-02-05 10:30:51 +00:00
paul_snoops
bbbf57777e thelist 2022-02-05 10:30:51 +00:00
paul_snoops
4fbbfb3961 NEO and NEC edition updates 2022-02-05 10:30:51 +00:00
Michael Kamensky
f746cd9c18 Merge branch 'neo_3' into 'master' 
NEO – 3 Feb

See merge request core-developers/forge!6143
 2022-02-05 05:42:10 +00:00
Tim Mocny
6bf322eb3f NEO – 3 Feb 2022-02-05 05:42:04 +00:00
Michael Kamensky
9a4cab4856 Merge branch 'rank2' into 'master' 
CardRanker tweak

See merge request core-developers/forge!6140
 2022-02-05 05:40:47 +00:00
Bug Hunter
bcd910748d CardRanker tweak 2022-02-05 05:40:46 +00:00