external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,815 Commits 31 Branches 187 Tags
2709968e2529b83273f5c3ff0b33636093d0fb65
Commit Graph

45815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
53c9d22ca3 Merge branch 'niambi' into 'master' 
Niambi ability payment string fix

See merge request core-developers/forge!3170
 2020-09-22 04:34:28 +00:00
Michael Kamensky
33e306121c Merge branch 'master' into 'master' 
translate new setting

See merge request core-developers/forge!3166
 2020-09-22 04:34:14 +00:00
Michael Kamensky
7f33ef8956 Merge branch 'newBranch' into 'master' 
Stack Visual Improvement

See merge request core-developers/forge!3167
 2020-09-22 04:33:58 +00:00
Michael Kamensky
24c96488e3 Merge branch 'landAbilitySecondary' into 'master' 
SpellAbility: make Basic Land Abilities Secondary and remove BasicLandProperty

See merge request core-developers/forge!3169
 2020-09-22 04:33:22 +00:00
Sol
d5ae363b2d Merge branch 'reweave' into 'master' 
reweave.txt use LKI and clean up StackDesc

See merge request core-developers/forge!3172
 2020-09-22 00:23:28 +00:00
Sol
2b676115c9 Merge branch 'typo' into 'master' 
Some typos

Closes #1584

See merge request core-developers/forge!3168
 2020-09-22 00:23:02 +00:00
Sol
a1f9a8a51f Merge branch 'combattab' into 'master' 
Fix capitalization of Combat tab in match view

See merge request core-developers/forge!3174
 2020-09-22 00:22:31 +00:00
Anthony Calosa
368036f890 update description 2020-09-22 07:14:33 +08:00
Northmoc
c3b858e697 Fix capitalization of Combat tab in match view 2020-09-21 16:06:48 -04:00
Northmoc
6fb14b35c3 issue1584 2020-09-21 14:17:25 -04:00
Northmoc
03fc96dc87 ZNR blockdata 2020-09-21 13:50:10 -04:00
Northmoc
fcb6508938 rotation update 2020-09-21 13:35:40 -04:00
Northmoc
9fea3a3cd0 reweave.txt use LKI and clean up StackDesc 2020-09-21 11:09:01 -04:00
Northmoc
3d9e458ab9 spacing for select blocker prompt 2020-09-21 10:12:43 -04:00
Northmoc
5312223a37 remove _ from ZNE editions file 2020-09-21 09:55:13 -04:00
Northmoc
bb8bb49e5e rollback bad fix 2020-09-21 09:45:26 -04:00
Northmoc
933dab319e fix niambi_esteemed_speaker.txt 2020-09-21 09:06:02 -04:00
Hans Mackowiak
181e8b897f SpellAbility: make Basic Land Abilities Secondary and remove BasicLandProperty 2020-09-21 13:00:13 +00:00
Northmoc
4ecae787f2 Fix attack prompt 2020-09-21 08:54:40 -04:00
Northmoc
c53a5ef743 TrigDesc comma 2020-09-21 08:20:05 -04:00
Anthony Calosa
fd466bcf05 update fix for manamorphose 2020-09-21 19:30:24 +08:00
Anthony Calosa
0efb3ad048 update 2020-09-21 18:59:07 +08:00
Anthony Calosa
be336ed1ec Stack Visual Improvement - Show Mana Symbols instead of text string for mana (B -> {B}, R -> {R}) 2020-09-21 18:47:50 +08:00
CCTV-1
c2d04d26dd translate new setting 2020-09-21 18:00:02 +08:00
Michael Kamensky
49e8ffae13 Merge branch 'moraug' into 'master' 
ZNR: Moraug, Fury of Akoum and support

Closes #1571

See merge request core-developers/forge!3163
 2020-09-21 05:48:44 +00:00
Michael Kamensky
8efe4f8118 Merge branch 'scavenger' into 'master' 
ZNR: Nighthawk Scavenger and support

Closes #1566

See merge request core-developers/forge!3164
 2020-09-21 05:48:41 +00:00
Michael Kamensky
4c7ee03abf Merge branch 'czeff_stack' into 'master' 
ChangeZone effect - stringbuilder tweaks for StackDesc

See merge request core-developers/forge!3154
 2020-09-21 05:47:55 +00:00
Michael Kamensky
caefe6a6e9 Merge branch 'cpeff_stack' into 'master' 
CountersPutEffect Stringbuilder tweak for 0 targets

See merge request core-developers/forge!3153
 2020-09-21 05:47:45 +00:00
Michael Kamensky
62258c0821 Merge branch 'ZNRcards' into 'master' 
x6 ZNR cards

See merge request core-developers/forge!3161
 2020-09-21 05:47:24 +00:00
Michael Kamensky
4e50fb29b9 Merge branch 'ZNR19' into 'master' 
ZNR 19 Sep

See merge request core-developers/forge!3159
 2020-09-21 05:47:04 +00:00
Michael Kamensky
409fcb3b59 Merge branch 'forsakenjava' into 'master' 
ZNR - Forsaken Monument and support

See merge request core-developers/forge!3160
 2020-09-21 05:46:52 +00:00
Hans Mackowiak
b6f9b4feb7 ZNR: MDFC + MayPlay 2020-09-21 07:36:18 +02:00
Northmoc
2bdac5a0fd nighthawk_scavenger.txt 2020-09-20 21:33:19 -04:00
Northmoc
9c21c12c94 CardFactoryUtil.java add Count$OppTypesInGrave 2020-09-20 21:32:51 -04:00
Northmoc
1439069492 moraug_fury_of_akoum.txt 2020-09-20 19:53:57 -04:00
Northmoc
5f2842a180 CardFactoryUtil.java add "CardNumAttacksThisTurn" 2020-09-20 19:53:40 -04:00
Northmoc
af0643d0d2 indent consistency 2020-09-20 16:26:01 -04:00
Northmoc
007a8e8fba TriggerTapsForMana.java support - seems to work! 2020-09-20 16:26:01 -04:00
Northmoc
2f2a903dc6 script (squee1968) 2020-09-20 16:26:01 -04:00
Northmoc
b21a249715 lullmages_familiar.txt DeckHas 2020-09-20 16:18:10 -04:00
Northmoc
d2174a7807 myriad_construct.txt and token 2020-09-20 16:16:51 -04:00
Northmoc
ad8a124876 relic_golem.txt 2020-09-20 16:16:51 -04:00
Northmoc
112844bc02 cliffhaven_kitesail.txt 2020-09-20 16:16:50 -04:00
Northmoc
60391b1be2 spoils_of_adventure.txt 2020-09-20 16:16:50 -04:00
Northmoc
b9f315b9b0 ravagers_mace.txt 2020-09-20 16:16:50 -04:00
Northmoc
f580238eef lullmages_familiar.txt 2020-09-20 16:16:49 -04:00
Northmoc
81eb167b3d phylath_world_sculptor.txt 2020-09-20 16:16:49 -04:00
Northmoc
b267c2755e relic_axe.txt 2020-09-20 16:16:48 -04:00
Northmoc
de36c6c640 moss_pit_skeleton.txt 2020-09-20 16:16:48 -04:00
Northmoc
9a46e91a53 skyclave_sentinel.txt (Marvel) 2020-09-20 16:16:48 -04:00