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

44968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
5a0f5bc4ba lord_of_atlantis.txt DeckHints 2020-06-10 10:27:35 -04:00
Northmoc
ead2f62b5f tahngarth_first_mate.txt CARDNAME missing 2020-06-10 09:18:46 -04:00
Michael Kamensky
779db06765 Merge branch 'M21.9' into 'master' 
M21 - 9 June

See merge request core-developers/forge!2865
 2020-06-10 05:29:04 +00:00
Tim Mocny
288fe96a94 M21 - 9 June 2020-06-10 05:29:02 +00:00
Michael Kamensky
f3b86e0532 Merge branch 'tamitypo' into 'master' 
tamiyo_field_researcher.txt typo

See merge request core-developers/forge!2864
 2020-06-10 05:28:03 +00:00
Michael Kamensky
deeccf93d4 Merge branch 'chandraflamecat' into 'master' 
chandra_flames_catalyst.txt

See merge request core-developers/forge!2863
 2020-06-10 05:27:25 +00:00
Northmoc
c03848dc1d tamiyo_field_researcher.txt typo 2020-06-09 10:49:48 -04:00
Northmoc
a44b2a31cd chandra_flames_catalyst.txt 2020-06-09 10:48:56 -04:00
Michael Kamensky
9370dc0036 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2857
 2020-06-09 08:17:46 +00:00
Michael Kamensky
4ef89b9963 Merge branch 'M21.8' into 'master' 
M21 - 8 June

See merge request core-developers/forge!2861
 2020-06-09 05:18:55 +00:00
Tim Mocny
30dcdfb88a M21 - 8 June 2020-06-09 05:18:55 +00:00
Michael Kamensky
833395fb92 Merge branch 'dnaga' into 'master' 
desiccated_naga.txt AI update

See merge request core-developers/forge!2859
 2020-06-08 14:48:06 +00:00
Michael Kamensky
52b5271af5 Merge branch 'M21.6' into 'master' 
liliana_death_mage.txt

See merge request core-developers/forge!2860
 2020-06-08 14:47:57 +00:00
Northmoc
b8a7696f40 liliana_death_mage.txt 2020-06-08 09:34:18 -04:00
Northmoc
3cb80c43bf desiccated_naga.txt AI update 2020-06-08 09:25:27 -04:00
Sol
225247d9dc Merge branch 'trackerRevealLKI' into 'master' 
PlayerControllerHuman: fix reveal on LKI card list

See merge request core-developers/forge!2848
 2020-06-07 14:44:16 +00:00
Hans Mackowiak
2db862ce2d PlayerControllerHuman: fix reveal on LKI card list 2020-06-07 14:44:16 +00:00
Andreas Bendel
e0a1990014 Update de-DE.properties 
Typo in translation of lblSelectUpToNumCardFromPlayerZone
 2020-06-07 09:33:10 +00:00
Michael Kamensky
68a559552d Merge branch 'M21.6' into 'master' 
M21 - 6 June

See merge request core-developers/forge!2856
 2020-06-06 15:26:21 +00:00
Michael Kamensky
2ddcb34a08 Merge branch 'chandra' into 'master' 
Chandra SSB

See merge request core-developers/forge!2855
 2020-06-06 15:24:33 +00:00
Michael Kamensky
28f794743c Merge branch 'M21.5' into 'master' 
M21 - 5 June

See merge request core-developers/forge!2853
 2020-06-06 15:24:30 +00:00
Tim Mocny
5b830aeb37 M21 - 5 June 2020-06-06 15:24:28 +00:00
Northmoc
499f33ed69 teferis_protege.txt 2020-06-06 11:02:40 -04:00
Northmoc
46ead353d0 ss3 2020-06-06 10:37:03 -04:00
Michael Kamensky
36c04efbff Merge branch 'trampleFix' into 'master' 
PlayerControllerHuman: fix trample assign to defender, fix trample counter

See merge request core-developers/forge!2854
 2020-06-06 09:50:49 +00:00
