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

1491 Commits

Author SHA1 Message Date
Chris H
d4469ca736 Add Spire Phantasm, Agent of Acquisitions, Cogwork Librarian, Leovold's Operative (#5437) 
* Next few Draft cards

* Code review fixes

* Add Spire Phantasm

* Add Agent of Acquisitions, Cogwork Librarian, Leovold's Operative

* Some small fixes

* Getting closer

* Now the UI is updating

* Switch DraftPack to a delegate class

* Fix agent of acquisitions when AI drafts it
 2024-06-22 13:42:29 +03: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
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
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
Chris H
50746d9a72 Draft matters with a vengeance (#5400) 
* Next few Draft cards

* Whispergear Sneak

* Whispergear Sneak

* Code review fixes

* Fix index mapping

* Don't try to log if Draft doesnt have one
 2024-06-12 09:18:12 +03:00
Renato Filipe Vidal Santos
cf203a45b8 MH3 creature type update: Naga to Snake, Viashino to Lizard (#5402) 
* Add files via upload

* Add files via upload

* Update TypeLists.txt

* Update rivaz_of_the_claw.txt

* Delete forge-gui/res/w/watchful_naga.txt

* Delete forge-gui/res/w/weaver_of_currents.txt

* Delete forge-gui/res/y/yurlok_of_scorch_thrash.txt

* Delete forge-gui/res/z/ziatoras_envoy.txt

* Delete forge-gui/res/z/zirilan_of_the_claw.txt

* Add files via upload
 2024-06-11 17:37:02 +03:00
Jetz
49e7576742 Merge remote-tracking branch 'origin/master' into Attractions 
# Conflicts:
#	forge-core/src/main/java/forge/card/CardFace.java
#	forge-core/src/main/java/forge/card/CardRules.java
 2024-06-07 22:13:24 -04:00
Jetz
8c8c8a779b AttractionsYouVisitedThisTurn and Squirrel Squatters 
Untangled some oracle text methods in Card and CardState
Sly Spy, Everythingamajig, and two Garbage Elementals
Visit card text fix.
2 more Attractions
 2024-06-07 21:36:10 -04:00
tool4ever
29508093a7 Update charix_the_raging_isle.txt 2024-06-05 15:37:38 +02:00
Northmoc
95a6443c11 MH3: 5 cards (#5373) 2024-06-04 20:30:06 +00:00
Chris H
69a83ed129 Add Cogwork Grinder and combine some logic 2024-06-04 12:46:26 -04:00
Northmoc
57cd390238 UNF: magar_of_the_magic_strings.txt and support (#4105) 
* UNF: magar_of_the_magic_strings.txt and support

* tweaks

* clean up

* revised
 2024-06-04 16:46:33 +03:00
tool4ever
2ddcaab59d Some fixes (#5320) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-05-30 08:32:08 +03:00
tool4ever
651d01ab76 Panharmonicon fix for Nadu, Winged Wisdom (#5297) 2024-05-25 12:28:59 +00:00
Paul Hammerton
3c77c1ed8b Replace curly quotes 2024-05-21 18:51:16 +01:00
Chris H
6087167673 Draft Matters - How many cards you've drafted this round (#5203) 2024-05-21 11:36:59 +02:00
tool4ever
2194c1af84 Clean params (#5260) 2024-05-19 09:26:19 +00:00
Hans Mackowiak
cb1c6a8676 Umbra armor rename 2024-05-16 20:19:07 +02:00
tool4ever
87988eede7 Effect cleanup and fixes (#5247) 
* Fix script ordering

* Remove obsolete code

* Fix Zethi copies not entering the stack sequentially
 2024-05-16 15:34:42 +02:00
Renato Filipe Vidal Santos
d9148e361a Cleanup following up on PR #5229 (#5246) 2024-05-15 20:14:51 +00:00
tool4ever
8614d05456 Panglacial Wurm: support altcosts (#5243) 2024-05-15 17:06:21 +02:00
edg444
a20c0e8ccf Exile Graveyards Oracle Update + Minor Typos (#5229) 2024-05-12 11:51:21 +00:00
Renato Filipe Vidal Santos
600da3e80b Incidental cleanup pass #1 (#5228) 2024-05-11 21:16:59 +00:00
Renato Filipe Vidal Santos
e14ab980b5 Hybrid mana notation cleanup (#5210) 
* Add files via upload

* Update maelstrom_muse.txt
 2024-05-07 09:53:58 +03:00
Renato Filipe Vidal Santos
0c936170fc Tribal to Kindred update (#5186) 2024-05-04 19:39:42 +00:00
Renato Filipe Vidal Santos
d1170fbee6 Update champions_of_tyr.txt (#5201) 2024-05-04 19:19:12 +00:00
tool4ever
b67d196ef8 Update scripts (#5175) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-04-29 13:30:40 +03:00
Renato Filipe Vidal Santos
b9ceb8eb96 Cleaning repeated text: Folders 'a' to 'c' (#5167) 2024-04-29 08:50:32 +02:00
tool4ever
87da29bbcf Update consuming_ashes.txt 2024-04-26 11:56:50 +02:00
Agetian
e2f4c2cfa7 - Move Concert Kaboomist out of upcoming. (#5162) 2024-04-26 09:36:50 +03:00
tool4ever
7e828fd654 Fix X shards in combat tax missing from total cost (#5154) 2024-04-25 07:32:42 +00:00
Renato Filipe Vidal Santos
c71a45b16d Fixing Overzealous Muscle granting indestructible to players and not itself (#5119) 2024-04-22 19:27:25 +00:00
Renato Filipe Vidal Santos
940c3fc0b9 Cost$ cleanup: Main event: Folder 'c' part 3 (#5097) 2024-04-22 06:59:01 +00:00
Renato Filipe Vidal Santos
b3c7ef5f4f Cost$ cleanup: Main event: Folder 'c' part 4 2024-04-21 17:39:22 +00:00
Renato Filipe Vidal Santos
69f53b3c7c Cost$ cleanup: Main event: Folder 'c' part 1 2024-04-21 15:28:19 +00:00
tool4ever
c698bc8847 Update comeuppance.txt 2024-04-21 15:23:27 +00:00
Renato Filipe Vidal Santos
35fd172513 Cost$ cleanup: Main event: Folder 'c' part 2 2024-04-21 15:21:57 +00:00
tool4ever
7206703676 Fix ResolvedLimit check always passing during LTB LKI (#5092) 2024-04-21 10:20:06 +00:00
tool4ever
9fb6d8a1f6 Remove obsolete logic (#5090) 2024-04-21 08:27:11 +00:00
Renato Filipe Vidal Santos
143a9acdf8 Cost$ cleanup: straggler pass #3 (#5076) 2024-04-20 13:53:32 +00:00
tool4ever
2efcace2b6 Some fixes (#5079) 
* Clean up CardTypes syntax

* Riku counting fix
 2024-04-20 13:40:43 +00:00
Renato Filipe Vidal Santos
fd453dce07 Typo cleanup pass #4 (#5046) 2024-04-20 13:03:14 +00:00
Renato Filipe Vidal Santos
25a083025e Cost$ cleanup: straggler pass #2 2024-04-18 19:59:00 +00:00
tool4ever
ff57334192 Some fixes (#5067) 2024-04-18 19:24:41 +00:00
tool4ever
914dd180e1 Remove AltCost SVar (#5057) 2024-04-17 08:31:17 +02:00
Paul Hammerton
829f49ec86 Migrate upcoming for OTJ release 2024-04-16 12:07:53 -04:00
Northmoc
3b8ec7fcda Merge pull request #5010 from Northmoc/spree2 
OTJ: more spree cards and polish
 2024-04-16 11:20:17 -04:00
Northmoc
53934bd9b1 OTJ: more spree cards and polish 2024-04-16 11:00:00 -04:00
Renato Filipe Vidal Santos
b332d22611 Resolving ValidDesc$ vs ValidDescription$ (#5042) 
* Add files via upload

* Update ChooseCardNameEffect.java
 2024-04-16 07:15:51 +03:00
Hans Mackowiak
4d26228ca6 Alternative Cost For ActivatedAbilities and Spells (#5037) 
* Rework Alternative Cost + MayPlay
 2024-04-15 14:12:39 +02:00