external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,143 Commits 31 Branches 187 Tags
eefc20a1ac61b51e1be0d822c804273aefa77a8a
Commit Graph

449 Commits

Author SHA1 Message Date
fanch
18b22279df Fix tokens things 2024-10-22 09:59:33 +02:00
Anthony Calosa
7bebf8732c Merge branch 'master' into master2 2024-10-20 21:56:30 +08:00
Renato Filipe Vidal Santos
43434e4999 Update TypeLists.txt 2024-10-19 14:29:27 +01:00
Anthony Calosa
059d7aae1b Merge branch 'master' into master2 2024-10-16 18:16:03 +08:00
Churrufli
92ee722db6 Net Decks Archive Updates (Standard, Modern, Legacy, Vintage, Pioneer, Pauper) 2024-10-16 11:12:14 +02:00
Anthony Calosa
ed58a68128 Merge branch 'master' into master2 2024-10-15 19:16:13 +08:00
Agetian
1466346d72 - Add DSK alt wincon achievement by Marek. (#6331) 2024-10-15 09:50:38 +03:00
Anthony Calosa
ddf009fed5 update skinlist 2024-09-29 15:34:52 +08:00
Anthony Calosa
7594888f8e SKIN Update 2024-09-29 15:25:11 +08:00
Hans Mackowiak
d2e3175961 Add Room Helper functions (#6093) 2024-09-07 10:55:10 +02:00
Renato Filipe Vidal Santos
51abd277d2 MB2: Fetching Garden, Gobland, The Heron Moon, Omenpath to Naya (#5989) 
* Add files via upload

* Add files via upload

* Add files via upload

* Update CounterEnumType.java

* Add files via upload

* Add files via upload

* Update CounterEnumType.java
 2024-08-28 09:24:48 +03:00
Hans Mackowiak
825781446f Update TypeLists.txt 
Add Snail
 2024-08-12 09:20:52 +02:00
Agetian
5e951cc05c - Bloomburrow achievements by Marek14 (#5815) 2024-08-04 09:30:06 +03:00
petersul
cc69fda264 Add Raccoon creature type 2024-08-02 09:17:10 +02:00
Fulgur14
a38d8cc733 The gift cards of BLB/BLC (#5712) 
* Add files via upload

* Fix gift check so it works before paying

* Update into_the_flood_maw.txt

* Update longstalk_brawl.txt

* Update mind_spiral.txt

* Update octomancer.txt

* Update parting_gust.txt

* Update sazacaps_brew.txt

* Update starforged_sword.txt

* Update parting_gust.txt

* Update scrapshooter.txt

* Update starfall_invocation.txt

* Update starforged_sword.txt

* Update coiling_rebirth.txt

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-07-29 08:04:38 +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
Churrufli
fe5ec2c241 Net Decks Archive Updates 2024-07-11 18:51:30 +02:00
Fulgur14
54182e18a5 Update TypeLists.txt (#5567) 
* Update TypeLists.txt

* Add files via upload

* Update brazen_collector.txt
 2024-07-11 07:30:00 +03:00
Renato Filipe Vidal Santos
bb9c6dfd76 July 2024 cleanup: code (#5536) 
* Update ChooseGenericEffectAi.java

* Update CardTranslation.java

* Update AltWinAchievements.java

* Update altwin-achievements.txt

* Update EffectEffect.java
 2024-07-07 13:37:01 +03:00
Agetian
4b1b0880ef - Correct names for MH3 achievement cards. (#5541) 2024-07-07 08:41:20 +03:00
Agetian
912e3272d3 - MH3 achievements by Marek14. (#5539) 2024-07-07 08:16:12 +03:00
Chris H
3a61118ade Merge pull request #5357 from Jetz72/Attractions 
Attraction Support
 2024-07-02 11:02:43 -04:00
Fulgur14
cc9e5cfd83 15 ACR/BLB/DSK cards (#5494) 2024-06-30 21:22:58 +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
Jetz
88c9559eea Mobile Deck Editor support for extra sections, including attractions. 2024-06-16 20:51:03 -04: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
Paul Hammerton
503b83857b PCEL: Deb Thomas (#5238) 2024-05-14 13:42:18 +02:00
Chris H
ab597c6755 Update TypeLists.txt (#5221) 2024-05-09 16:29:37 +02:00
tool4ever
f60718b7b5 Some fixes (#5219) 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-05-08 22:06:04 +03:00
Agetian
dd1d7fa907 - Add OTJ achievements by Marek14. (#5087) 2024-04-20 22:11:27 +03:00
Simisays
56d67e26cc OTJ 20 cards (#4963) 
* update

* update + 9 more

* + cleanup and six cards

* cleanup

* update

* update
 2024-04-09 07:42:35 +03:00
Churrufli
988e9f79eb Net Decks Archive Updates 2024-04-05 00:04:52 +02:00
Simisays
29b4084637 OTJ 16 cards (#4925) 2024-04-01 07:27:21 +00:00
Hans Mackowiak
9b58a3cfac Keyword: Saddle (#4807) 
* Keyword: Saddle

* AlterAttribute Logic for Suspected and Saddled
 2024-03-17 08:56:16 +00:00
Agetian
8c1bafea87 - Added MKM alt wincon achievement by Marek14. (#4821) 
- Added puzzle PS_MKM3.
 2024-03-14 17:28:08 +03:00
F4llen
8034bfe6c3 Update to Quest opponent icons list, quests and info (#4740) 
* Update Opponent quest icons
 2024-03-07 13:22:56 -05:00
Simisays
73fd119df8 PIP 14 cards (#4736) 2024-02-24 17:00:00 +00:00
friarsol
d7142d2133 Initial checkin for Solved/Cases 2024-01-19 08:43:13 -05:00
Northmoc
b8cf172255 WHO: Two Streams Facility (#4495) 
* WHO: Two Streams Facility

* add TempRemember to ChooseGenericEffect

* remove RepeatEach from more GenericChoice cards

* tidy Archangel of Strife
 2024-01-16 17:01:18 +01:00
Hans Mackowiak
8295312ad2 WHO: add can't tap check (#4441) 
* WHO: add can't tap check

* ~ update PlayEffect IllusionaryMask

* Patch more places

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2023-12-29 20:42:13 +03:00
Hans Mackowiak
38ef2b997d Revert "Revert "CardDb: add normalized Names (#4376)"" 
This reverts commit b396f41188.
 2023-12-29 09:22:53 -05:00
Chris H
b396f41188 Revert "CardDb: add normalized Names (#4376)" 
This reverts commit ce9ca390f8.
 2023-12-19 14:20:50 -05:00
Hans Mackowiak
ce9ca390f8 CardDb: add normalized Names (#4376) 2023-12-19 18:39:18 +01:00
Paul Hammerton
66b08c3e86 Enable Current Timeless Bo3/Bo1 Metagame Decks 2023-12-18 13:10:47 +00:00
Paul Hammerton
fc98a8b6af Merge pull request #4290 from paulsnoops/timeless_format 
WIP Format Changes: Timeless, KTK, Dr Who SLD
 2023-12-12 16:21:35 +00:00
Simisays
79b6a8bd54 MKM 10 cards (#4329) 
* 10 cards

* cleanup

* Update burden_of_proof.txt

* Update burden_of_proof.txt
 2023-12-10 16:59:52 +03:00
Klisz
8d727fca75 WHO singing_towers_of_darillium.txt (#4309) 2023-12-07 07:58:45 +01:00
Paul Hammerton
b7b3069c02 Merge pull request #4274 from Simisays/LCIAlchemy1 
LCI-A 10 cards
 2023-12-06 15:58:16 +00:00
Paul Hammerton
9c5702f873 WIP Format Changes: Timeless, KTK, Dr Who SLD 2023-12-04 23:12:58 +00:00