Hans Mackowiak
653d214027 PlayerControllerHuman: fix trample assign to defender, fix trample counter 2020-06-06 09:10:05 +02:00
Michael Kamensky
f60fdf3fa5 Merge branch 'M21.4' into 'master' 
M21 - 4 June

See merge request core-developers/forge!2851
 2020-06-06 03:35:43 +00:00
Tim Mocny
b3015128a1 M21 - 4 June 2020-06-06 03:35:43 +00:00
Sol
2c038396b6 Update retribution_of_the_ancients.txt 2020-06-05 16:17:28 +00:00
Michael Kamensky
2370c2c8ba Merge branch 'counterTypeNetwork' into 'master' 
CounterType: needs to be serializable for Network

See merge request core-developers/forge!2852
 2020-06-05 05:56:19 +00:00
Hans Mackowiak
d743bd5168 CounterType: needs to be serializable for Network 2020-06-05 07:42:15 +02:00
Michael Kamensky
4880448102 Merge branch 'migrate.upcoming' into 'master' 
Migrate remaining IKO/C20 from upcoming

See merge request core-developers/forge!2850
 2020-06-04 17:49:38 +00:00
Northmoc
b34fd44cfd Migrate remaining IKO/C20 from upcoming 2020-06-04 12:08:34 -04:00
Michael Kamensky
4acfd71123 Merge branch 'references' into 'master' 
References cleanups

Closes #1395

See merge request core-developers/forge!2813
 2020-06-02 02:50:34 +00:00
Tim Mocny
dd72be2f7a References cleanups 2020-06-02 02:50:34 +00:00
Michael Kamensky
b140ca57be Merge branch 'patch-7' into 'master' 
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!2845
 2020-06-02 02:49:53 +00:00
Michael Kamensky
14f2b25c45 Merge branch 'patch-8' into 'master' 
Update Amalia Sheran Sharm 1.dck

Closes #1440

See merge request core-developers/forge!2846
 2020-06-02 02:49:47 +00:00
Michael Kamensky
8bfcd1815a Merge branch 'sedgeSliverFix' into 'master' 
Card: fix addChangedCardTraits when multiple StaticAbilities has the same timestamp

See merge request core-developers/forge!2849
 2020-06-02 02:49:04 +00:00
Sol
95a8f5c031 Update pyrewild_shaman.txt 2020-06-02 02:34:22 +00:00
Hans Mackowiak
1b40987bbd Card: fix addChangedCardTraits when multiple StaticAbilities has the same timestamp 2020-06-01 22:04:55 +02:00
Sol
febeaf4eec Merge branch '1Junbnr' into 'master' 
1 June bannings

See merge request core-developers/forge!2847
 2020-06-01 19:40:07 +00:00
Tim Mocny
1079ad8e83 1 June bannings 2020-06-01 19:40:07 +00:00
Tim Mocny
d67a1e7534 Update Amalia Sheran Sharm 1.dck 2020-06-01 14:20:10 +00:00
Tim Mocny
46b3c622f0 Update Secret Lair Drop Series.txt 2020-06-01 14:15:43 +00:00
Michael Kamensky
8714399b51 Merge branch '1441-avoid-bad-performance-pattern-involving-interger-parseint' into 'master' 
Resolve "Avoid bad performance pattern involving Interger.parseInt"

Closes #1441

See merge request core-developers/forge!2844
 2020-05-31 14:22:26 +00:00
Hans Mackowiak
19c07f5bef Resolve "Avoid bad performance pattern involving Interger.parseInt" 2020-05-31 14:22:25 +00:00
Michael Kamensky
33e7cde2d6 Merge branch 'sld' into 'master' 
SLD summer drops

Closes #1438

See merge request core-developers/forge!2842
 2020-05-31 05:25:55 +00:00
Michael Kamensky
12d6790495 Merge branch 'cycling' into 'master' 
flourishing_fox.txt fix

Closes #1435

See merge request core-developers/forge!2843
 2020-05-31 05:25:47 +00:00
Northmoc
37f2e75dc4 flourishing_fox.txt fix 2020-05-30 20:17:13 -04:00
Northmoc
019969d804 SLD summer drops 2020-05-30 20:08:15 -04:00