external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,715 Commits 33 Branches 187 Tags
26e0bdb545a3753646b17bcb51b65ea575a6daff
Commit Graph

44715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
26e0bdb545 Merge branch 'typo' into 'master' 
biomass_mutation.txt typo

See merge request core-developers/forge!2888
 2020-06-20 14:33:16 +00:00
swordshine
d171577127 Merge branch 'patch' into 'master' 
Add Carrion Grub

See merge request core-developers/forge!2889
 2020-06-20 14:26:28 +00:00
swordshine
c9e0d7722c Add Carrion Grub 2020-06-20 21:52:09 +08:00
Northmoc
a95321de4e biomass_mutation.txt typo 2020-06-20 08:21:02 -04:00
Michael Kamensky
2ec4479994 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2886
 2020-06-19 14:32:34 +00:00
CCTV-1
414b8b0bae response codereview 2020-06-19 19:16:04 +08:00
CCTV-1
b4686e5643 some m21 cards 2020-06-19 11:13:42 +08:00
Michael Kamensky
28f6edaccb Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2884
 2020-06-18 12:39:03 +00:00
CCTV-1
2359a4b435 fix typo 2020-06-18 16:03:43 +08:00
CCTV-1
5b0bdff50c response codereview 2020-06-18 11:32:47 +08:00
Michael Kamensky
a7c5dd2681 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!2876
 2020-06-18 03:14:14 +00:00
Michael Kamensky
4d9bbef480 Merge branch 'M21.16' into 'master' 
M21 - 16 June

See merge request core-developers/forge!2883
 2020-06-18 03:13:48 +00:00
Tim Mocny
20b599d52a M21 - 16 June 2020-06-18 03:13:48 +00:00
Michael Kamensky
e9bcdcc133 Merge branch 'fix_menace_counters' into 'master' 
Fix menace counters

See merge request core-developers/forge!2885
 2020-06-18 03:12:01 +00:00
Sol
90dc1a6898 Update frillscare_mentor.txt 2020-06-18 02:40:47 +00:00
Sol
3a56cd60b8 Update blood_curdle.txt 2020-06-18 02:40:20 +00:00
CCTV-1
51ec7b049b light_of_promise.txt 2020-06-18 08:59:37 +08:00
CCTV-1
1061b2e605 some m21 cards 2020-06-17 21:09:20 +08:00
swordshine
a71f8e2932 Merge branch 'M21.15' into 'master' 
M21 - 15 June

See merge request core-developers/forge!2882
 2020-06-17 01:33:24 +00:00
Tim Mocny
90e9f738b0 M21 - 15 June 2020-06-17 01:33:23 +00:00
swordshine
68a33b1322 Merge branch 'typos' into 'master' 
Typos :: TgtPromp$ -> TgtPrompt$

See merge request core-developers/forge!2881
 2020-06-16 04:50:01 +00:00
Northmoc
d74f4aa671 TgtPromp$ -> TgtPrompt$ 2020-06-15 16:10:24 -04:00
Michael Kamensky
498acbd496 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2880
 2020-06-15 12:49:09 +00:00
CCTV-1
56cb550850 response codereview 2020-06-15 18:24:00 +08:00
CCTV-1
f28b9c8d03 code cleanup 2020-06-15 16:15:07 +08:00
CCTV-1
9a00c7d02a response codereview 2020-06-15 15:59:49 +08:00
CCTV-1
a7c69d6841 some m21 cards 2020-06-15 10:42:32 +08:00
Michael Kamensky
63f9457162 Merge branch '1451-archenemy-modes-are-not-working-as-intended' into 'master' 
Resolve "Archenemy modes are not working as intended"

Closes #1451

See merge request core-developers/forge!2878
 2020-06-14 03:19:57 +00:00
Hans Mackowiak
0a18cff766 Player: fix Scheme not triggering for set in motion 2020-06-13 21:15:39 +02:00
Andreas Bendel
95e5316336 Update de-DE.properties 2020-06-13 15:37:23 +00:00
swordshine
9888263507 Merge branch 'M21ed.rough' into 'master' 
M21 - edition file

See merge request core-developers/forge!2862
 2020-06-13 13:50:14 +00:00
Tim Mocny
2001d6e685 M21 - edition file 2020-06-13 13:50:14 +00:00
swordshine
39899fe859 Merge branch 'new_cards' into 'master' 
some m21 cards

See merge request core-developers/forge!2875
 2020-06-13 13:49:41 +00:00
CCTV-1
1ef8d32dfe response codereview 2020-06-13 21:23:42 +08:00
CCTV-1
9b16919c37 four m21 cards 2020-06-13 21:09:52 +08:00
CCTV-1
a4f70cea78 some m21 cards 2020-06-13 20:34:08 +08:00
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