Michael Kamensky
|
dd023cdb08
|
Merge branch 'patch-6' into 'master'
Update de-DE.properties
See merge request core-developers/forge!3252
|
2020-10-09 17:56:07 +00:00 |
|
klaxnek
|
2174a68d77
|
Fix typo
|
2020-10-09 19:48:13 +02:00 |
|
klaxnek
|
7f477ed5c8
|
Add missing spanish card translations
|
2020-10-09 19:46:45 +02:00 |
|
klaxnek
|
d533c6a97b
|
Merge branch 'master' into core-developers/master
|
2020-10-09 19:45:08 +02:00 |
|
klaxnek
|
70568b3095
|
Merge remote-tracking branch 'core-developers/master'
|
2020-10-09 19:41:36 +02:00 |
|
Andreas Bendel
|
87f541b91f
|
Update de-DE.properties
Corrected typo
|
2020-10-09 16:47:46 +00:00 |
|
Michael Kamensky
|
34d27d628b
|
Merge branch 'sim-draw-npe' into 'master'
fix sw.stop bug, added draw condition for timeouts and both players life 0
See merge request core-developers/forge!3251
|
2020-10-08 14:16:20 +00:00 |
|
MisterVito
|
715aec7e54
|
fix sw.stop bug, added draw condition for timeouts and both players life 0
|
2020-10-08 03:12:52 -07:00 |
|
MisterVito
|
e7d1ee98d2
|
remove sw.stop as the stopwatch is not running by this point
|
2020-10-07 23:39:17 -07:00 |
|
Michael Kamensky
|
6d62159e3e
|
Merge branch 'thisspell' into 'master'
Enforcing an Oracle template change
See merge request core-developers/forge!3243
|
2020-10-08 05:32:20 +00:00 |
|
Michael Kamensky
|
007718f658
|
Merge branch 'sim-draw-npe' into 'master'
add a draw condition for sim if players life total both equal 0
See merge request core-developers/forge!3248
|
2020-10-08 05:29:11 +00:00 |
|
Michael Kamensky
|
63788018b4
|
Merge branch 'preconimg' into 'master'
updating precon-images.txt
See merge request core-developers/forge!3246
|
2020-10-08 04:51:48 +00:00 |
|
MisterVito
|
e4df5fe4ff
|
add a draw condition for sim if players life total both equal 0
|
2020-10-07 17:34:58 -07:00 |
|
Northmoc
|
145669bb38
|
more "this spell"
|
2020-10-07 16:04:28 -04:00 |
|
Northmoc
|
3c61d6a9e3
|
lowercase first letter only, after bFlag only
|
2020-10-07 16:04:27 -04:00 |
|
Northmoc
|
5a9e7ab57d
|
"this spell" instead of "CARDNAME"
|
2020-10-07 16:04:27 -04:00 |
|
Northmoc
|
7b8b4f3f46
|
updating precon-images.txt
|
2020-10-07 15:45:00 -04:00 |
|
Michael Kamensky
|
a266fd6a6e
|
Merge branch 'return' into 'master'
Support "Return" phrasing in ChangeZoneEffect StackDesc
See merge request core-developers/forge!3245
|
2020-10-07 19:22:51 +00:00 |
|
Michael Kamensky
|
9967a21a00
|
Merge branch 'master' into 'master'
Add some older preconstructed decks
See merge request core-developers/forge!3244
|
2020-10-07 19:22:43 +00:00 |
|
Michael Kamensky
|
9f4f174ee5
|
Merge branch 'statecraft' into 'master'
statecraft.txt repair
See merge request core-developers/forge!3242
|
2020-10-07 19:21:49 +00:00 |
|
Northmoc
|
45e3feb575
|
Support "Return" phrasing in StackDesc
|
2020-10-07 14:35:59 -04:00 |
|
Pux
|
a83f46c06c
|
Add some older preconstructed decks
|
2020-10-07 19:04:10 +02:00 |
|
Northmoc
|
7837e6f003
|
statecraft.txt repair
|
2020-10-07 07:45:28 -04:00 |
|
Michael Kamensky
|
00146ed417
|
Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt
See merge request core-developers/forge!3241
|
2020-10-07 10:56:31 +00:00 |
|
John
|
272ec2cc21
|
Update Secret Lair Drop Series.txt
|
2020-10-07 09:09:49 +00:00 |
|
Michael Kamensky
|
db45511859
|
Merge branch 'twd' into 'master'
Walking Dead Secret Lair (adding NICKNAME)
See merge request core-developers/forge!3215
|
2020-10-07 04:10:41 +00:00 |
|
Michael Kamensky
|
f4ddb91768
|
Merge branch 'string' into 'master'
ChangeZone stackdesc sb : commas in the target lists
See merge request core-developers/forge!3238
|
2020-10-07 04:09:55 +00:00 |
|
Michael Kamensky
|
bee4aebe53
|
Merge branch 'tidy' into 'master'
Tidying up a few cards
See merge request core-developers/forge!3239
|
2020-10-07 04:09:37 +00:00 |
|
Michael Kamensky
|
c5c6c06305
|
Merge branch 'newBranch' into 'master'
Update Border Colors
See merge request core-developers/forge!3240
|
2020-10-07 04:09:19 +00:00 |
|
Anthony Calosa
|
ad7f4f1fa8
|
Update Border Colors
It should have more consistent colors to the actual texture since the color is taken directly from the texture itself.
|
2020-10-07 07:00:41 +08:00 |
|
Northmoc
|
09cc2282f8
|
firespout.txt tidy
|
2020-10-06 15:43:05 -04:00 |
|
Northmoc
|
164e11fc19
|
path_to_exile.txt tidy
|
2020-10-06 15:43:04 -04:00 |
|
Northmoc
|
e6f754b8e9
|
lucille.txt
|
2020-10-06 15:36:41 -04:00 |
|
Northmoc
|
b0eb98e357
|
5 walker tokens
|
2020-10-06 15:36:40 -04:00 |
|
Northmoc
|
bb185f8456
|
rick -> edition
|
2020-10-06 15:36:40 -04:00 |
|
Northmoc
|
16c5828b13
|
rick_steadfast_leader.txt and NICKNAME ReplacementEffect support
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
be2ac6ff7b
|
walker.txt add newline
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
24eb24d20d
|
more NICKNAME support
|
2020-10-06 15:36:39 -04:00 |
|
Northmoc
|
95c4095c3c
|
daryl_hunter_of_walkers.txt (script by medusa)
|
2020-10-06 15:36:38 -04:00 |
|
Northmoc
|
74e41d84a9
|
glenn_the_voice_of_calm.txt (script by medusa)
|
2020-10-06 15:36:38 -04:00 |
|
Northmoc
|
bf9927a365
|
michonne_ruthless_survivor.txt and token
|
2020-10-06 15:36:37 -04:00 |
|
Northmoc
|
1971aebcc5
|
negan_the_cold_blooded.txt with NICKNAME
|
2020-10-06 15:36:37 -04:00 |
|
Northmoc
|
e3575f6ad5
|
editions update
|
2020-10-06 15:36:32 -04:00 |
|
Northmoc
|
43f1d1a6ac
|
preliminary NICKNAME work
|
2020-10-06 15:34:16 -04:00 |
|
Northmoc
|
6b1f1536d9
|
commas in the lists
|
2020-10-06 15:33:57 -04:00 |
|
Michael Kamensky
|
ea4ed9c1af
|
Merge branch 'booster-guarantee-special-printsheet-slot' into 'master'
Adding BoosterReplaceSlotFromPrintSheet logic, fixing ZNR booster collation
Closes #1600
See merge request core-developers/forge!3236
|
2020-10-06 18:44:08 +00:00 |
|
Michael Kamensky
|
41b5d86feb
|
Merge branch 'new_sets_and_fix_sld' into 'master'
AJMP, ANB and SLD additions/fixes
See merge request core-developers/forge!3237
|
2020-10-06 18:43:42 +00:00 |
|
paul_snoops
|
4c5ac6abf5
|
Added AJMP and ANB (with new card scripts); thank you medusa. Also, merged Secret Lair Promos into Secret Lair Drop Series.
|
2020-10-06 16:27:33 +01:00 |
|
Michael Kamensky
|
2098984bfa
|
Merge branch 'lavaburst_whippoorwill' into 'master'
Lava Burst! Whippoorwill!
Closes #119 and #76
See merge request core-developers/forge!3224
|
2020-10-06 14:59:38 +00:00 |
|
Tim Mocny
|
1f29fb7bf3
|
Lava Burst! Whippoorwill!
|
2020-10-06 14:59:38 +00:00 |
|