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
42,683 Commits 32 Branches 187 Tags
2d86d240a795f6829c3e299d2f22d1a6b51f995f
Commit Graph

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
austinio7116
6a54481d97 Preparing for M20 constructed and draft formats - rankings scraped from draftsim 
(cherry picked from commit c452ac2)
 2019-06-26 23:35:25 +01:00
austinio7116
05a736bcbe Switched to correct naming convention 2019-06-26 23:04:09 +01:00
austinio7116
aa7a9c09af Updated product images for recent sets - already present in FTP 2019-06-26 17:16:29 +01:00
swordshine
5f82039e84 Add two cards 2019-06-26 23:59:31 +08:00
Rob Schnautz
c163da47e6 delete reprint 2019-06-26 15:27:33 +00:00
swordshine
1367a4465f Merge branch 'master' into 'master' 
Fix Nightpack Ambusher

See merge request core-developers/forge!1913
 2019-06-26 14:46:09 +00:00
swordshine
f5a05cdfb9 Fix Nightpack Ambusher 2019-06-26 22:45:21 +08:00
Rob Schnautz
1470a9c583 Update Magic 2020.txt 2019-06-26 14:38:24 +00:00
swordshine
c16f0b9c64 Update a card 2019-06-26 19:27:14 +08:00
swordshine
0b705e062b Update forgescribed cards 2019-06-26 19:20:27 +08:00
swordshine
a70b9415d0 Merge branch 'patch-2' into 'master' 
Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield

See merge request core-developers/forge!1912
 2019-06-26 07:51:57 +00:00
Hans Mackowiak
ade716a9cf Risen Reef: add ForgetChanged so the Land isn't added to Hand if it enters the Battlefield 2019-06-26 07:51:57 +00:00
swordshine
03fc16cb56 Add forgescribed cards by Austinio7116 2019-06-26 12:13:08 +08:00
Rob Schnautz
4017dff71c Update printsheets.txt 2019-06-26 00:11:42 +00:00
Rob Schnautz
e706cd6f6c Update Magic 2020.txt 2019-06-26 00:08:46 +00:00
Michael Kamensky
9628c8d3fe Merge branch 'lotusFieldFix' into 'master' 
Lotus field should add three mana, not one

See merge request core-developers/forge!1911
 2019-06-25 14:27:47 +00:00
swordshine
498ab89757 Merge branch 'typoFix' into 'master' 
Change the wording of four cards from "remove a +1/+1 counter from Creature...

See merge request core-developers/forge!1909
 2019-06-25 14:13:09 +00:00
swordshine
aa203680de Merge branch 'arcadesTypo' into 'master' 
add missing "defender" to ability description

See merge request core-developers/forge!1910
 2019-06-25 14:12:14 +00:00
kms70847
f1ea190acf Lotus field should add three mana, not one 2019-06-25 10:07:44 -04:00
kms70847
7f3f5276e8 add missing "defender" to ability description 2019-06-25 10:04:00 -04:00
kms70847
82409960d8 Change the wording of four cards from "remove a +1/+1 counter from Creature you Control" to "remove a +1/+1 counter from a creature you control" 2019-06-25 09:48:49 -04:00
swordshine
eebf60276d Add today's forgescribe cards 2019-06-25 19:31:50 +08:00
Michael Kamensky
cc1179ae6d Merge branch 'master' into 'master' 
Added puzzle PS_WAR8 - Possibility Storm - War of the Spark 08

See merge request core-developers/forge!1908
 2019-06-25 08:53:21 +00:00
Agetian
7580dd91bb - Added puzzle PS_WAR8 2019-06-25 11:50:29 +03:00
Michael Kamensky
12fad7906b Merge branch 'mh1deckgen' into 'master' 
MH1 modern deck generation data

See merge request core-developers/forge!1907
 2019-06-25 05:56:28 +00:00
austinio7116
84bcc1418f MH1 modern deck generation data 
(cherry picked from commit 3ef010c)
 2019-06-25 06:26:25 +01:00
swordshine
fbc8415b35 Add Veil of Summer 2019-06-25 12:59:01 +08:00
swordshine
8ec454b908 Add Scheming Symmetry 2019-06-25 12:43:03 +08:00
swordshine
fff0916d47 Fix Vivien 2019-06-25 12:24:03 +08:00
swordshine
9436c9f759 Update forgescribed cards by Austinio7116 2019-06-25 12:19:32 +08:00
swordshine
0c3868b9cc Merge branch 'precombat-simple' into 'master' 
Clean up isPreCombatMain and related

See merge request core-developers/forge!1906
 2019-06-25 04:07:25 +00:00
Rob Schnautz
0d9be130d2 Update Magic 2020.txt 2019-06-25 03:45:21 +00:00
Adam Pantel
2c5699ae17 Clean up isPreCombatMain and related 2019-06-24 22:32:57 -04:00
Michael Kamensky
cd2c66da66 Merge branch 'master' into 'master' 
Internationalisation (reverting GroupDef.java andColumnDef.java)

See merge request core-developers/forge!1904
 2019-06-24 16:03:06 +00:00
swordshine
d0c5c07c8d Add Thought Distortion 2019-06-24 23:26:27 +08:00
swordshine
feae5779a7 Merge branch 'm20' into 'master' 
M20

See merge request core-developers/forge!1903
 2019-06-24 11:16:54 +00:00
swordshine
4b0c412547 Add Embodiment of Agonies 2019-06-24 19:11:13 +08:00
swordshine
72da47cc67 Add Loxodon Lifechanter 2019-06-24 13:46:28 +08:00
churrufli
02d59e668f Merge remote-tracking branch 'origin/master' 2019-06-24 07:03:58 +02:00
churrufli
34fcb0cca5 reverting GroupDef.java 2019-06-24 07:03:37 +02:00
Agetian
25112dac67 - Most likely not the best idea in case the AI wants to just sweep the board 2019-06-24 06:54:42 +02:00
Agetian
7746547f18 - Added a couple AI hints 2019-06-24 06:54:42 +02:00
Agetian
05ee9afcac - One of the changes in Lands WRG unneeded 2019-06-24 06:54:42 +02:00
Agetian
25753585a5 - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) 2019-06-24 06:54:42 +02:00
Agetian
a8d60afd17 - Most likely not the best idea in case the AI wants to just sweep the board 2019-06-24 06:54:34 +02:00
Agetian
34866c9ac2 - Added a couple AI hints 2019-06-24 06:54:34 +02:00
Agetian
caa9e92a3a - One of the changes in Lands WRG unneeded 2019-06-24 06:54:34 +02:00
Agetian
bad2c9bb3f - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) 2019-06-24 06:54:34 +02:00
churrufli
b91773f73f Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00
churrufli
181aa0f2ab Moving hard-coded text to res files 2019-06-24 06:54:33 +02:00