external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,951 Commits 31 Branches 187 Tags
b049c8c09becb7188894a86bb76f7abcded916f3
Commit Graph

17677 Commits

Author SHA1 Message Date
Northmoc
8345bf890b glimmer_bairn.txt 2021-06-08 10:17:42 -04:00
Northmoc
5b2980562b emergent_growth.txt clean up stackdesc 2021-06-08 10:16:03 -04:00
Northmoc
b86249635f drake_stone.txt fix ManaCost 2021-06-08 10:16:03 -04:00
Northmoc
4286429402 gravebreaker_lamia.txt add Mandatory 2021-06-08 10:16:02 -04:00
Michael Kamensky
6578fb79e6 Merge branch 'master' into 'master' 
Net Decks Archive Updates - New Gauntlets

See merge request core-developers/forge!4852
 2021-06-08 10:33:26 +00:00
Bug Hunter
f1169511ab Merge branch 'TRT-master-patch-20578' into 'master' 
Update forge-gui/res/cardsfolder/b/bog_rats.txt

Closes #1883

See merge request core-developers/forge!4853
 2021-06-08 07:33:29 +00:00
Bug Hunter
6f5f04bb7e Update forge-gui/res/cardsfolder/b/bog_rats.txt 2021-06-08 07:32:14 +00:00
Churrufli
b33595d840 Net Decks Archive Updates - New Gauntlets 2021-06-08 09:25:52 +02:00
Churrufli
653b484674 Net Decks Archive Updates - New Gauntlets 2021-06-08 09:16:34 +02:00
Michael Kamensky
5a0a63940d Merge branch 'typefix' into 'master' 
Fix missing type

See merge request core-developers/forge!4849
 2021-06-08 03:31:57 +00:00
tool4EvEr
4f4fe04683 Fix missing type 2021-06-07 22:08:21 +02:00
paul_snoops
8ffa95a26a RMH1 has been changed to H1R 2021-06-07 16:31:39 +01:00
paul_snoops
da96b580a4 RMH1 has been changed to H1R 2021-06-07 16:28:29 +01:00
paul_snoops
5a862ab742 RMH1 has been changed to H1R 2021-06-07 15:18:51 +01:00
Michael Kamensky
7e6f077b0a Merge branch 'TRT-master-patch-82400' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/search_the_premises.txt

See merge request core-developers/forge!4846
 2021-06-07 08:02:42 +00:00
Bug Hunter
b6676c9d58 Update forge-gui/res/cardsfolder/upcoming/search_the_premises.txt 2021-06-07 04:56:28 +00:00
Michael Kamensky
37099156f3 Merge branch 'lion' into 'master' 
Diamond Lion: Fix cost

See merge request core-developers/forge!4845
 2021-06-07 04:32:08 +00:00
tool4EvEr
018a2c080b Fix cost 2021-06-06 21:46:27 +02:00
Michael Kamensky
890ef37b3f Merge branch 'snowblind' into 'master' 
Card fixes

See merge request core-developers/forge!4843
 2021-06-06 18:04:04 +00:00
tool4EvEr
4cf11743f2 Fix P/T 2021-06-06 19:36:40 +02:00
tool4EvEr
3ee3a28fd5 Fix cost 2021-06-06 18:54:21 +02:00
paul_snoops
39ba048d07 Updating "The List" edition file and fix dragon token in Unstable 2021-06-06 16:55:56 +01:00
tool4EvEr
40a9229681 Fix check 2021-06-06 15:19:23 +02:00
tool4EvEr
8a7873d0c9 Fix triggers 2021-06-06 15:11:34 +02:00
tool4EvEr
eec11c6ec5 Fix Snowblind 2021-06-06 14:57:24 +02:00
Andreas Bendel
197cbb1808 Update de-DE.properties 
translated new lines under VAssignGenericAmount
 2021-06-06 12:51:06 +00:00
Michael Kamensky
79216eaa8d Merge branch 'mh2_fix' into 'master' 
MH2 fixes

See merge request core-developers/forge!4841
 2021-06-06 03:28:46 +00:00
Michael Kamensky
c38d2f531c Merge branch 'carth' into 'master' 
MH2: Carth the Lion

See merge request core-developers/forge!4760
 2021-06-06 03:26:09 +00:00
Northmoc
18c207f39b arcbound_tracker.txt trim unneeded 2021-06-05 17:03:32 -04:00
Northmoc
577c5ca055 restore edition labels 2021-06-05 17:01:07 -04:00
Northmoc
04558e93b3 correct lizard name 2021-06-05 17:00:44 -04:00
Michael Kamensky
6b0a88cd95 Merge branch 'phpr-prm-scryfall-editions' into 'master' 
Latest Scryfall codes for PHPR and PRM Editions

See merge request core-developers/forge!4838
 2021-06-05 19:03:02 +00:00
tool4EvEr
fc31881150 Small fixes 2021-06-05 20:52:59 +02:00
leriomaggio
9a13b06452 Matched with Magic Online Promo 2021-06-05 19:44:24 +01:00
leriomaggio
01e3a726fe Matched all with PHPR Set on Scryfall 2021-06-05 19:44:11 +01:00
leriomaggio
bcaa318941 Matched with Dragon Con on Scryfall 2021-06-05 19:43:46 +01:00
leriomaggio
abad45f874 Scryfall Code Added 
(Not really needed, just to keep edition files aligned)
 2021-06-05 18:21:31 +00:00
leriomaggio
fa649c1cd0 Scryfall Code Added 
(Not really needed, just to keep edition files aligned)
 2021-06-05 19:10:39 +01:00
leriomaggio
96ad12a1b7 FIX collector numbers w/ those on scryfall and scryfallcode added 2021-06-05 19:10:08 +01:00
leriomaggio
0c81f5c36c FIX unicode char for alternate in Portal 2021-06-05 17:16:44 +01:00
leriomaggio
7dfc48744c Merge remote-tracking branch 'upstream/master' into patch-imagefetcher-scryfall 2021-06-05 17:00:53 +01:00
leriomaggio
943d95eed0 Added new scryfall codes to latest 67 editions 2021-06-05 16:58:07 +01:00
leriomaggio
4b6e5e32d1 Setup Scryfall Code 2021-06-05 16:54:22 +01:00
leriomaggio
a1132fbe90 Updated latest collector numbers 2021-06-05 16:54:05 +01:00
Michael Kamensky
ea37370738 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 18:13:54 +03:00
Michael Kamensky
3b73f86e1b Merge branch 'Williams-master-patch-27805' into 'master' 
MH2 Contributions 04/06

See merge request core-developers/forge!4822
 2021-06-05 15:11:24 +00:00
Michael Kamensky
1633dedee3 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 17:34:06 +03:00
Michael Kamensky
9ae41c67a2 Merge branch 'replace_damage_missing_cards' into 'master' 
Implement remaining damage prevention/redirection cards

See merge request core-developers/forge!4832
 2021-06-05 14:28:35 +00:00
Michael Kamensky
58819f48bc Merge branch 'mh2_token' into 'master' 
MH2 token issues

See merge request core-developers/forge!4833
 2021-06-05 14:27:22 +00:00
Michael Kamensky
1f2cc92533 Merge branch 'phasing' into 'master' 
Phasing Fixes

Closes #531

See merge request core-developers/forge!4808
 2021-06-05 14:27:11 +00:00