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
69,143 Commits 31 Branches 187 Tags
eefc20a1ac61b51e1be0d822c804273aefa77a8a
Commit Graph

1518 Commits

Author SHA1 Message Date
Renato Filipe Vidal Santos
6b8fcac863 Add files via upload 2024-08-02 09:36:52 +02:00
Renato Filipe Vidal Santos
6038154a6d Update cartouche_of_zeal.txt 2024-08-02 09:36:40 +02:00
Renato Filipe Vidal Santos
49587334f8 Add files via upload 2024-08-02 09:36:40 +02:00
tool4ever
31275df288 Fix casting Chaotic Strike when no attacker gets declared (#5745) 2024-07-31 20:12:04 +00:00
tool4EvEr
0a474c955a Fix Catastrophe allowing regeneration on land choice for creatures 2024-07-30 10:36:52 +02:00
Fulgur14
5d959ca545 TriggeredAttacker corrections (#5716) 
* TriggeredAttacker corrections

* Fix view update

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-07-29 16:17:18 +02:00
tool4ever
95b93e1c37 Update cemetery_gatekeeper.txt 2024-07-29 06:30:10 +02:00
Fulgur14
49330cea66 Several minor updates (#5706) 2024-07-27 22:05:16 +00:00
Glorax
ce4451247a Fixes for Mistbreath Elder, Long River Lurker, Waterspout Warden (#5702) 
thanks
 2024-07-27 21:17:59 +00:00
tool4ever
3a8b5117e5 Fix Flowering Lumberknot (#5685) 2024-07-24 20:19:27 +00:00
Simisays
f2e488af61 UNF 18 attraction cards (#5507) 
* update

* Update CounterEnumType.java

* remove not working cards

* cleanup

* cleanup
 2024-07-23 09:22:47 +03:00
tool4ever
76efa1be0d Improve anchor word handling (#5673) 
* Support for Nowhere to Run
 2024-07-22 20:07:36 +00:00
tool4ever
fc803cdbda Ain't a normal month without a Henzie fix (#5671) 2024-07-22 07:19:28 +00:00
Hans Mackowiak
9f172bad85 Keyword: Offspring (#5558) 
* Keyword: Offspring

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-07-21 07:54:37 +02:00
Fulgur14
6d7e8c9899 Update cartouche_of_zeal.txt (#5614) 
* Update cartouche_of_zeal.txt

* 5 BLB cards

* Add files via upload

* Add files via upload

* Update reptilian_recruiter.txt

* Update war_squeak.txt
 2024-07-16 07:21:02 +03:00
Fulgur14
ca98180914 Another BLB batch (#5572) 
* Update chaos_charm.txt

* Update TypeLists.txt

* Add files via upload

* Update downwind_ambusher.txt

* Update feather_of_flight.txt

* Fix description

* Update artists_talent.txt

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-07-12 15:49:08 +03:00
Renato Filipe Vidal Santos
8c0795c5eb July 2024 cleanup: folders 'c' to 'd' (#5519) 2024-07-08 19:40:09 +00:00
Agetian
f1e1c3d1dc SacCost AI hint for Cutthroat Centurion (#5542) 
* - Correct names for MH3 achievement cards.

* - SacCost AI hint for Cutthroat Centurion.
 2024-07-07 08:46:56 +03:00
Chris H
3a61118ade Merge pull request #5357 from Jetz72/Attractions 
Attraction Support
 2024-07-02 11:02:43 -04:00
Chris H
a9d3150b34 Small fixes 2024-06-28 20:40:49 -04:00
Chris H
33f34231f4 Add remaining Conspiracy cards 
- Archdemon of Paliano
- Canal Dredger
- Deal Broker
- Lore Seeker
 2024-06-28 20:40:49 -04:00
tool4ever
47cef07b91 Update canoptek_wraith.txt 2024-06-26 21:32:20 -04:00
Chris H
38796136f3 Crabomination 2024-06-26 21:00:29 -04:00
tool4ever
ce34c94215 Cipher: do it like Epic (#5465) 
Co-authored-by: TRT <>
 2024-06-25 21:48:26 +03:00
Jetz
33c0e5dfd6 Merge branch 'master' into Attractions 2024-06-23 11:23:47 -04:00
Hans Mackowiak
0abbc2def3 StaticAbilityBlockRestict: remove Global Rules (#5454) 
* StaticAbilityBlockRestict: remove Global Rules

* ~ remove rule

* ~ remove global num
 2024-06-22 20:12:14 -04:00
Fulgur14
8c37a7347f ACR cards (#5441) 2024-06-22 19:22:43 +00:00
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