external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,776 Commits 31 Branches 187 Tags
3ccce18f23481cdbaa409e5327b8640c6dba8cc4
Commit Graph

15480 Commits

Author SHA1 Message Date
Anthony Calosa
fc6237cd29 update advance filter 
support alternate parts limited to card names, keywords, rules text, types and subtypes
 2021-03-29 21:26:14 +08:00
Anthony Calosa
28d1cc2055 Merge remote-tracking branch 'core/master' 2021-03-29 18:30:55 +08:00
Anthony Calosa
cffd99b68d update advance filter 2021-03-29 18:30:09 +08:00
Michael Kamensky
ac92a92090 Merge branch 'targetselection' into 'master' 
TargetSelection: Fix stack peeking detection

See merge request core-developers/forge!4295
 2021-03-29 08:00:21 +00:00
Bug Hunter
28dbb309cf TargetSelection: Fix stack peeking detection 2021-03-29 08:00:21 +00:00
Michael Kamensky
1c0a7d8475 Merge branch 'Williams-master-patch-39368' into 'master' 
Update adrix_and_nev_twincasters.txt

See merge request core-developers/forge!4296
 2021-03-29 07:58:48 +00:00
Michael Kamensky
5f63b5f907 Merge branch 'card-fixes' into 'master' 
Inzerva doesn't target

See merge request core-developers/forge!4297
 2021-03-29 07:58:38 +00:00
Anthony Calosa
7459cd65d9 unused variable 2021-03-29 15:23:57 +08:00
Anthony Calosa
0b61ddaff7 fix advance filter for adventure and flip 2021-03-29 15:23:03 +08:00
Anthony Calosa
d76ae27611 fix cards 2021-03-29 04:46:29 +00:00
Adam Pantel
c08775f3e3 Inzerva doesn't target 2021-03-28 22:03:12 -04:00
John
d94ceaf492 Update adrix_and_nev_twincasters.txt 2021-03-28 21:57:32 +00:00
Michael Kamensky
9802cb62d9 Merge branch 'update_word_of_command' into 'master' 
Update Word of Command mana payment check conditions

See merge request core-developers/forge!4291
 2021-03-28 12:26:30 +00:00
Michael Kamensky
0662d44a86 Merge branch 'Williams-master-patch-67517' into 'master' 
Update Strixhaven Mystical Archive.txt

See merge request core-developers/forge!4293
 2021-03-28 09:36:11 +00:00
Michael Kamensky
c3792191a2 Merge branch 'Williams-master-patch-03072' into 'master' 
STX Lesson Cards

See merge request core-developers/forge!4289
 2021-03-28 09:36:01 +00:00
Michael Kamensky
97ff18c3e2 Merge branch 'uvilda' into 'master' 
Uvilda

See merge request core-developers/forge!4288
 2021-03-28 09:35:44 +00:00
John
54fda151be Update Strixhaven Mystical Archive.txt 2021-03-28 08:43:02 +00:00
John
04c4cf4426 Update osgir_the_Reconstructor.txt 2021-03-28 08:04:23 +00:00
John
7c81fe3339 Add new file 2021-03-28 08:03:38 +00:00
John
330862e6c0 Update adrix_and_nev_twincasters.txt 2021-03-28 07:41:09 +00:00
John
ce309a384e Update environmental_sciences.txt 2021-03-28 07:38:14 +00:00
Adam Pantel
6bc01c3472 Uvilda 2021-03-28 03:14:37 -04:00
Adam Pantel
9ecf3e11bf Zaffai 2021-03-28 03:12:59 -04:00
Lyu Zong-Hong
7fc85a47be Update Word of Command mana payment check conditions 2021-03-28 15:09:01 +09:00
John
6accf7fd6c Update environmental_sciences.txt 2021-03-27 22:42:37 +00:00
John
f619155667 Update introduction_to_anihilation.txt 2021-03-27 19:34:23 +00:00
John
89d50af521 Update expanded_anatomy.txt 2021-03-27 19:32:18 +00:00
John
fe3a111d6f Update adrix_and_nev_twincasters.txt 2021-03-27 19:31:43 +00:00
John
75b6b6316b Add new file 2021-03-27 19:30:57 +00:00
John
f64822a18b Add new file 2021-03-27 19:29:45 +00:00
John
e566fb2d57 Add new file 2021-03-27 19:29:14 +00:00
John
9f5931509c Add new file 2021-03-27 19:28:39 +00:00
John
deb7ee8c3a Add new file 2021-03-27 19:27:13 +00:00
Hans Mackowiak
6a56e29474 Breena with better Choices 2021-03-27 17:19:39 +01:00
Michael Kamensky
c79ccd7e23 Merge branch 'stx_27' into 'master' 
STX - 27 Mar

See merge request core-developers/forge!4287
 2021-03-27 15:54:51 +00:00
Michael Kamensky
36e395e3a3 Merge branch 'master' into 'master' 
STX cards + Abundant Harvest

See merge request core-developers/forge!4285
 2021-03-27 15:54:25 +00:00
Northmoc
c0b106c7ef valentin_dean_of_the_vein_lisette_dean_of_the_root.txt 2021-03-27 11:40:28 -04:00
Hythonia
23c8c5da19 Will fix 2021-03-27 15:37:30 +01:00
Hythonia
883f1a7cf8 DeckHas/DeckHints 2021-03-27 15:35:37 +01:00
Michael Kamensky
b2ff43bd9b Merge branch 'twosat-master-patch-55523' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4284
 2021-03-27 14:06:30 +00:00
Northmoc
de30329a58 prismari_apprentice.txt 2021-03-27 09:23:51 -04:00
Hythonia
2dbd099c68 STX: Inkling type 2021-03-27 13:55:54 +01:00
Hythonia
25da363d56 STX: Rowan // Will 2021-03-27 13:50:10 +01:00
Hythonia
a957566fc9 STX: Lorehold Apprentice 2021-03-27 13:28:45 +01:00
Michael Kamensky
97db42427e Merge branch 'shaileEnterUnder' into 'master' 
Card: add turnInController to keep track under which control it entered

See merge request core-developers/forge!4282
 2021-03-27 12:14:09 +00:00
Hythonia
34fabaab5f STA: Abundant Harvest 2021-03-27 12:33:41 +01:00
Andreas Bendel
11893e244e Update de-DE.properties 
some Choose-strings
 2021-03-27 11:29:17 +00:00
Hythonia
24f1285a43 Breena and PlayerProperty.java update 2021-03-27 12:02:13 +01:00
Anthony Calosa
5ea2aca8a8 set correct imagekey for rollback 2021-03-27 10:51:53 +00:00
Hans Mackowiak
088b4fa07e Card: add turnInController to keep track under which control it entered 2021-03-27 11:35:52 +01:00