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

68132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
e1cf9251db fix selectbox visibility 2024-06-12 18:52:15 +08: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
kevlahnota
5c02a580c3 Merge pull request #5414 from kevlahnota/newmaster2 
update crack overlay simple progression
 2024-06-12 13:55:02 +08:00
Northmoc
894ee36e79 M3C: final 2 "easy" cards (#5410) 2024-06-12 05:53:13 +00:00
tool4ever
00e0aa979c Script fixes (#5413) 2024-06-12 05:46:14 +00:00
Anthony Calosa
50c008669d update crack overlay simple progression 2024-06-12 11:42:29 +08:00
Northmoc
ca5a627035 MH3: wheel_of_potential + support (#5384) 
* MH3: wheel_of_potential + support

* another go
 2024-06-11 17:37: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
Paul Hammerton
1bdbf46ff2 Merge pull request #5409 from edg444/Planeswalker-Championship-Promos-Update 
Update Planeswalker Championship Promos.txt
 2024-06-11 13:29:56 +01:00
edg444
2300caab99 Update Planeswalker Championship Promos.txt 
Two new cards
 2024-06-11 07:22:05 -04:00
Paul Hammerton
210c47dfbc Merge pull request #5408 from paulsnoops/acr_update 
Edition updates: ACR
 2024-06-11 08:45:11 +01:00
Paul Hammerton
63966659ff Edition updates: ACR 2024-06-11 08:41:52 +01:00
Northmoc
5c0c89a78d M3C: exterminator_magmarch (#5397) 2024-06-11 07:17:04 +02:00
Hans Mackowiak
00daadc669 Delete forge-gui/tools/mtg-data.txt 2024-06-10 08:59:05 -04:00
Fulgur14
997cb7f9bb Added Phobos token script for The Spear of Leonidas (#5405) 2024-06-10 12:38:27 +02:00
kevlahnota
9b327cf3d2 Merge pull request #5401 from kevlahnota/newmaster2 
Add Backup/Restore Data Adventure Mode
 2024-06-10 06:10:41 +08:00
Jetz
614cc96f4f Support for adding Tabs to TabPageScreen 2024-06-09 13:31:04 -04:00
Simisays
9183ddf558 Large adventure update (#5398) 
* Squashed commit of the following:

commit 2e0f844a2f40a622ffc0b55ed45f69a4d812fee6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat Jun 8 00:40:29 2024 +0200

    update

commit 25c21bf27f10fe6a78fb986f0a8ee6e7b0737978
Merge: d256832250 86154cccbd
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jun 7 21:33:32 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit d256832250168447543c3ca0980636e853ff3910
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed Jun 5 19:45:29 2024 +0200

    update

commit b4b75fedc01ff1a739774194dba77aeeee46a0e7
Merge: 951440de0e 6b5412e7dc
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Jun 2 21:22:33 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 951440de0e9c0551238f5d1f6099b5c818c4555f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 31 23:29:14 2024 +0200

    update

commit f9a76ed16971afe94f0ee9e66332cff0e86f6e1b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 29 20:48:37 2024 +0200

    update

commit 6f2c153a91a1a71e8264aa49a745d44277926bb7
Merge: 6944cfb2b4 5119b72066
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:56 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 6944cfb2b432672922de3e07ae6ad739c9b3b145
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 27 23:33:15 2024 +0200

    cleanup

commit 440ea14bf064f5a42a897cb711b9963adc711f05
Merge: 84687d1002 9810264d82
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:53 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 84687d100212a004f99b5d6b7f6bf73f065b7913
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 26 23:48:45 2024 +0200

    update

commit 61abd7abf20fb71b32253923073161ef97e16f0e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 22:53:47 2024 +0200

    update

commit 12c9442e75146dfa2aff3b230c250d9a496896d6
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 25 09:03:13 2024 +0200

    update

commit 57de9e398c08ebf4c1d879683d4b2fc49002005e
Merge: fa9c878d74 6694b5a327
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:14 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit fa9c878d74bc96296d2e13577940642ece84fc9f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 24 23:02:09 2024 +0200

    Update config.json

commit fc51b02e2728ffa31941c879da712c8b7a051951
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Tue May 21 22:55:46 2024 +0200

    update

commit be24e7e6c97782430dd12234d006a0581556177e
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 20 21:49:32 2024 +0200

    updateupdate

commit 3544b9715dfd21fa6b57ebd082691be8272ec44d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 23:30:44 2024 +0200

    update

commit 7fdf564c3f30466ae985cfd330c4ef64a013636d
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun May 19 11:59:07 2024 +0200

    update

commit 3c46938f70104de142afae80dac75b1007b3f59f
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:38:00 2024 +0200

    MOAR

commit 8c1126eb33073e6f4cd38b5734313de1c7454396
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 18 22:37:47 2024 +0200

    update

commit aab99445192045dcbcee93d32826f604e39eeff0
Merge: 175312aab6 3309a48710
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:17 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit 175312aab690fbbc286171efece3e06944a3a32b
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 16 23:34:11 2024 +0200

    update

commit 847191072fe1a8c71e81e1b4d0e5b79f1bd992e9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon May 13 19:18:52 2024 +0200

    update

commit a34f4ec0a9570be4f0ff0da4bb2512462efcebe1
Merge: babbfcfaa5 c7a138fc13
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sat May 11 13:41:42 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit babbfcfaa54983a4f0916f5588c554a198749255
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri May 10 23:40:12 2024 +0200

    hugemapupdate

commit ccbd5b907ad1a20d49d162ba7a2192a01fd7fc45
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 23:24:45 2024 +0200

    updatre

commit 3f2d0cbc0123d20e7bb9414e49fc08f3330381a9
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 13:01:08 2024 +0200

    update

commit 8f43aace8ad4434c56ae4e14bb3c1a02ee7c158a
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Thu May 9 00:40:41 2024 +0200

    update

commit 585134cdb9347298d7138a32c3e5906c2993d70a
Merge: c51c6b119b a2deb08337
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:43 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit c51c6b119b72871cda3fcc0964d350d2e39830a2
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Wed May 8 18:42:37 2024 +0200

    update

commit 4c4f1d70005668339dd7f14f244a7170fa231748
Merge: d4ac1939da 085b9e9735
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:09 2024 +0200

    Merge remote-tracking branch 'upstream/master' into garruknahiri

commit d4ac1939daa16e77032978831a42c53d2139db01
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Mon Apr 22 19:53:02 2024 +0200

    update

commit 1e1d7b7cef12b3ac5fb28c9ce7fede915e54a809
Merge: d872995ea6 fd2522e51c
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Sun Apr 14 13:08:20 2024 +0200

    Merge branch 'Card-Forge:master' into garruknahiri

commit d872995ea63531e44bcb0ef2bf38b53b7a434ceb
Author: Simisays <67333662+Simisays@users.noreply.github.com>
Date:   Fri Jan 19 21:27:47 2024 +0100

    update

* temoraryrevert

* name changes

* Update shops.json

* Update config.json

* Update config.json

* d
 2024-06-09 19:48:33 +03:00
Anthony Calosa
66f5704a8b update 2024-06-09 18:43:14 +08:00
Anthony Calosa
27ff643acc Merge branch 'master' into newmaster2 2024-06-09 18:35:14 +08:00
Anthony Calosa
d76453b8ad remove space 2024-06-09 18:22:49 +08:00
Anthony Calosa
6cdfe47d39 Add Backup/Restore Data Adventure Mode 
- backup file should be on downloads directory
- fix some menu buttons double click/touch duplication
- update some translation
 2024-06-09 18:15:45 +08:00
Northmoc
d06aab9a0b MH3: volatile_stormdrake + support (#5385) 2024-06-09 08:55:06 +03:00
Northmoc
ca197bb2bc M3C: 3 "easy" cards (#5396) 
* aether_refinery, blaster_hulk

* benthic_anomaly
 2024-06-09 08:53:30 +03:00
Hans Mackowiak
ac61d83941 Merge pull request #5399 from Glorax/master 
Update atraxa_grand_unifier.txt
 2024-06-09 07:12:55 +02:00
tool4ever
a9849696d3 CardRules: fix case with null tokens list (#5395) 
* CardRules: fix NPE

* clean up

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-06-09 07:08:45 +03:00
Glorax
681a543102 Update atraxa_grand_unifier.txt 
Removed "horror" from creature types.
 2024-06-08 14:44:58 -07:00
Jetz
1e5e1ba6c0 Redundant import 2024-06-08 12:36:20 -04:00
Anthony Calosa
f52a8e42c4 Merge branch 'master' into newmaster2 2024-06-08 11:25:11 +08:00
kevlahnota
cc08849132 Merge pull request #5394 from NimSpork/NimSpork-Gift-of-the-viper-fix 
Update gift_of_the_viper.txt
 2024-06-08 11:24:28 +08:00
Jetz
a3662079b4 Fix potential NPE. 2024-06-07 22:58:09 -04: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
279e1e520e Disambiguate requested print names 2024-06-07 21:59:59 -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
NimSpork
8625787b34 Update gift_of_the_viper.txt 
Fix to give all counters
 2024-06-07 21:56:12 +01:00
Anthony Calosa
75303a92e0 Merge branch 'master' into newmaster2 2024-06-07 18:36:39 +08:00
Paul Hammerton
86154cccbd Merge pull request #5389 from paulsnoops/edition_updates 
Edition updates: SLD, SLP
 2024-06-06 18:18:04 +01:00
tool4ever
32531ab285 18 M3C cards (#5325) 2024-06-06 17:16:09 +00:00
Paul Hammerton
fab03e5ad1 Merge pull request #5388 from paulsnoops/pauper_ban 
Pauper ban: Cranial Ram
 2024-06-06 18:14:40 +01:00
Paul Hammerton
6fc4fbaecb Edition updates: SLD, SLP 2024-06-06 18:14:13 +01:00
Paul Hammerton
95334a1c03 Pauper ban: Cranial Ram 2024-06-06 18:04:33 +01:00
Northmoc
b18223ce51 MH3: 2 "easy" cards (#5382) 
* MH3: 2 "easy" cards

* update furious_rise
 2024-06-06 11:52:02 -04:00
Northmoc
c91c6a13ac MH3: izzet_generatorium (#5386) 2024-06-06 13:37:56 +02:00
Anthony Calosa
e2ca3a1b0d Merge branch 'master' into newmaster2 2024-06-06 18:48:36 +08:00
Agetian
e0085790cc - Remove erroneous AILogic flag from Ecological Appreciation. (#5387) 2024-06-06 07:56:28 +03:00
tool4ever
e49dd53b20 Include TokenScripts when checking for DeckHints (#5379) 
* Include TokenScripts when checking for DeckHints

* Fix test

* Add field for extra logic

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
 2024-06-06 07:35:05 +03:00
Chris H
cb1c3ffee3 Fix DraftAction type 2024-06-05 23:55:49 -04:00
tool4ever
29508093a7 Update charix_the_raging_isle.txt 2024-06-05 15:37:38 +02:00
Anthony Calosa
af6cbf895e Merge branch 'master' into newmaster2 2024-06-05 18:58:01 +08:00
tool4EvEr
196cb3de4d Henzie fix 2024-06-05 11:38:00 +02:00