external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,457 Commits 32 Branches 187 Tags
ffa7e3912151df72a7035d06af943b51e37121f4
Commit Graph

16012 Commits

Author SHA1 Message Date
John
3b6bbe4799 Add new file 2021-04-10 07:06:05 +00:00
John
62250cd41f Add new file 2021-04-10 07:05:08 +00:00
John
69a3963de0 Add new file 2021-04-10 07:04:23 +00:00
John
acefebfcd7 Add new file 2021-04-10 07:03:27 +00:00
John
b8f7d084c7 Add new file 2021-04-10 07:02:42 +00:00
John
fd420b3d81 Add new file 2021-04-10 07:01:26 +00:00
John
bf799869ef Add new file 2021-04-10 07:00:43 +00:00
John
8fc3004349 Add new file 2021-04-10 06:58:06 +00:00
Michael Kamensky
13b22e2047 Merge branch 'c21_9a' into 'master' 
C21 - 9 April (more)

See merge request core-developers/forge!4446
 2021-04-10 04:14:10 +00:00
Michael Kamensky
2a33ba9f93 Merge branch 'fixstuff' into 'master' 
Fix some stuff

See merge request core-developers/forge!4442
 2021-04-10 04:13:47 +00:00
Michael Kamensky
dd19ad356a Merge branch 'guardian-archon' into 'master' 
[C21] Guardian Archon

See merge request core-developers/forge!4445
 2021-04-10 04:12:48 +00:00
Lyu Zong-Hong
730ff1758f Fix Psychic Battle in multiplayer game 2021-04-10 10:10:21 +09:00
Northmoc
174099dd1d tempting_contract.txt 2021-04-09 19:58:18 -04:00
Northmoc
f7f49b98ff healing_technique.txt (Suthro) 2021-04-09 19:05:23 -04:00
Northmoc
18f0af1803 guardian_archon.txt 2021-04-09 17:54:04 -04:00
Bug Hunter
a4a58d9a06 Merge branch 'TRT-master-patch-75766' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/uvilda_dean_of_perfection_nassari_dean_of_expression.txt

See merge request core-developers/forge!4444
 2021-04-09 20:08:23 +00:00
Bug Hunter
861bb5f608 Update forge-gui/res/cardsfolder/upcoming/uvilda_dean_of_perfection_nassari_dean_of_expression.txt 2021-04-09 20:07:32 +00:00
Michael Kamensky
8e4d07163d Merge branch 'twosat-master-patch-58716' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4440
 2021-04-09 18:21:29 +00:00
Michael Kamensky
1af3cd40c0 Merge branch 'c21_9' into 'master' 
C21 - 9 April

See merge request core-developers/forge!4441
 2021-04-09 18:21:09 +00:00
Michael Kamensky
8e0eb9d110 Merge branch 'c21_8' into 'master' 
C21 - 8 April

See merge request core-developers/forge!4434
 2021-04-09 18:20:40 +00:00
Northmoc
bf7dbe0098 fain_the_broker.txt 2021-04-09 13:38:58 -04:00
Northmoc
f37d27f803 blot_out_the_sky.txt fix TokenScript 2021-04-09 13:34:25 -04:00
Northmoc
b98d2fbaa4 quicksilver_dagger.txt clean up Descs 2021-04-09 13:34:03 -04:00
Northmoc
181539a424 keen_duelist.txt 2021-04-09 13:01:46 -04:00
Andreas Bendel
585eb23b3c Update de-DE.properties 
translated lblLearnALesson
 2021-04-09 15:35:14 +00:00
Hythonia
cc8e8b2dd1 C21 Veyran & Panharmonicon rework 2021-04-09 15:15:29 +00:00
Northmoc
0b3bbad98f incarnation_technique.txt 2021-04-09 10:13:44 -04:00
Northmoc
9da11e05ee strixhaven_stadium.txt add TriggerZones$ 2021-04-09 09:57:36 -04:00
Northmoc
ecca6f8eda cunning_rhetoric.txt 2021-04-09 09:40:47 -04:00
Northmoc
b5c6f32d1f author_of_shadows.txt 2021-04-09 09:40:46 -04:00
Northmoc
f38c083b05 inkshield.txt 2021-04-09 09:40:46 -04:00
Northmoc
598a9e0918 felisa_fang_of_silverquill.txt (Suthro) 2021-04-09 09:40:45 -04:00
Michael Kamensky
c93c582ed5 Merge branch 'master' into 'master' 
Net Deck Archive Updates

See merge request core-developers/forge!4437
 2021-04-09 07:13:21 +00:00
Michael Kamensky
010cfb6b35 Merge branch 'lands' into 'master' 
Improve AI land handling

See merge request core-developers/forge!4435
 2021-04-09 07:13:19 +00:00
Michael Kamensky
b1d95a5fa0 Merge branch 'fixes' into 'master' 
Fixes

See merge request core-developers/forge!4433
 2021-04-09 07:10:27 +00:00
Michael Kamensky
0d4bf2ea2e Merge branch 'sponsor' into 'master' 
Scholarship Sponsor [C21]

See merge request core-developers/forge!4438
 2021-04-09 07:10:16 +00:00
Lyu Zong-Hong
9435701d10 Fix bug that when AI cast divide damage as you choose spells, human can't change targetcorrectly 2021-04-09 15:12:13 +09:00
Lyu Zong-Hong
7603943c38 Add Psychic Battle 2021-04-09 14:06:51 +09:00
Northmoc
a959f79bcf scholarship_sponsor.txt 2021-04-08 22:33:26 -04:00
Northmoc
9899d72dce witherbloom_command.txt fix Mill NumCards 2021-04-08 21:27:58 -04:00
Churrufli
4263ea6881 Net Deck Archive Updates 2021-04-09 00:07:21 +02:00
Adam Pantel
ab287858b3 Improve land handling 2021-04-08 16:05:54 -04:00
Northmoc
3827459229 - pic line 2021-04-08 13:20:21 -04:00
Northmoc
aaeb9f9e84 ajanis_aid.txt Rep Eff: CombatDamage -> IsCombat 2021-04-08 13:19:25 -04:00
Northmoc
61acb3e42b jeska_thrice_reborn.txt Rep Eff: CombatDamage -> IsCombat 2021-04-08 13:18:32 -04:00
Northmoc
4a8f299bb3 gifts_ungiven.txt clean up 2021-04-08 12:58:31 -04:00
Northmoc
5530ca94f3 add Mandatory to some searches that need it 2021-04-08 12:46:42 -04:00
Northmoc
61a1b888bd - add ChoiceTitle 2021-04-08 12:43:40 -04:00
Northmoc
a583701319 intuition.txt fix targeting/choosing 2021-04-08 12:35:10 -04:00
Northmoc
e7a5ffdf5f containment_breach.txt fix ValidTgts 2021-04-08 11:07:16 -04:00