external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +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
Michael Kamensky
673759f17b Merge branch 'city' into 'master' 
Fix originally printed property

Closes #1797

See merge request core-developers/forge!4453
 2021-04-11 04:20:44 +00:00
Adam Pantel
0e2d6ac196 C21: Stinging Study 2021-04-11 00:16:00 -04:00
Anthony Calosa
eb99915912 Merge branch 'master' into 'master' 
update ImageKeys

See merge request core-developers/forge!4459
 2021-04-11 02:22:04 +00:00
Anthony Calosa
501df02260 update ImageKeys 2021-04-11 10:03:56 +08:00
tool4EvEr
d74f6dba0a Fix Arlinn Kord transform 2021-04-10 23:28:11 +02:00
tool4EvEr
b590c6b55a CardTranslation: Add fallback for english only cards 2021-04-10 20:00:48 +02:00
John
175f38f114 Add new file 2021-04-10 16:53:05 +00:00
Michael Kamensky
44f69b2b0b Merge branch 'fixX' into 'master' 
Fix Thieving Skydiver 0 kicker

See merge request core-developers/forge!4450
 2021-04-10 16:28:25 +00:00
Michael Kamensky
02a1b139bf Merge branch 'lib' into 'master' 
Sylvan Library: Add ordering choice

See merge request core-developers/forge!4452
 2021-04-10 16:27:52 +00:00
Michael Kamensky
326cf81a0f Merge branch 'Williams-master-patch-30398' into 'master' 
C21 Suthro 10/04

See merge request core-developers/forge!4448
 2021-04-10 16:27:45 +00:00
John
8952ddc9dc Update witchs_clinic.txt 2021-04-10 15:31:37 +00:00
John
dfe2c6d064 Update veinwitch_coven.txt 2021-04-10 15:29:31 +00:00
John
fea2f30a1c Update veinwitch_coven.txt 2021-04-10 15:28:55 +00:00
tool4EvEr
5d8bd256f1 Fix originally printed property 2021-04-10 17:28:18 +02:00
John
d7f41f4a56 Add new file 2021-04-10 15:28:18 +00:00
John
9169ea6ebf Update trudge_garden.txt 2021-04-10 15:24:54 +00:00
John
20314c8952 Update trudge_garden.txt 2021-04-10 15:24:00 +00:00
John
f262075d2a Update pest_infestation.txt 2021-04-10 15:21:52 +00:00
John
37d9ea103b Update gyome_master_chef.txt 2021-04-10 15:21:20 +00:00
John
ef51f23308 Update ezzaroot_channeler.txt 2021-04-10 15:20:46 +00:00
John
11f75176b8 Update blossoming_bogbeast.txt 2021-04-10 15:15:33 +00:00
John
bd676c7c5c Update blight_mound.txt 2021-04-10 15:05:17 +00:00
tool4EvEr
ccf51356a9 Sylvan Library: Add ordering choice 2021-04-10 16:13:07 +02:00
tool4EvEr
ece32cbe70 Join XCantBe0 restrictions from both parts when combining costs 2021-04-10 13:51:16 +02:00
Bug Hunter
574e74350c Merge branch 'fixdispute' into 'master' 
Academic Dispute: Fix optional

See merge request core-developers/forge!4451
 2021-04-10 10:41:27 +00:00
tool4EvEr
4665f8c6c6 Academic Dispute: Fix optional 2021-04-10 12:40:32 +02:00
tool4EvEr
a1bdd1fc47 Fix Thieving Skydiver 0 kicker 2021-04-10 12:35:47 +02:00
Bug Hunter
cdcb801b50 Merge branch 'TRT-master-patch-77164' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/explosive_welcome.txt

See merge request core-developers/forge!4449
 2021-04-10 08:39:38 +00:00
Bug Hunter
5f4bfed2b5 Update forge-gui/res/cardsfolder/upcoming/explosive_welcome.txt 2021-04-10 08:39:23 +00:00
John
cffaa6fef8 Add new file 2021-04-10 07:09:15 +00:00
John
bf2e5392f8 Add new file 2021-04-10 07:08:31 +00:00
John
de6c93b849 Add new file 2021-04-10 07:07:47 +00:00
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
ad09233d4c Merge branch 'clash' into 'master' 
ClashEffect: Fix triggering for both players

See merge request core-developers/forge!4436
 2021-04-10 04:13:29 +00:00
Bug Hunter
2be3a38bb0 ClashEffect: Fix triggering for both players 2021-04-10 04:13:29 +00:00
Michael Kamensky
26467221b3 Merge branch '1759-extra-generated-text-on-auras' into 'master' 
Resolve "Extra generated text on Auras"

Closes #1759

See merge request core-developers/forge!4443
 2021-04-10 04:13:12 +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
Michael Kamensky
4fe91e9a6a Merge branch 'fix_psychic_battle' into 'master' 
Fix Psychic Battle in multiplayer game

See merge request core-developers/forge!4447
 2021-04-10 04:12:13 +00:00
Michael Kamensky
63d660d152 Merge branch 'noAbilities' into 'master' 
Fix NoAbilities failing for basic land types

See merge request core-developers/forge!4424
 2021-04-10 04:12:07 +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