Michael Kamensky
|
cff17f0100
|
Merge branch 'johnwilliams7-master-patch-23701' into 'master'
Year of the Ox 2021
See merge request core-developers/forge!5809
|
2021-11-12 12:58:30 +00:00 |
|
Michael Kamensky
|
8ad3d662c7
|
Merge branch 'master' into 'master'
Reorder VOW and MID draft ranking set locations to maintain the usual order in rankings.txt.
See merge request core-developers/forge!5810
|
2021-11-12 12:57:43 +00:00 |
|
John Williams
|
bc962f8a7d
|
Merge branch 'master' into 'johnwilliams7-master-patch-23701'
# Conflicts:
# forge-gui/res/editions/Year of the Ox 2021.txt
|
2021-11-12 12:56:12 +00:00 |
|
Michael Kamensky
|
b6b0dc266d
|
- Reorder VOW and MID draft ranking set locations to maintain the usual order in rankings.txt.
|
2021-11-12 15:55:21 +03:00 |
|
John Williams
|
253dc62870
|
Add new file
|
2021-11-12 12:52:21 +00:00 |
|
Michael Kamensky
|
fbea3627eb
|
Merge branch 'master' into 'master'
Update STX draft rankings to make the AI properly draft Mystic Archive cards
See merge request core-developers/forge!5808
|
2021-11-12 12:48:28 +00:00 |
|
Michael Kamensky
|
b6f8aa0b3d
|
- Update STX draft rankings to properly account for the STA (Mystic Archive) cards.
|
2021-11-12 15:47:12 +03:00 |
|
Michael Kamensky
|
d6e450075e
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-11-12 15:43:57 +03:00 |
|
Michael Kamensky
|
2c616670f5
|
Merge branch 'johnwilliams7-master-patch-84405' into 'master'
MagicFest2021
See merge request core-developers/forge!5807
|
2021-11-12 12:43:18 +00:00 |
|
Michael Kamensky
|
cac607eedb
|
Merge branch 'Svaldan-master-patch-04656' into 'master'
4 VOC cards
See merge request core-developers/forge!5799
|
2021-11-12 12:42:23 +00:00 |
|
Michael Kamensky
|
0cf12823e9
|
Merge branch 'TRT-master-patch-50453' into 'master'
Update forge-gui/res/cardsfolder/upcoming/ancestral_anger.txt
See merge request core-developers/forge!5805
|
2021-11-12 12:42:12 +00:00 |
|
Bug Hunter
|
94f73d0812
|
Merge branch 'hx-master-patch-27087' into 'master'
fixed cost for Apprentice Sharpshooter and Dreadlight Monstrosity
See merge request core-developers/forge!5806
|
2021-11-12 12:42:07 +00:00 |
|
hx hyper
|
cff23a9f42
|
fixed cost for Apprentice Sharpshooter and Dreadlight Monstrosity
|
2021-11-12 12:42:07 +00:00 |
|
John Williams
|
8bb48af04c
|
Add new file
|
2021-11-12 12:34:55 +00:00 |
|
Job Spijker
|
130d712f08
|
Fixed \n typo in oracle text
|
2021-11-12 10:24:32 +00:00 |
|
Bug Hunter
|
200dbbd37e
|
Update forge-gui/res/cardsfolder/upcoming/ancestral_anger.txt
|
2021-11-12 10:02:33 +00:00 |
|
Michael Kamensky
|
d8bcee5f0b
|
Merge branch 'TRT-master-patch-94392' into 'master'
Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt
See merge request core-developers/forge!5804
|
2021-11-12 08:59:18 +00:00 |
|
Bug Hunter
|
748a8f2c42
|
Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt
|
2021-11-12 08:54:58 +00:00 |
|
Job Spijker
|
2c0f5e4266
|
Added newline to Haunted Library
|
2021-11-12 07:04:56 +00:00 |
|
Job Spijker
|
9afb565673
|
Added deck hint to Drogskol Reinforcements
|
2021-11-12 07:04:21 +00:00 |
|
Job Spijker
|
8f47c10627
|
Removed melee reminder text from Mode$ Continuous
|
2021-11-12 07:03:39 +00:00 |
|
Michael Kamensky
|
01333ff67e
|
Merge branch 'voc_11' into 'master'
VOC: 11 Nov
See merge request core-developers/forge!5802
|
2021-11-12 05:54:24 +00:00 |
|
Michael Kamensky
|
0840dc30a2
|
Merge branch 'fix' into 'master'
various minor fixes
See merge request core-developers/forge!5803
|
2021-11-12 05:51:14 +00:00 |
|
Northmoc
|
0bbaef9a32
|
honored_heirloom.txt add ManaCost
|
2021-11-11 22:49:47 -05:00 |
|
Northmoc
|
9b967f7092
|
courier_bat.txt fix Oracle
|
2021-11-11 22:49:33 -05:00 |
|
Michael Kamensky
|
eca72342c7
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-11-12 06:47:22 +03:00 |
|
Michael Kamensky
|
7fbb6a5ff4
|
Merge branch 'vowdraft' into 'master'
set up VOW draft
See merge request core-developers/forge!5798
|
2021-11-12 03:46:29 +00:00 |
|
Michael Kamensky
|
4ac5dabbea
|
Merge branch 'triggerzones' into 'master'
Fix bad TriggerZone param
See merge request core-developers/forge!5800
|
2021-11-12 03:46:08 +00:00 |
|
Northmoc
|
5e61f8029c
|
timothar_baron_of_bats.txt and slight CostExile prompt tweak
|
2021-11-11 22:45:39 -05:00 |
|
Michael Kamensky
|
bf18ba2cd7
|
Merge branch 'cem_des' into 'master'
VOW: Cemetery Desecrator (tricky Charm templating)
See merge request core-developers/forge!5750
|
2021-11-12 03:45:30 +00:00 |
|
Northmoc
|
a28d5e373f
|
umbris_fear_manifest.txt
|
2021-11-11 22:43:40 -05:00 |
|
Northmoc
|
3f1ff4b064
|
imperious_mindbreaker.txt add AI hint
|
2021-11-11 22:39:39 -05:00 |
|
Northmoc
|
4cca378710
|
priest_of_the_blessed_graf.txt
|
2021-11-11 22:39:24 -05:00 |
|
Northmoc
|
e1323d0336
|
imperious_mindbreaker.txt
|
2021-11-11 21:59:05 -05:00 |
|
tool4EvEr
|
9fb09c1d90
|
Fix bad TriggerZone param
|
2021-11-11 23:26:06 +01:00 |
|
Job Spijker
|
7dc538f7b0
|
VOC: Timin, Youthful Geist
|
2021-11-11 21:23:51 +00:00 |
|
Job Spijker
|
2b2de73b3b
|
VOC: Rhoda, Geist Avenger
|
2021-11-11 21:23:20 +00:00 |
|
Job Spijker
|
f492e9d7bf
|
VOC: Haunted Library
|
2021-11-11 21:06:29 +00:00 |
|
Job Spijker
|
6366583610
|
VOC: Drogskoll Reinforcements
|
2021-11-11 21:05:33 +00:00 |
|
Northmoc
|
83fcd6e6cd
|
VOW rankings
|
2021-11-11 14:12:36 -05:00 |
|
Northmoc
|
ce5acd1845
|
set up VOW draft
|
2021-11-11 14:10:59 -05:00 |
|
Michael Kamensky
|
637c8a010e
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-11-11 21:21:31 +03:00 |
|
Michael Kamensky
|
433d9482ba
|
Merge branch 'Svaldan-master-patch-80692' into 'master'
Final VOW cards by Svaldan
See merge request core-developers/forge!5790
|
2021-11-11 18:20:59 +00:00 |
|
Job Spijker
|
badde0f297
|
Improved stack description of VOW:Wolf Strike
|
2021-11-11 18:05:21 +00:00 |
|
Michael Kamensky
|
be239c55b0
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-11-11 20:28:41 +03:00 |
|
Michael Kamensky
|
d6b2711e0a
|
Merge branch 'veil' into 'master'
veil_of_summer.txt tidy Desc and AI
See merge request core-developers/forge!5797
|
2021-11-11 17:27:41 +00:00 |
|
Bug Hunter
|
6bf24309ba
|
Merge branch 'master' into 'master'
Tweak Dollhouse of Horrors implementation
See merge request core-developers/forge!5796
|
2021-11-11 16:52:14 +00:00 |
|
Michael Kamensky
|
87147c5c4b
|
Tweak Dollhouse of Horrors implementation
|
2021-11-11 16:52:14 +00:00 |
|
Bug Hunter
|
50114fc6d0
|
Merge branch 'odric' into 'master'
VOW: Odric and support
See merge request core-developers/forge!5773
|
2021-11-11 16:50:39 +00:00 |
|
Northmoc
|
26814de95a
|
veil_of_summer.txt tidy Desc and AI
|
2021-11-11 11:49:32 -05:00 |
|