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

16315 Commits

Author SHA1 Message Date
tool4EvEr
7c934d29ac always remove counter 2021-04-23 23:41:24 +02:00
tool4EvEr
39729cb3da placer is target 2021-04-23 22:00:40 +02:00
Michael Kamensky
aadfdac4c5 Merge branch 'Williams-master-patch-36117' into 'master' 
SLD Dr Lair Secretorium Super Drop

See merge request core-developers/forge!4583
 2021-04-23 19:17:23 +00:00
John
2e358116c2 Update Secret Lair Drop Series.txt 2021-04-23 14:50:59 +00:00
swordshine
71d88523b2 Merge branch 'update_japanese_localization_mana_value' into 'master' 
Update Mana Value in Japanese Localization

See merge request core-developers/forge!4582
 2021-04-23 10:12:14 +00:00
sowrdshine
99bb45d96a More cleanup 2021-04-23 18:07:04 +08:00
sowrdshine
5ab030242b Fixed Leyline Invocation 2021-04-23 17:17:34 +08:00
John
736d9bbd98 Update Secret Lair Drop Series.txt 2021-04-23 08:23:48 +00:00
Lyu Zong-Hong
6295ebdb09 Update Mana Value in Japanese Localization 2021-04-23 13:35:44 +09:00
Michael Kamensky
380a27b83d Merge branch 'update_in_game_text' into 'master' 
Update in-game text and also English and Japanese localization (CMC -> mana value and etc.)

See merge request core-developers/forge!4581
 2021-04-23 04:30:06 +00:00
Michael Kamensky
691af037a4 Merge branch 'phoenix' into 'master' 
Retriever Phoenix: Fix check

See merge request core-developers/forge!4577
 2021-04-23 04:29:03 +00:00
Alumi
74e4efba52 Update Oracle after STX release 2021-04-23 04:27:27 +00:00
Lyu Zong-Hong
2d7e88a8c2 Update in-game text and also English and Japanese localization 2021-04-23 11:01:34 +09:00
Anthony Calosa
d82c8d466a Merge branch 'master' into 'master' 
update check

See merge request core-developers/forge!4580
 2021-04-23 01:15:12 +00:00
Sol
9edbbf399f Merge branch 'esix' into 'master' 
Esix: Script typo

See merge request core-developers/forge!4575
 2021-04-23 01:13:11 +00:00
Anthony Calosa
345316b9b0 update check 2021-04-23 09:12:02 +08:00
tool4EvEr
245827825e Fix check 2021-04-22 20:41:36 +02:00
tool4EvEr
987dce2643 Fix PlayMain1 scripts 2021-04-22 20:14:31 +02:00
tool4EvEr
4f2abad39d Script typo 2021-04-22 20:03:19 +02:00
Michael Kamensky
49f7ad1281 - Achievements for STX and C21 by Marek. 2021-04-22 19:35:37 +03:00
Michael Kamensky
6731cdcc9d Merge branch 'twosat-master-patch-53531' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4571
 2021-04-22 16:25:21 +00:00
Northmoc
e8c0655186 allow precon cards in Planar Conquest 2021-04-22 12:18:42 -04:00
Northmoc
0b9755405e nacatl_war_pride.txt 2021-04-22 11:58:36 -04:00
Andreas Bendel
8b7a183e63 Update de-DE.properties 
CMC is now Mana Value
 2021-04-22 15:20:52 +00:00
Tim Mocny
7a094478f3 Merge branch 'typo' into 'master' 
teachings_of_the_archaics.txt only 3 cards

See merge request core-developers/forge!4570
 2021-04-22 14:07:47 +00:00
Northmoc
e4e75a5f73 update some token lists 2021-04-21 13:18:27 -04:00
Northmoc
7da4381d38 update some token lists 2021-04-21 13:18:27 -04:00
tool4EvEr
6d442b12a0 Yarok: Fix staticability check 2021-04-21 17:25:42 +02:00
Sol
0019f83e33 Merge branch 'breena' into 'master' 
Fix Breena Trigger

See merge request core-developers/forge!4560
 2021-04-21 14:13:20 +00:00
Hans Mackowiak
f3011b1790 Merge branch 'fixMana' into 'master' 
Fix mana conversion checking wrong card from hand

See merge request core-developers/forge!4561
 2021-04-21 04:36:17 +00:00
Hans Mackowiak
ea79f84b71 Merge branch 'fixyarok' into 'master' 
Fix Yarok

See merge request core-developers/forge!4562
 2021-04-21 04:35:53 +00:00
tool4EvEr
040d6929dc Fix Yarok 2021-04-20 23:15:32 +02:00
tool4EvEr
2fe9c38fff Fix mana conversion checking wrong card from hand 2021-04-20 20:21:39 +02:00
tool4EvEr
256b54b6b5 Fix Breena Trigger 2021-04-20 19:01:57 +02:00
Michael Kamensky
062ad5d92f Merge branch 'esix_fractal_bloom' into 'master' 
Add Esix, Fractal Bloom and necessary supports

See merge request core-developers/forge!4557
 2021-04-20 16:44:22 +00:00
Northmoc
207408ae20 elemental_expressionist.txt 2021-04-20 08:59:54 -04:00
Bug Hunter
2843ca9b49 Merge branch 'TRT-master-patch-20042' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt

See merge request core-developers/forge!4558
 2021-04-20 12:05:08 +00:00
Bug Hunter
efc09d8a3f Update forge-gui/res/cardsfolder/upcoming/detention_vortex.txt 2021-04-20 12:03:43 +00:00
Lyu Zong-Hong
e6714bf45e Add Esix, Fractal Bloom and necessary supports 2021-04-20 20:47:22 +09:00
Lyu Zong-Hong
fdb0db2d41 Update Japanese Card Translation 2021-04-20 19:54:12 +09:00
Michael Kamensky
ec52a07fe9 Merge branch 'clone' into 'master' 
Temporary clones: restore Remembered/Imprinted

Closes #1792

See merge request core-developers/forge!4490
 2021-04-20 04:00:42 +00:00
Bug Hunter
b7a475cc0a Temporary clones: restore Remembered/Imprinted 2021-04-20 04:00:41 +00:00
Michael Kamensky
86b37e7df0 Merge branch 'chaos' into 'master' 
Chaos Warp: Fix wrong target

See merge request core-developers/forge!4551
 2021-04-20 03:58:15 +00:00
Northmoc
daedffc0da specter_of_the_fens.txt add Flying! 2021-04-19 15:53:25 -04:00
Northmoc
c489f88f77 brainstorm.txt cleanup Descs 2021-04-19 15:50:55 -04:00
tool4EvEr
660806fb7c Fix wrong target 2021-04-19 19:31:46 +02:00
Michael Kamensky
c216498198 Merge branch 'master' into 'master' 
Update cards translations

See merge request core-developers/forge!4540
 2021-04-19 13:52:31 +00:00
Hans Mackowiak
539c94f36f fix descendants path 2021-04-19 15:02:40 +02:00
Hans Mackowiak
c8b43fa8ab Kwain: fix Ability Description 2021-04-19 13:08:19 +02:00
Hans Mackowiak
118cf70e40 Kwain: fix Ability Description 2021-04-19 10:21:43 +02:00