external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,132 Commits 31 Branches 187 Tags
011c2570f4ffbcb70be3d3f86d62ef9e90ef8f6c
Commit Graph

68132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hammerton
e829b48f5b Merge pull request #5447 from paulsnoops/edition_updates 
Edition updates: ACR
 2024-06-21 17:59:23 +01:00
Paul Hammerton
b8f60ccbad Edition updates: ACR 2024-06-21 17:56:08 +01:00
Chris H
ba40634d7f Update wither_and_bloom.txt 2024-06-21 15:30:46 +02:00
Chris H
f226826819 Migrate mh3 (#5443) 
* Migrate MH3 from upcoming

---------

Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
 2024-06-20 15:20:10 +02:00
Hans Mackowiak
dc02e5e52d Prowl: use sharesCreatureTypeWith 2024-06-20 12:08:19 +02:00
Jetz
3e6871ce86 Merge branch 'master' into Attractions 
# Conflicts:
#	forge-core/src/main/java/forge/deck/DeckFormat.java
 2024-06-19 22:58:49 -04:00
Jetz
657ebfda25 8 more attractions. 2024-06-19 19:03:29 -04:00
Paul Hammerton
145d4d347f Merge pull request #5442 from paulsnoops/edition_updates 
Edition updates: ACR, SLD
 2024-06-19 14:48:57 +01:00
Paul Hammerton
f1ffbe9887 oops 2024-06-19 14:42:47 +01:00
Paul Hammerton
3209fb4ca7 Edition updates: ACR, SLD 2024-06-19 14:41:06 +01:00
Hans Mackowiak
bbac9c4ded Keyword: Freerunning (#5439) 
* Keyword: Freerunning

* Update Player.java
 2024-06-19 15:25:37 +03:00
tool4ever
f864a17a49 Update guide_of_souls.txt 2024-06-19 05:32:38 +00:00
NishacIroCode
c67eae5a1a Commenting out ununsed code to remove warnings. 2024-06-18 22:18:03 -04:00
NishacIroCode
66ef931b58 Initial commit for Piper-like cards. 2024-06-18 22:18:03 -04:00
tool4ever
e082b66d68 Update kozileks_command.txt 
Closes #5434
 2024-06-18 12:29:48 +02:00
Simisays
c6c5d6476e Conflict free branches of Fulgur14 (#5429) 
* Squashed commit of the following:

commit ef30be2d55
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu Jun 13 19:48:00 2024 +0200

    Add files via upload

* Squashed commit of the following:

commit 299ad40c2e
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 13:32:28 2024 +0200

    Add files via upload

commit 95d9b59232
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 12:13:25 2024 +0200

    Add files via upload

commit ce05867493
Merge: c04c76d3c2 9b327cf3d2
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Mon Jun 10 09:00:21 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit c04c76d3c2
Merge: bb62d8fd8d f865496d23
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 23:11:34 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit bb62d8fd8d
Merge: d0083a77b0 a61ea36c95
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 14:44:13 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit d0083a77b0
Merge: 7ed0eb3cc3 2ddcaab59d
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Thu May 30 08:31:13 2024 +0200

    Merge branch 'Card-Forge:master' into master

commit 7ed0eb3cc3
Author: Fulgur14 <54345051+Fulgur14@users.noreply.github.com>
Date:   Wed May 29 18:45:31 2024 +0200

    Update architect_of_the_untamed.txt

* Delete forge-gui/res/cardsfolder/upcoming/the_capitoline_triad.txt

* Update khod_etlan_shiis_envoy.txt

* Update TypeLists.txt
 2024-06-18 06:56:25 +02:00
Jetz
bf1f1ecb61 Pick-a-Beeble and The Most Dangerous Gamer. 
Prize mechanic.
 2024-06-17 19:03:23 -04:00
Agetian
1a5595dba1 - Added puzzle PS_MH31 (#5433) 2024-06-17 17:37:06 +03:00
Fulgur14
6831c90067 Add files via upload (#5431) 2024-06-17 09:05:42 +03:00
tool4ever
03c23902ac Update guide_of_souls.txt 2024-06-17 07:03:57 +02:00
Jetz
88c9559eea Mobile Deck Editor support for extra sections, including attractions. 2024-06-16 20:51:03 -04:00
Jetz
fbc475998e Support for programmatically setting the advanced search filter for the mobile card manager. 2024-06-16 19:54:20 -04:00
tool4ever
f43d3c090f Update flare_of_malice.txt 2024-06-16 08:06:33 +00:00
tool4ever
a83804a67d Update eldrazi_confluence.txt 2024-06-15 18:44:08 -04:00
Simisays
1250ed822e cleanup 2024-06-15 18:44:08 -04:00
tool4EvEr
2a5bed01b5 M3C 16 cards 2024-06-15 18:44:08 -04:00
tool4ever
55b648d39b Update path_of_annihilation.txt 2024-06-15 18:43:53 -04:00
Simisays
abacbb7019 cleanup 2024-06-15 18:43:53 -04:00
tool4EvEr
47d3aa143c 29 MH3 scripts 2024-06-15 18:43:53 -04:00
tool4ever
9070d6c0cd Update bespoke_battlewagon.txt 2024-06-15 18:43:38 -04:00
tool4ever
b60fcb0057 Update aerie_auxiliary.txt 2024-06-15 18:43:38 -04:00
Simisays
bb044dc921 Update monstrous_vortex.txt 2024-06-15 18:43:38 -04:00
Simisays
8ed0f9e1b4 cleanup 2024-06-15 18:43:38 -04:00
tool4EvEr
39d2240de1 29 MH3 scripts 2024-06-15 18:43:38 -04:00
Jetz
df40cdaea0 Made DeckSection.matchingSection more suitable for general use by shifting the responsibility of recognizing potential Commanders elsewhere. 2024-06-15 16:44:07 -04:00
Jetz
239735eaca Make countByName work for cards with multiple prints. 
Add countByName to Deck
 2024-06-15 12:39:38 -04:00
Simisays
4308cc3a77 MH3 9 cards (#5380) 2024-06-15 13:48:01 +00:00
Simisays
ae4fcc8b5a cleanup (#5427) 2024-06-14 22:24:41 +03:00
Hans Mackowiak
aacd75ab20 MH3: Emerge From (#5403) 
* MH3: Emerge From

* ~ reuse Player
 2024-06-14 18:06:19 +03:00
kevlahnota
14be75e711 add annihilator & exalted icon and update toxic icon (#5426) 
* add annihilator icon and update toxic icon

* add exalted icon
 2024-06-14 15:58:36 +03:00
tool4ever
a46702c395 Update possibility_storm.txt 2024-06-14 09:23:28 +02:00
Agetian
223f1792e6 - Added puzzle PS_OTJ4 (#5419) 2024-06-14 07:18:18 +03:00
Glorax
e0f3f13ccf Twisted Riddlekeeper (#5423) 
* Add files via upload

* Update twisted_riddlekeeper.txt
 2024-06-14 06:56:13 +03:00
Hans Mackowiak
4804dbc637 Keyword: Protection from each color (#5424) 2024-06-14 06:56:05 +03:00
tool4ever
7b651e1859 Update frenzied_gorespawn.txt 2024-06-13 20:09:17 +00:00
Fulgur14
c210eb6470 Update Conspiracy.txt 2024-06-12 10:57:43 -04:00
kevlahnota
f0fb245363 Merge pull request #5417 from kevlahnota/newmaster2 
fix selectbox visibility
 2024-06-12 19:26:49 +08:00
Anthony Calosa
b5c9dcbcb3 unused import 2024-06-12 19:17:53 +08:00
Anthony Calosa
bbf3486fc9 Merge branch 'master' into newmaster2 2024-06-12 19:16:17 +08:00
Anthony Calosa
37facd7e13 update selectbox BG 2024-06-12 19:03:16 +08:00