external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 31 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

49974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
b856ad0374 translate learnLesson message. 2021-04-08 20:07:56 +08:00
Anthony Calosa
3aff3c51a8 Merge branch 'kevlahnota-master-patch-34682' into 'master' 
Update CEditorConstructed.java

See merge request core-developers/forge!4431
 2021-04-08 11:09:38 +00:00
Anthony Calosa
3e096a25f7 Update CEditorConstructed.java 2021-04-08 11:09:16 +00:00
Anthony Calosa
adb21e4a7e Merge branch 'c21_edition_update' into 'master' 
Update C21 Edition file

See merge request core-developers/forge!4430
 2021-04-08 11:03:38 +00:00
paul_snoops
3ea268aea7 Update C21 Edition file 2021-04-08 10:05:54 +01:00
Michael Kamensky
567a8913e4 Merge branch 'Williams-master-patch-18379' into 'master' 
C21 07/04 Suthro

See merge request core-developers/forge!4426
 2021-04-08 08:05:48 +00:00
John
fd89b30192 Update spawning_kraken.txt 2021-04-08 06:30:32 +00:00
John
ce3b327cff Update guardian_augmenter.txt 2021-04-08 06:29:55 +00:00
John
4e5ac4a921 Update curiosity_crafter.txt 2021-04-08 06:29:23 +00:00
Michael Kamensky
b44c1478b8 Merge branch 'c21_7' into 'master' 
C21 - 7 April

See merge request core-developers/forge!4422
 2021-04-08 04:10:42 +00:00
Michael Kamensky
b0890ad4bf Merge branch 'resolvedThisTurn' into 'master' 
Card: add AbilityResolvedThisTurn

See merge request core-developers/forge!4427
 2021-04-08 04:09:44 +00:00
Anthony Calosa
83d632e24c Merge branch 'master' into 'master' 
update preload itempool

See merge request core-developers/forge!4428
 2021-04-08 02:35:07 +00:00
Anthony Calosa
1e5874aed5 update preload itempool 2021-04-08 09:57:26 +08:00
Northmoc
e807d9a3e7 support for playerXCount TotalCommanderCastFromCommandZone 2021-04-07 21:22:21 -04:00
Northmoc
17bb74ff25 commanders_insight.txt 2021-04-07 21:19:44 -04:00
Hans Mackowiak
5c9e2839eb Card: add AbilityResolvedThisTurn 2021-04-08 02:13:45 +02:00
John
d670a761d9 Update paradox_zone.txt 2021-04-07 22:47:42 +00:00
John
b6a3f765a7 Update paradox_zone.txt 2021-04-07 22:42:30 +00:00
John
2ca2ceea5a Update sequence_engine.txt 2021-04-07 22:41:58 +00:00
John
01b4ab512c Update spawning_kraken.txt 2021-04-07 22:41:33 +00:00
John
d18a6c3479 Update theoretical_duplication.txt 2021-04-07 22:40:59 +00:00
John
ab931cdcb4 Update curiosity_crafter.txt 2021-04-07 22:40:03 +00:00
John
7252b0e69a Add new file 2021-04-07 22:39:04 +00:00
John
ab0ed23c83 Add new file 2021-04-07 22:38:21 +00:00
John
18c002094f Add new file 2021-04-07 22:37:04 +00:00
John
d5f73cb633 Add new file 2021-04-07 22:36:15 +00:00
John
c738da065e Add new file 2021-04-07 22:35:30 +00:00
John
a9296d67f7 Add new file 2021-04-07 22:34:40 +00:00
John
78cb417cfc Add new file 2021-04-07 22:34:00 +00:00
John
4bec5f6792 Add new file 2021-04-07 22:33:14 +00:00
John
3da03f66e0 Add new file 2021-04-07 22:31:33 +00:00
Northmoc
e379c676d0 muse_vortex.txt 2021-04-07 16:58:29 -04:00
Bug Hunter
6565494781 Merge branch 'TRT-master-patch-82622' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/abundant_harvest.txt

See merge request core-developers/forge!4425
 2021-04-07 20:45:09 +00:00
Bug Hunter
aafcd25403 Update forge-gui/res/cardsfolder/upcoming/abundant_harvest.txt 2021-04-07 20:44:20 +00:00
Northmoc
72c4c0007f oversimplify.txt fix Descs 2021-04-07 15:55:36 -04:00
Northmoc
fd1ce7a750 geometric_nexus.txt 2021-04-07 15:53:26 -04:00
Northmoc
fbbdec5e4e oversimplify.txt 2021-04-07 15:33:51 -04:00
Northmoc
443b613513 deekah_fractal_theorist.txt remove default params 2021-04-07 15:05:05 -04:00
Michael Kamensky
2fa44fc0f4 Merge branch 'Williams-master-patch-07577' into 'master' 
C21 Discord Contributions 06/04

See merge request core-developers/forge!4410
 2021-04-07 18:02:04 +00:00
Northmoc
5ed21c3ce3 deekah_fractal_theorist.txt 2021-04-07 13:16:16 -04:00
Northmoc
f1d52fb530 ruxa_patient_professor.txt (Suthro) 2021-04-07 12:59:37 -04:00
Northmoc
d418ad8369 fractal_harness.txt 2021-04-07 12:46:48 -04:00
Bug Hunter
7b58d8e77e Merge branch 'TRT-master-patch-33908' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/fractal_summoning.txt

See merge request core-developers/forge!4423
 2021-04-07 16:31:09 +00:00
Bug Hunter
38971c2946 Update forge-gui/res/cardsfolder/upcoming/fractal_summoning.txt 2021-04-07 16:30:10 +00:00
Northmoc
6cef7fd6b6 creative_technique.txt 2021-04-07 11:14:38 -04:00
Northmoc
92ffb0b1e5 rionya_fire_dancer.txt 2021-04-07 10:44:21 -04:00
Northmoc
75f03f1fd1 support for SumCMCGraveyard (Inferno Project) 2021-04-07 10:30:01 -04:00
Northmoc
0306817ac8 inferno_project.txt 2021-04-07 10:29:14 -04:00
Tim Mocny
03b5dc046d Merge branch 'cmc' into 'master' 
fix cmc necrotic_fumes.txt

See merge request core-developers/forge!4421
 2021-04-07 13:32:42 +00:00
Northmoc
bb5cb8a773 necrotic_fumes.txt 2021-04-07 09:31:40 -04:00