Michael Kamensky
1d1483185b
Merge branch 'twosat-master-patch-09463' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!3949
2021-02-20 19:31:29 +00:00
Andreas Bendel
98eae65661
Update de-DE.properties
...
Lines: net archive decks + border mask
2021-02-20 19:03:39 +00:00
Michael Kamensky
54bcb63c22
Merge branch 'master' into 'master'
...
Fix the Planeswalker commander mode
Closes #1734
See merge request core-developers/forge!3948
2021-02-20 18:42:15 +00:00
Michael Kamensky
9b19221b52
- Fix the Planeswalker commander mode
2021-02-20 21:41:31 +03:00
Michael Kamensky
a74884ea33
Merge branch 'STX_edit' into 'master'
...
STX additional cards and early STA set
See merge request core-developers/forge!3944
2021-02-20 15:56:52 +00:00
Michael Kamensky
4748a327b7
Merge branch 'topsy' into 'master'
...
Topsy Turvy
See merge request core-developers/forge!3933
2021-02-20 15:56:28 +00:00
Michael Kamensky
4b6554bf99
Merge branch 'bob' into 'master'
...
Bevy of Beebles
See merge request core-developers/forge!3934
2021-02-20 15:56:24 +00:00
Michael Kamensky
65393e4157
Merge branch 'klaxnek-master-patch-43702' into 'master'
...
Update es-ES.properties
See merge request core-developers/forge!3947
2021-02-20 15:55:16 +00:00
Michael Kamensky
039504a04e
Merge branch 'fixReplacement' into 'master'
...
Merged Commander: Make sure to find right replacement if partner used
See merge request core-developers/forge!3945
2021-02-20 15:55:09 +00:00
Michael Kamensky
a04369c2d7
Merge branch 'brokkos_apex_of_forever' into 'master'
...
Add Brokkos, Apex of Forever
Closes #1720
See merge request core-developers/forge!3946
2021-02-20 15:54:39 +00:00
klaxnek
bbabe037db
Update es-ES.properties
2021-02-20 13:49:11 +00:00
Lyu Zong-Hong
0a905c77cf
Add Brokkos, Apex of Forever
2021-02-20 22:38:03 +09:00
tool4EvEr
a94278398f
Merged Commander: Make sure to find right replacement if partner used
2021-02-20 13:10:30 +01:00
paul_snoops
a6e5ee2762
STX additional cards and early STA set
2021-02-20 11:06:00 +00:00
Michael Kamensky
b26ef285c7
Merge branch 'fix_japanese_quest' into 'master'
...
Fix Japanese quest translation
See merge request core-developers/forge!3943
2021-02-20 10:28:55 +00:00
Lyu Zong-Hong
9b0a9468c4
Fix Japanese quest translation
2021-02-20 18:37:58 +09:00
Michael Kamensky
4b4e38852c
Merge branch 'update_japanese_translation' into 'master'
...
Update Japanese translation
See merge request core-developers/forge!3942
2021-02-20 08:59:20 +00:00
Lyu Zong-Hong
021085f4f6
Update Japanese translation
2021-02-20 17:49:20 +09:00
Anthony Calosa
5eeda8d242
Merge branch 'master' into 'master'
...
[Mobile] cleanup stack item strings
See merge request core-developers/forge!3941
2021-02-20 08:44:32 +00:00
Anthony Calosa
0b0061a4a5
Merge remote-tracking branch 'core/master'
2021-02-20 16:38:06 +08:00
Anthony Calosa
51f8f47878
[Mobile] cleanup stack item strings
...
-show optional cost string (ie Kicked, Entwined, etc ) on spells if activated
2021-02-20 16:37:21 +08:00
Michael Kamensky
bc538a3cf0
Merge branch 'master' into 'master'
...
New Net Deck Category: Deck Standard Archive
See merge request core-developers/forge!3940
2021-02-20 08:15:16 +00:00
Churrufli
bbd971fb40
Patch Net Decks Archive
2021-02-20 08:35:43 +01:00
Churrufli
4cfecdf980
Patch Net Decks Archive
2021-02-20 08:35:20 +01:00
Anthony Calosa
ca57bfe982
Merge branch 'master' into 'master'
...
[Mobile] Update Border Mask Option
See merge request core-developers/forge!3939
2021-02-20 07:02:16 +00:00
Anthony Calosa
5055931cbc
[Mobile] Border Mask Option
...
- Full > cards have round corners (both .fullborder and .full cards)
- Crop > .fullborder cards will be cropped to look like .full cards
- Off > no changes (for user who use png images use Off)
2021-02-20 14:58:42 +08:00
Churrufli
e0b512108c
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2021-02-20 07:34:57 +01:00
Michael Kamensky
7137bcb5ef
Merge branch 'master' into 'master'
...
Rankle, Master of Pranks: improve logic a little
See merge request core-developers/forge!3938
2021-02-20 06:25:25 +00:00
Michael Kamensky
7c75781138
- Rankle, Master of Pranks: improve logic a little
2021-02-20 09:24:43 +03:00
Michael Kamensky
3138d6b3fc
Merge branch 'Williams-master-patch-81850' into 'master'
...
Early Strixhaven Edition file
See merge request core-developers/forge!3920
2021-02-20 05:01:30 +00:00
Adam Pantel
97486d594e
Bevy of Beebles
2021-02-19 23:49:54 -05:00
Michael Kamensky
d41a064ba1
Merge branch 'master' into 'master'
...
Fix some card sets in draft cube files.
See merge request core-developers/forge!3937
2021-02-20 04:40:26 +00:00
Michael Kamensky
4a3403a7ec
Merge branch 'boosterbox' into 'master'
...
Move Booster Box to Editions File
See merge request core-developers/forge!3936
2021-02-20 04:39:46 +00:00
Michael Kamensky
d40c76a099
- Fix some card sets in draft cube files.
2021-02-20 07:38:52 +03:00
friarsol
846e89e522
Move Booster Box to Editions File
2021-02-19 23:37:48 -05:00
Michael Kamensky
77a14c7d71
Merge branch 'Williams-master-patch-33748' into 'master'
...
Add STX Charms
See merge request core-developers/forge!3917
2021-02-20 04:29:42 +00:00
Michael Kamensky
415faa9a04
Merge branch 'manaEffect' into 'master'
...
ExpressPay different ComboMana if possible
See merge request core-developers/forge!3893
2021-02-20 04:22:03 +00:00
Bug Hunter
df0d651101
ExpressPay different ComboMana if possible
2021-02-20 04:22:02 +00:00
Michael Kamensky
e8ca2a4050
Merge branch 'targetWithEQX' into 'master'
...
cards: better rules conform for cards that use X in cost and target with cmcEQX
See merge request core-developers/forge!3932
2021-02-20 04:15:41 +00:00
Adam Pantel
ca09c46d27
Topsy Turvy
2021-02-19 19:10:25 -05:00
Hans Mackowiak
a846c33db4
cards: better rules conform for cards that use X in cost and target with cmcEQX
2021-02-20 00:47:46 +01:00
Anthony Calosa
8ebe59e3fd
Merge branch 'master' into 'master'
...
[Mobile] Adjust avatar size for QuestTournamentsScreen
See merge request core-developers/forge!3931
2021-02-19 22:57:57 +00:00
Anthony Calosa
e17c93fedb
Merge remote-tracking branch 'core/master'
2021-02-20 06:57:10 +08:00
Anthony Calosa
1ef87f9e68
[Mobile] Adjust avatar size for QuestTournamentsScreen
2021-02-20 06:54:57 +08:00
John
a124db0344
Update Strixhaven School of Mages.txt
2021-02-19 22:03:02 +00:00
Anthony Calosa
e490267cb2
Merge branch 'master' into 'master'
...
[Mobile] Add Avatar Image on Quest Tournament Current Match (Landscape Mode)
See merge request core-developers/forge!3929
2021-02-19 21:14:19 +00:00
Anthony Calosa
6b4a72a99f
[Mobile] Add Avatar Image on Quest Tournament Current Match (Landscape Mode)
2021-02-20 05:12:57 +08:00
John
5fe73b6e93
Update silverquill_command.txt
2021-02-19 20:46:20 +00:00
John
ba3337395e
Update quandrix_command.txt
2021-02-19 20:46:14 +00:00
John
5e3873e994
Update witherbloom_command.txt
2021-02-19 20:46:07 +00:00
