external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,880 Commits 32 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sol
f684933965 Merge branch 'ZNR14' into 'master' 
ZNR 14 Sep

See merge request core-developers/forge!3136
 2020-09-14 19:52:50 +00:00
Tim Mocny
ff13f384cd ZNR 14 Sep 2020-09-14 19:52:49 +00:00
Sol
3439e355b0 Merge branch 'ZNR_cards' into 'master' 
x4 ZNR cards

See merge request core-developers/forge!3132
 2020-09-14 19:52:09 +00:00
Sol
89e2edf8ad Merge branch 'znr_cards' into 'master' 
some znr card

See merge request core-developers/forge!3126
 2020-09-14 19:51:44 +00:00
Sol
2d79a8149a Merge branch 'ZNRcards' into 'master' 
Some of the more simple ZNR cards, thanks scribe!

See merge request core-developers/forge!3137
 2020-09-14 19:16:29 +00:00
Sol
17bd53a728 Merge branch '1563-znr-modal-double-faced-cards' into 'master' 
Resolve "ZNR: Modal Double Faced Cards"

Closes #1563

See merge request core-developers/forge!3131
 2020-09-14 19:13:54 +00:00
Hans Mackowiak
c8d69cbbb9 Resolve "ZNR: Modal Double Faced Cards" 2020-09-14 19:13:54 +00:00
paul_snoops
2f18b6a24c Some of the more simple ZNR cards, thanks scribe! 2020-09-14 16:39:57 +01:00
paul_snoops
b7629ecf92 x4 ZNR cards 2020-09-14 15:47:20 +01:00
Michael Kamensky
5ea03022cd Merge branch 'undefined' into 'master' 
Zendikar Rising Expeditions

See merge request core-developers/forge!3134
 2020-09-14 04:47:32 +00:00
Michael Kamensky
5eb62ba400 Merge branch 'patch-12' into 'master' 
Update Secret Lair Drop Series.txt (Zendikar Revisited)

See merge request core-developers/forge!3133
 2020-09-14 04:47:22 +00:00
John
83fa53f15f Zendikar Rising Expeditions 2020-09-13 23:00:09 +00:00
John
6fea2e120e Update Secret Lair Drop Series.txt (Zendikar Revisited) 2020-09-13 22:12:34 +00:00
paul_snoops
548a3819ab x4 ZNR cards 2020-09-13 21:50:15 +01:00
Sol
e8bfca1363 Merge branch 'ZNRed' into 'master' 
ZNR editions file

See merge request core-developers/forge!3123
 2020-09-13 16:56:05 +00:00
Tim Mocny
6e0d347ca9 ZNR editions file 2020-09-13 16:56:05 +00:00
Michael Kamensky
91f7025410 Merge branch 'ZNR12' into 'master' 
ZNR 12 Sep

See merge request core-developers/forge!3127
 2020-09-13 15:15:13 +00:00
Tim Mocny
12f59f2bc7 ZNR 12 Sep 2020-09-13 15:15:12 +00:00
CCTV-1
68e3737919 remove not need type by DeckHits 2020-09-13 17:56:20 +08:00
Michael Kamensky
8c38ef7568 Merge branch 'patch-8' into 'master' 
Update worlds.txt

See merge request core-developers/forge!3125
 2020-09-13 04:15:33 +00:00
Michael Kamensky
1ccccf299f Merge branch 'ZNR11' into 'master' 
ZNR 11 Sep

See merge request core-developers/forge!3124
 2020-09-13 04:15:12 +00:00
Tim Mocny
6654004bac ZNR 11 Sep 2020-09-13 04:15:11 +00:00
CCTV-1
9f79d327f3 add newline at the file end 2020-09-13 11:47:21 +08:00
CCTV-1
3246e884af add SVar:BuffedBy:Land 2020-09-13 08:43:43 +08:00
CCTV-1
4a24726e44 add DeckHints 2020-09-13 08:43:03 +08:00
CCTV-1
732bf93333 add missed space 2020-09-13 08:42:34 +08:00
CCTV-1
ad31c9a6f3 add reminder text to TriggerDescription 2020-09-13 08:38:00 +08:00
CCTV-1
8c9d5819df add SVar:BuffedBy:Land 2020-09-13 08:37:39 +08:00
CCTV-1
d087b5ec69 add DeckHas 2020-09-13 08:34:53 +08:00
CCTV-1
8c83ec5c46 update DeckHints 2020-09-13 08:34:19 +08:00
CCTV-1
9843536547 update SpellDescription 2020-09-13 08:32:57 +08:00
CCTV-1
10072a3595 fix TriggerDescription 2020-09-13 08:31:31 +08:00
CCTV-1
d2ada43027 cat token 2020-09-12 19:25:26 +08:00
CCTV-1
f9b7db92a7 some znr card 2020-09-12 15:03:15 +08:00
Gabriel Franco
c2e8c16867 Update worlds.txt 2020-09-12 05:11:30 +00:00
Michael Kamensky
f1bc98a6cf Merge branch 'ZNR10' into 'master' 
ZNR 10 Sep

See merge request core-developers/forge!3122
 2020-09-12 04:51:36 +00:00
Tim Mocny
f1e4d107af ZNR 10 Sep 2020-09-12 04:51:36 +00:00
Michael Kamensky
a632a2ff56 Merge branch 'undefined' into 'master' 
Magazine Insert Promos

See merge request core-developers/forge!3077
 2020-09-11 06:24:51 +00:00
Michael Kamensky
43dd42ed6a Merge branch 'ZNR8' into 'master' 
ZNR 8 Sep

See merge request core-developers/forge!3117
 2020-09-11 06:24:20 +00:00
Tim Mocny
7331b392b5 ZNR 8 Sep 2020-09-11 06:24:20 +00:00
Michael Kamensky
4f160d95bc Merge branch 'ZNR9' into 'master' 
ZNR 9 Sep

See merge request core-developers/forge!3118
 2020-09-11 06:20:31 +00:00
Tim Mocny
78087e6a63 ZNR 9 Sep 2020-09-11 06:20:30 +00:00
Sol
b13e1e2b43 Merge branch 'hound' into 'master' 
Update PlayerProperties "hasFewer"

Closes #1569

See merge request core-developers/forge!3120
 2020-09-10 13:53:24 +00:00
Tim Mocny
25f844f571 Update PlayerProperties "hasFewer" 2020-09-10 13:53:24 +00:00
Michael Kamensky
c9634e3797 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3119
 2020-09-10 04:48:02 +00:00
Andreas Bendel
1450f8a3d6 Update de-DE.properties 
One new line "select all"
 2020-09-09 20:33:21 +00:00
Sol
e85a323632 Merge branch 'partyers' into 'master' 
ZNR partyers (cards that care about party)

See merge request core-developers/forge!3114
 2020-09-09 01:16:57 +00:00
Tim Mocny
9e71ede5e6 ZNR partyers (cards that care about party) 2020-09-09 01:16:57 +00:00
Sol
14764975d7 Merge branch 'typo' into 'master' 
forgescribe copying missing dash

See merge request core-developers/forge!3116
 2020-09-09 01:16:27 +00:00
Northmoc
92ba2c9385 forgescribe copying missing dash 2020-09-08 08:51:09 -04:00