external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,146 Commits 33 Branches 187 Tags
7b6a3b70e9119f0612ef2d4bf516e2d03e148bcc
Commit Graph

45146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
015bb428e4 Merge branch 'master' into 'master' 
fix:missing some translation

See merge request core-developers/forge!2919
 2020-06-27 11:03:23 +00:00
CCTV-1
645b6d89d2 fix:missing some translation. 2020-06-27 18:36:57 +08:00
Michael Kamensky
e60986e04e Merge branch 'SRPref' into 'master' 
Screen reader flag with Initial Mana Cost handling

See merge request core-developers/forge!2916
 2020-06-27 05:22:18 +00:00
Zachary Kline
2f7701e55d Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2020-06-26 20:31:40 -07:00
Zachary Kline
de2e60708e Merge branch 'SRPref' 2020-06-26 20:28:29 -07:00
swordshine
e8eb7abf48 Merge branch 'JMP.26' into 'master' 
JMP - 26 June

See merge request core-developers/forge!2917
 2020-06-27 03:25:16 +00:00
swordshine
425472cd54 Merge branch 'card_fix' into 'master' 
fix "Sublime Epiphany"

See merge request core-developers/forge!2918
 2020-06-27 03:24:37 +00:00
CCTV-1
48f109b7f6 fix:"Sublime Epiphany" can't select draw card player. 2020-06-27 09:56:55 +08:00
friarsol
df09cba493 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2020-06-26 21:40:38 -04:00
Northmoc
420db21d83 immolating_gyre.txt 2020-06-26 15:27:52 -04:00
Zachary Kline
54436ac2e3 Initial screen reader optimization. 2020-06-26 11:54:36 -07:00
Michael Kamensky
bb0d6c4606 Merge branch 'patch' into 'master' 
Add Eon Frolicker

Closes #1362

See merge request core-developers/forge!2914
 2020-06-26 17:11:57 +00:00
Michael Kamensky
dc058fccc1 Merge branch 'typo' into 'master' 
pestilent_haze.txt fix

See merge request core-developers/forge!2915
 2020-06-26 17:11:29 +00:00
Northmoc
8af5c1302d pestilent_haze.txt fix 2020-06-26 12:11:53 -04:00
swordshine
29a7c98185 Add Eon Frolicker 2020-06-26 22:18:54 +08:00
swordshine
bb4f4272ca Merge branch 'patch' into 'master' 
More cards

Closes #1473

See merge request core-developers/forge!2912
 2020-06-26 12:57:39 +00:00
swordshine
01183c454b Update ReplacementMill 2020-06-26 16:46:14 +08:00
swordshine
e3863b0712 Merge branch 'patch-7' into 'master' 
Update es-ES.properties

See merge request core-developers/forge!2913
 2020-06-26 06:50:52 +00:00
Churrufli
0cff9ebdf0 Update es-ES.properties 2020-06-26 06:43:24 +00:00
swordshine
5fc1f92309 Update Charmed Pendant to be compatible with ChangeText effects 2020-06-26 14:39:51 +08:00
swordshine
7b0247aba5 Merge branch 'thriving_land' into 'master' 
JMP: add Thriving lands

See merge request core-developers/forge!2911
 2020-06-26 05:50:33 +00:00
swordshine
f9f2b65e45 Add Sanctuary Blade 2020-06-26 13:42:14 +08:00
Hans Mackowiak
e4fb9d8a9b JMP: add Thriving lands 2020-06-26 07:02:20 +02:00
swordshine
f8dab4a4b2 Merge branch 'patch' into 'master' 
Update CostMill

See merge request core-developers/forge!2910
 2020-06-26 04:36:53 +00:00
swordshine
088062a93e Update Ai PaymentDecision 2020-06-26 12:14:27 +08:00
swordshine
6049a681e8 Update CostMill 2020-06-26 12:04:15 +08:00
swordshine
c622291c4e Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!2909
 2020-06-26 03:38:28 +00:00
swordshine
450c7c5b71 Update some scripts 2020-06-26 11:33:38 +08:00
swordshine
b5ebf2185f Merge branch 'mill' into 'master' 
Mill oracle updates

Closes #1469

See merge request core-developers/forge!2907
 2020-06-26 03:30:28 +00:00
Tim Mocny
fa240f6dc2 Mill oracle updates 2020-06-26 03:30:27 +00:00
swordshine
b23b4a0888 Merge branch 'JMP.24' into 'master' 
JMP - 24 June

See merge request core-developers/forge!2906
 2020-06-26 03:24:46 +00:00
Tim Mocny
2fc2d623a8 JMP - 24 June 2020-06-26 03:24:44 +00:00
swordshine
58c7d69d27 Merge branch 'patch' into 'master' 
More JMP cards (will update the CostMill after the oracle changes are finished)

See merge request core-developers/forge!2905
 2020-06-26 03:22:13 +00:00
swordshine
730a7adf2a Update the scripts 2020-06-25 13:55:17 +08:00
swordshine
39d24724c6 Move cards to the JMP folder 2020-06-24 22:40:37 +08:00
swordshine
1053b3fdea JMP: Add Bruvac the Grandiloquent 2020-06-24 22:09:00 +08:00
swordshine
cbc3f6a568 JMP: Add Emiel the Blessed 2020-06-24 22:09:00 +08:00
swordshine
d007e86779 JMP: Add Zurzoth, Chaos Rider 2020-06-24 22:09:00 +08:00
Michael Kamensky
0503177c77 Merge branch 'master' into 'master' 
Fix padding in quest draft tournaments screen on mobile.

See merge request core-developers/forge!2904
 2020-06-24 13:21:23 +00:00
Michael Kamensky
ffc2187fea Merge branch 'patch' into 'master' 
M21: Add Chandra's Incinerator

See merge request core-developers/forge!2903
 2020-06-24 13:17:48 +00:00
Agetian
69d8aeb875 - Fix padding in quest draft tournaments screen on mobile. 2020-06-24 16:13:21 +03:00
swordshine
2e15415666 M21: Add Chandra's Incinerator 2020-06-24 16:07:13 +08:00
swordshine
17333c2ae9 Merge branch 'patch' into 'master' 
More M21 cards

See merge request core-developers/forge!2902
 2020-06-24 08:05:32 +00:00
swordshine
b9064dad3f Add Nine Lives 2020-06-24 15:16:41 +08:00
swordshine
b1c87c7f83 Two more M21 cards 2020-06-24 14:59:01 +08:00
swordshine
e8dba06444 More M21 cards 2020-06-24 14:52:29 +08:00
Michael Kamensky
46283cebd3 Merge branch 'M21.23' into 'master' 
M21 - 23 June

See merge request core-developers/forge!2901
 2020-06-24 04:31:53 +00:00
Tim Mocny
86573dedf1 M21 - 23 June 2020-06-24 04:31:52 +00:00
Michael Kamensky
f57ece280f Merge branch 'patch' into 'master' 
Add Teferi, Timeless Voyager

Closes #1466

See merge request core-developers/forge!2900
 2020-06-23 14:44:24 +00:00
swordshine
f4f0950f72 Merge branch 'M21.22' into 'master' 
M21 - 22 June

See merge request core-developers/forge!2899
 2020-06-23 13:55:45 +00:00