external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,160 Commits 32 Branches 187 Tags
3e1fe53b776c7c7ea9ea56f1543b5825e3aa0e56
Commit Graph

44160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
1218786b3e Merge branch 'master' into 'master' 
A basic AI logic hook for Timmerian Fiends

See merge request core-developers/forge!2617
 2020-03-14 16:45:51 +00:00
Agetian
62a1ee6d3d - A basic AI logic hook for Timmerian Fiends 2020-03-14 19:23:37 +03:00
Michael Kamensky
64f17b49fe Merge branch 'timmerian' into 'master' 
Timmerian Fiends!

Closes #116

See merge request core-developers/forge!2610
 2020-03-14 15:48:57 +00:00
Tim Mocny
0d939da60d Timmerian Fiends! 2020-03-14 15:48:56 +00:00
Michael Kamensky
cc321b1b2e Merge branch 'fixes' into 'master' 
Fixes

Closes #1291, #1317, and #1322

See merge request core-developers/forge!2615
 2020-03-14 15:42:36 +00:00
Michael Kamensky
71bf43b63a Merge branch 'glyphre' into 'master' 
Glyph of Reincarnation!

Closes #64

See merge request core-developers/forge!2616
 2020-03-14 15:41:43 +00:00
Tim Mocny
2d7840aa7d Glyph of Reincarnation! 2020-03-14 15:41:43 +00:00
Anthony Calosa
a1be9d0278 Fix Inventory View for Cards without Card Image 2020-03-14 13:34:31 +08:00
Anthony Calosa
8a18f815b4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-03-14 10:42:07 +08:00
Sol
2b529a07c2 Merge branch '1323-numberformatexception-for-input-string-2secondary-true' into 'master' 
Resolve "NumberFormatException: For input string: "2Secondary$ True""

Closes #1323

See merge request core-developers/forge!2613
 2020-03-14 00:55:55 +00:00
Jamin W. Collins
c0349d87fb implement and use new PredicateCard 
This fixes the THB and ELD draft, possibly others

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:45:36 -06:00
Jamin W. Collins
c488ab4772 increase maximal heap size to 4096m 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Jamin W. Collins
d83f8deb7a remove vestigial scripts 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Jamin W. Collins
f1f480d16a explicitly set the encoding to UTF-8 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2020-03-13 18:43:06 -06:00
Hans Mackowiak
a1ffa625e1 CardFactoryUtil: fix Saga 2020-03-13 20:34:34 +00:00
Anthony Calosa
d7e38f7fd8 Format Stack Text 
(Should be cleaner)
 2020-03-14 03:05:29 +08:00
Anthony Calosa
a5683d4f12 Adjust Card Name & Ability Icons Ordering 2020-03-14 03:02:15 +08:00