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

69089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
5ce506c5ab update ImageView 2024-10-04 19:19:30 +08:00
Anthony Calosa
487f33e1e6 Merge branch 'master' into master2 2024-10-04 15:52:04 +08:00
kevlahnota
5affe7dd23 fix AI crash when minimum cards to discard exceeds than the valid cards 
reported here: https://discord.com/channels/267367946135928833/1291545865814675578/1291545865814675578
 2024-10-04 15:45:11 +08:00
Anthony Calosa
deff16b8f4 Merge branch 'master' into master2 2024-10-04 14:40:42 +08:00
kevlahnota
fea8855e0e prevent NPE 2024-10-04 11:33:36 +08:00
Anthony Calosa
650ee98c06 update standalone proguard 7.6.0 
https://github.com/Guardsquare/proguard/releases/tag/v7.6
 2024-10-03 20:44:14 +08:00
fanch
2debe4a42b Fix encoding 2024-10-03 08:58:52 +02:00
Anthony Calosa
1521f29ae3 Merge branch 'master' into master2 2024-10-03 10:24:22 +08:00
tool4ever
0971db66f4 Update screaming_nemesis.txt 2024-10-03 00:13:09 +00:00
Anthony Calosa
ee00fa3ec8 Merge branch 'master' into master2 2024-10-03 05:54:59 +08:00
fanch
12e31f4419 gui-desktop : Match : add a configurable keyboard shortcut to press OK/yes button from prompt and pop-up. 
Allow to quickly pass phases and accept stack events.
Default to 'space bar'
 2024-10-02 20:59:58 +02:00
Paul Hammerton
6a745c721b Merge pull request #6232 from Ayora29/artist 
Update @Artist names in edition txt files
 2024-10-02 19:25:59 +01:00
fanch
ab8a4be1ce Fix bad section move 2024-10-02 20:11:52 +02:00
Jetz72
84e6a61052 Fix ChangeZoneEffect ordering to library; Aetherspouts prompt (#5798) 
* Fix ChangeZone ordering to library
Fix cards not showing up for Aetherspouts.
 2024-10-02 15:39:51 +00:00
TwentyToedToad
436a3382b6 Sadistic Shell Game 2024-10-02 14:11:00 +00:00
fanch
95eea713ee Update @Artist names in edition txt files 2024-10-02 13:29:45 +02:00
Anthony Calosa
fdca506d20 Merge branch 'master' into master2 2024-10-02 18:48:53 +08:00
Anthony Calosa
1f5b90d998 Merge branch 'master' into master2 2024-10-02 16:51:04 +08:00
Paul Hammerton
3df291c1f5 Merge pull request #6231 from Ayora29/typos 
Fix wrong rarity in edition txt files
 2024-10-02 09:50:10 +01:00
tool4ever
9cbf0f8fc6 Update paranormal_analyst.txt 2024-10-02 07:48:27 +02:00
tool4ever
f336bd1284 Support second main (#6230) 2024-10-02 07:23:14 +02:00
fanch
abb6162e6f Revert CMB1 change in card names 2024-10-01 22:48:41 +02:00
Ayora29
d6aa7f3e35 Merge branch 'Card-Forge:master' into typos 2024-10-01 21:24:58 +02:00
fanch
589d50d553 More fixes to rarities 2024-10-01 21:14:40 +02:00
Renato Filipe Vidal Santos
301c000653 Update shichifukujin_dragon.txt (#6176) 2024-10-01 18:47:49 +00:00
Simisays
8d4ddec7da DSK 2 cards (#6210) 2024-10-01 18:38:50 +00:00
Ayora29
b502e0f8ac Restore Anthologies.txt L rarity for lands (#6229) 2024-10-01 18:38:15 +00:00
fanch
aa9f18f9fb Special rarities for masterpieces cards 2024-10-01 20:28:43 +02:00
fanch
345912fbae Fix wrong rarities 2024-10-01 20:23:49 +02:00
TwentyToedToad
c752f862ee Star Athlete (DSC) 2024-10-01 17:18:41 +00:00
Renato Filipe Vidal Santos
310cd28423 Edit pile cleanup: part 7, folders 'v' to 'z' & 'tokenscripts' (#6224) 2024-10-01 17:31:17 +02:00
fanch
e2a6e3b1b1 Add Scryfall code 2024-10-01 12:10:09 +02:00
fanch
d7ec1a225c Add Scryfall code 2024-10-01 11:59:35 +02:00
fanch
377d30dbf5 Restore Anthologies.txt L rarity for lands 2024-10-01 10:30:02 +02:00
Paul Hammerton
bd4843c6a3 Merge pull request #6228 from Ayora29/anthologies 
Re-arange Anthologies edition txt file according to Scryfall
 2024-10-01 09:14:29 +01:00
fanch
135f19e91a Re-arange Anthologies edition txt file according to Scryfall. Pictures still displayin correctly. 2024-10-01 09:31:50 +02:00
Agetian
4fcd6f577a LDA Update (better names for deck archetypes) (#6227) 
* - Add new genetic decks (Standard, Modern) with metagame as of Bloomburrow

* - LDA Update
 2024-10-01 09:44:32 +03:00
Anthony Calosa
36a1c0d5a3 Merge branch 'master' into master2 2024-10-01 06:12:26 +08:00
BigCrunch22
2691363738 Update Oracle text of some "main phase" related cards (#6216) 2024-09-30 18:09:56 +00:00
Anthony Calosa
55ec837b16 Merge branch 'master' into master2 2024-09-30 20:52:34 +08:00
Anthony Calosa
0cb589a905 update generated box display 2024-09-30 20:49:03 +08:00
Paul Hammerton
9e17cf433a Merge pull request #6214 from paulsnoops/edition_updates 
Edition updates: SLD
 2024-09-30 10:04:43 +01:00
Paul Hammerton
02ac064252 Edition updates: SLD 2024-09-30 09:55:23 +01:00
Anthony Calosa
61bf589f05 Merge branch 'master' into master2 2024-09-30 11:51:41 +08:00
tool4ever
a949a988a5 Fix GameStates starting with frozen stack if RE executes (#6213) 
* Fix GameStates starting with frozen stack if RE executes

* Fix NPE when facedown
 2024-09-29 20:18:35 +00:00
Anthony Calosa
f9fc5b4213 fix some icon colors 2024-09-29 22:48:54 +08:00
Agetian
ea070a85aa - Add new genetic decks (Standard, Modern) with metagame as of Bloomburrow (#6212) 2024-09-29 17:29:34 +03:00
Anthony Calosa
683f9c2158 Merge branch 'master' into master2 2024-09-29 21:47:54 +08:00
Anthony Calosa
ea9aab7c4f mobile -> enable combat arrows on 2 player 2024-09-29 20:41:20 +08:00
Anthony Calosa
ddf009fed5 update skinlist 2024-09-29 15:34:52 +08:00