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

44679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
103669eee3 Merge branch 'hounddog' into 'master' 
Hound -> Dog

Closes #1454

See merge request core-developers/forge!2868
 2020-06-13 12:17:05 +00:00
Tim Mocny
25260f8d7c Hound -> Dog 2020-06-13 12:17:05 +00:00
swordshine
eeec573798 Merge branch 'M21.11' into 'master' 
M21 - 11 June

See merge request core-developers/forge!2872
 2020-06-13 05:09:45 +00:00
Tim Mocny
f6e56ee23f M21 - 11 June 2020-06-13 05:09:44 +00:00
Michael Kamensky
d175ca87c7 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2873
 2020-06-12 20:25:52 +00:00
CCTV-1
a59412550d some m21 cards 2020-06-12 13:18:15 +08:00
CCTV-1
dd78ab67eb fix card 'Havoc Jester' P/T 2020-06-12 13:17:31 +08:00
swordshine
05100f5689 Merge branch 'M21.10' into 'master' 
M21 - 10 June

See merge request core-developers/forge!2869
 2020-06-12 01:44:02 +00:00
Tim Mocny
69b30e4313 M21 - 10 June 2020-06-12 01:44:02 +00:00
swordshine
d509c87371 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2871
 2020-06-12 01:42:41 +00:00
CCTV-1
aa15b7d5da remove LegacyImage 2020-06-12 07:53:30 +08:00
CCTV-1
674514c158 some m21 cards 2020-06-11 20:50:51 +08:00
Michael Kamensky
961fdae04a Merge branch 'cube_patch' into 'master' 
update cubes

See merge request core-developers/forge!2870
 2020-06-11 04:51:46 +00:00
swordshine
73ac827d0b Merge branch 'lord.AI' into 'master' 
lord_of_atlantis.txt DeckHints

See merge request core-developers/forge!2867
 2020-06-11 01:17:27 +00:00
swordshine
6961d63127 Merge branch 'tahngarth.typo' into 'master' 
tahngarth_first_mate.txt typo

See merge request core-developers/forge!2866
 2020-06-11 01:17:10 +00:00
CCTV-1
19f36789c2 support amaz peasant cube 2020-06-11 08:28:03 +08:00
CCTV-1
31dea9a94d update mtga cube list 2020-06-11 08:27:37 +08:00
CCTV-1
c6839717f9 remove duplicate cube 2020-06-11 08:27:14 +08:00
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