Tim Mocny
|
9811eedfc5
|
Nissa's Pilgrimage fix
|
2020-03-31 05:03:34 +00:00 |
|
Michael Kamensky
|
e337107575
|
Merge branch 'narcomofix' into 'master'
narcomoeba.txt fix
See merge request core-developers/forge!2640
|
2020-03-31 05:02:47 +00:00 |
|
Tim Mocny
|
70b7af6f16
|
narcomoeba.txt fix
|
2020-03-31 05:02:47 +00:00 |
|
Michael Kamensky
|
17584a03f1
|
Merge branch 'newBranch' into 'master'
Add preference to enable/disable loading of Unknown Cards.
See merge request core-developers/forge!2644
|
2020-03-31 05:01:51 +00:00 |
|
Michael Kamensky
|
2472db72ca
|
Merge branch 'fix-multiplayer-crash' into 'master'
A player who lost cannot initiate combat
Closes #1255
See merge request core-developers/forge!2643
|
2020-03-31 05:01:24 +00:00 |
|
Anthony Calosa
|
e57e87d3c2
|
Fix double "- - " on stack description
|
2020-03-31 12:01:57 +08:00 |
|
Anthony Calosa
|
7c9849f845
|
Add preference to enable/disable loading of Unknown Cards.
If a user don't wants to load a certain cards from deleted set/s in edition folder,
you can do so by disabling this option.
|
2020-03-31 10:54:27 +08:00 |
|
friarsol
|
1c61030aae
|
A player who lost cannot initiate combat
|
2020-03-30 21:40:46 -04:00 |
|
Sol
|
bd8b136b2b
|
Merge branch 'pyramids' into 'master'
Pyramids!
Closes #95
See merge request core-developers/forge!2635
|
2020-03-29 02:39:47 +00:00 |
|
Tim Mocny
|
4bb0bcfa90
|
Pyramids!
|
2020-03-29 02:39:46 +00:00 |
|
Sol
|
084a9812a7
|
Merge branch 'draftable' into 'master'
More CN2 "draft matters" draftable
See merge request core-developers/forge!2632
|
2020-03-29 02:38:49 +00:00 |
|
Tim Mocny
|
65947bee28
|
More CN2 "draft matters" draftable
|
2020-03-29 02:38:48 +00:00 |
|
Sol
|
10acab8bb9
|
Merge branch 'naturalunity' into 'master'
Natural Unity fix
See merge request core-developers/forge!2634
|
2020-03-29 02:38:16 +00:00 |
|
Tim Mocny
|
eb03c01cb0
|
Natural Unity fix
|
2020-03-29 02:38:16 +00:00 |
|
Sol
|
9f8f7f132a
|
Merge branch 'perimeter' into 'master'
Hold the Perimeter!
Closes #67
See merge request core-developers/forge!2631
|
2020-03-29 02:37:37 +00:00 |
|
Tim Mocny
|
62aec9956e
|
Hold the Perimeter!
|
2020-03-29 02:37:36 +00:00 |
|
Michael Kamensky
|
9376ba3429
|
Merge branch 'mb1tweak' into 'master'
MB1 printsheets tweak
See merge request core-developers/forge!2630
|
2020-03-27 09:34:28 +00:00 |
|
Tim Mocny
|
7f8ddb0cab
|
MB1 printsheets tweak
|
2020-03-27 09:34:28 +00:00 |
|
Michael Kamensky
|
dd3c93287e
|
Merge branch 'latestbling' into 'master'
Editions files for SLU and SS3
See merge request core-developers/forge!2624
|
2020-03-26 04:19:05 +00:00 |
|
Tim Mocny
|
6da9d86b1b
|
Editions files for SLU and SS3
|
2020-03-26 04:19:04 +00:00 |
|
Michael Kamensky
|
ad4d429aff
|
Merge branch 'typo' into 'master'
SLD edition typo - rogue comma
See merge request core-developers/forge!2629
|
2020-03-26 04:18:26 +00:00 |
|
Tim Mocny
|
051e607724
|
SLD edition typo - rogue comma
|
2020-03-26 04:18:25 +00:00 |
|
Michael Kamensky
|
cc1f5abe28
|
Merge branch 'master' into 'master'
- Preparing Forge for Android publish v1.6.33.001 [incremental]
See merge request core-developers/forge!2628
|
2020-03-22 08:09:47 +00:00 |
|
Agetian
|
27a6f9c3a4
|
- Preparing Forge for Android publish v1.6.33.001 [incremental]
|
2020-03-22 11:02:04 +03:00 |
|
Michael Kamensky
|
37eeec088d
|
Merge branch 'emershep' into 'master'
Tidying BFZ rare Landfall creature cycle
See merge request core-developers/forge!2627
|
2020-03-22 04:06:20 +00:00 |
|
Tim Mocny
|
1c3e8c32b9
|
Tidying BFZ rare Landfall creature cycle
|
2020-03-22 04:06:19 +00:00 |
|
Sol
|
ee1b8d1c9a
|
Merge branch 'historic' into 'master'
MTGA Historic Format
See merge request core-developers/forge!2622
|
2020-03-20 19:11:59 +00:00 |
|
Tim Mocny
|
7fb34b4887
|
MTGA Historic Format
|
2020-03-20 19:11:59 +00:00 |
|
Michael Kamensky
|
b65b0e4758
|
Merge branch 'fix-edition-tracking' into 'master'
Update EditionTracking for new Edition file things
See merge request core-developers/forge!2626
|
2020-03-20 11:13:36 +00:00 |
|
friarsol
|
4e8e77924a
|
Update EditionTracking for new Edition file things
|
2020-03-19 23:24:48 -04:00 |
|
Blacksmith
|
dafd2e6a2a
|
Clear out release files in preparation for next release
|
2020-03-20 00:42:01 +00:00 |
|
Blacksmith
|
4cfcbaf603
|
[maven-release-plugin] prepare for next development iteration
|
2020-03-20 00:35:58 +00:00 |
|
Blacksmith
|
22dc1a27a0
|
[maven-release-plugin] prepare release forge-1.6.33
forge-1.6.33
|
2020-03-20 00:35:52 +00:00 |
|
Blacksmith
|
c374e0ae81
|
Update README.txt for release
|
2020-03-20 00:32:15 +00:00 |
|
Michael Kamensky
|
fc1b3547b2
|
Merge branch 'patch-5' into 'master'
Update DebuffEffect: fix if it doesn't use target
Closes #1325
See merge request core-developers/forge!2625
|
2020-03-19 06:38:22 +00:00 |
|
Hans Mackowiak
|
b0d3fbe783
|
Update DebuffEffect: fix if it doesn't use target
|
2020-03-19 06:38:22 +00:00 |
|
Michael Kamensky
|
3a02a10258
|
Merge branch 'voteKeywords' into 'master'
Vote: replace hidden keywords with timestamped properties
Closes #57, #1318, and #1258
See merge request core-developers/forge!2510
|
2020-03-19 06:22:44 +00:00 |
|
Hans Mackowiak
|
33d83dc0c5
|
Vote: replace hidden keywords with timestamped properties
|
2020-03-19 06:22:44 +00:00 |
|
Sol
|
d35a2cdead
|
Merge branch 'peltcol' into 'master'
Pelt Collector fixup
See merge request core-developers/forge!2623
|
2020-03-17 12:40:38 +00:00 |
|
Tim Mocny
|
507c88269b
|
Pelt Collector fixup
|
2020-03-17 12:40:37 +00:00 |
|
Michael Kamensky
|
2c7dfc0c41
|
Merge branch 'glyphre' into 'master'
Glyph of Reincarnation fixup
See merge request core-developers/forge!2621
|
2020-03-16 20:00:15 +00:00 |
|
Tim Mocny
|
a8ab95f321
|
- closer to "from the graveyard of the player who controlled that creature the last time it became blocked by that Wall"
|
2020-03-16 20:00:14 +00:00 |
|
Michael Kamensky
|
672cff54ef
|
Merge branch 'krovam2' into 'master'
Krovikan Vampire - a bit more Cleanup
See merge request core-developers/forge!2620
|
2020-03-16 19:59:34 +00:00 |
|
Tim Mocny
|
44cbd9af3e
|
Krovikan Vampire - a bit more Cleanup
|
2020-03-16 19:59:34 +00:00 |
|
Michael Kamensky
|
d3bcfea727
|
Merge branch 'krovam' into 'master'
Krovikan Vampire!
Closes #75
See merge request core-developers/forge!2619
|
2020-03-15 16:19:09 +00:00 |
|
Tim Mocny
|
20fa72d24e
|
Krovikan Vampire!
|
2020-03-15 16:19:09 +00:00 |
|
Michael Kamensky
|
10faa20490
|
Merge branch 'newBranch' into 'master'
Stack display adjustment
See merge request core-developers/forge!2612
|
2020-03-15 06:06:38 +00:00 |
|
Sol
|
62c9d187eb
|
Merge branch 'respectbanlist' into 'master'
Respect ban list in archetype deck generation and updated deckgen data
See merge request core-developers/forge!2618
|
2020-03-15 01:12:03 +00:00 |
|
austinio7116
|
a5148e8983
|
Added draft rankings
|
2020-03-14 21:19:19 +00:00 |
|
maustin
|
0bb7a84e55
|
Merge branch 'coremaster' into respectbanlist
|
2020-03-14 21:18:16 +00:00 |
|