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
62,548 Commits 31 Branches 187 Tags
73b1cb15c39e57a8cb235127eeec30a4634c53d2
Commit Graph

62548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simisays
82acff3267 update 2022-12-07 14:28:57 +01:00
Simisays
1cd87021e0 Update patchplate_resolute.txt 2022-12-07 11:38:30 +01:00
Simisays
f6f4be8e85 Update patchplate_resolute.txt 2022-12-07 10:04:20 +01:00
Anthony Calosa
dbcbd7f203 Merge pull request #2041 from kevlahnota/newmaster2 
fix ConcurrentModificationException and reloading WorldSave
 2022-12-07 11:13:29 +08:00
Anthony Calosa
693dbbdd48 fix ConcurrentModificationException and reloading WorldSave 2022-12-07 10:57:14 +08:00
Anthony Calosa
0a020b4178 Merge pull request #2040 from pfirpfel/2037-less-destructive-fix 
Sync J21 to match Scryfall collector numbers [less destructive fix]
 2022-12-07 07:42:57 +08:00
Anthony Calosa
8fd2d45bce Merge pull request #2039 from kevlahnota/newmaster2 
update ImageFetcher & CardImageRenderer
 2022-12-07 07:33:56 +08:00
Anthony Calosa
1da4cc5726 Merge pull request #2036 from tool4ever/dierollfix 
Die roll fix
 2022-12-07 07:29:49 +08:00
pfirpfel
3f483a4560 Remove cards which collector numbers match with different cards on Scryfall 2022-12-07 00:28:10 +01:00
pfirpfel
dcfdf927b2 Swap collector numbers to get correct Scryfall picture 2022-12-07 00:27:20 +01:00
Anthony Calosa
dae601776d update imports 2022-12-07 07:25:28 +08:00
Anthony Calosa
b103a20bd6 update ImageFetcher & CardImageRenderer 
- allow zoomed cards to fetch image if possible
 2022-12-07 07:11:21 +08:00
TRT
1072c29494 Clean up 2022-12-06 22:30:55 +01:00
TRT
bbb961bad9 Fix invalid number when stack frozen 2022-12-06 22:30:33 +01:00
Simisays
3752c67472 Merge branch 'YBRO' of https://github.com/Simisays/forge into YBRO 2022-12-06 21:58:17 +01:00
Simisays
0e817edc44 update 2022-12-06 21:58:13 +01:00
Simisays
afdb2b02d2 Update hurkyls_prodigy.txt 2022-12-06 20:48:22 +01:00
Simisays
7e17a58aac update 2022-12-06 20:42:32 +01:00
Simisays
27d5982a6f Create foundry_groundbreaker.txt 2022-12-06 18:53:38 +01:00
Simisays
7073cd3a38 update 2022-12-06 18:31:23 +01:00
Northmoc
a9d8711a4b minthara_of_the_absolute.txt fix typos (#2033) 2022-12-06 15:33:48 +01:00
Paul Hammerton
d8980f4e36 Merge pull request #2027 from paulsnoops/molten_impact 
Molten Impact rebalance
 2022-12-06 14:11:49 +00:00
Northmoc
6d22252efd Merge pull request #2032 from Northmoc/ego 
ego_erasure.txt tidy up
 2022-12-06 08:52:23 -05:00
Northmoc
a026f4de52 ego_erasure.txt tidy up 2022-12-06 08:43:05 -05:00
Paul Hammerton
0e33966944 Merge pull request #2031 from paulsnoops/fix_sld 
Update edition: SLD fixes
 2022-12-06 11:40:09 +00:00
paulsnoops
9737f04840 Update editions: SLD fixes 2022-12-06 11:35:44 +00:00
tool4ever
293dd1fc43 Update auntie_blyte_bad_influence.txt 2022-12-06 12:29:45 +01:00
Simisays
fadd483bda Delete great_desert_hellion.txt 2022-12-06 12:04:17 +01:00
Simisays
1e67477944 update 2022-12-06 12:00:16 +01:00
Paul Hammerton
6eaa847e31 Merge pull request #2028 from paulsnoops/ybro_ea2_updates 
Update editions: EA2 & YBRO
 2022-12-06 10:48:48 +00:00
paulsnoops
c91335f1fc Update editions: EA2 & YBRO 2022-12-06 10:40:49 +00:00
paulsnoops
826229abdc Molten Impact rebalance 2022-12-06 08:40:24 +00:00
Paul Hammerton
571a656e53 Merge pull request #2026 from invalidCards/patch-1 
Fix Magnanimous Magistrate trigger
 2022-12-05 19:28:53 +00:00
invalidCards
1e3a26d68b Fix Magnanimous Magistrate trigger 
Currently Magnanimous Magistrate triggers for all creatures dying, which should only be creatures you control
 2022-12-05 19:56:54 +01:00
Paul Hammerton
1bfc9911d0 Merge pull request #2024 from Simisays/fix 
Update trazyn_the_infinite.txt
 2022-12-05 18:55:51 +00:00
tool4ever
bdf09485a2 Clean up (#2025) 2022-12-05 18:43:56 +00:00
Simisays
faea47b74d Update forgefire_automaton.txt 2022-12-05 19:23:55 +01:00
Simisays
99a22f54b5 Update forgefire_automaton.txt 2022-12-05 19:12:28 +01:00
Simisays
9a57a12e00 update 2022-12-05 19:10:26 +01:00
Simisays
561d60f25a Update trazyn_the_infinite.txt 2022-12-05 19:06:40 +01:00
Simisays
687f1e4cd7 Update trazyn_the_infinite.txt 2022-12-05 19:05:15 +01:00
Simisays
3f831bc036 Update trazyn_the_infinite.txt (#2023) 2022-12-05 18:00:55 +00:00
Simisays
ce2a9f7929 update 2022-12-05 18:38:42 +01:00
Simisays
4264c5047f Merge branch 'Card-Forge:master' into ABRO-3 2022-12-05 17:53:38 +01:00
Anthony Calosa
1b6d7a2032 Merge pull request #2022 from kevlahnota/newmaster2 
update LoadingOverlay
 2022-12-05 20:18:37 +08:00
Anthony Calosa
62db056bef update LoadingOverlay 2022-12-05 19:56:49 +08:00
Anthony Calosa
eb49a4a7be Update DeckSelectScene.java 
fix button layout (ie deck name is longer than the button default size, it should resize accordingly)
 2022-12-05 12:27:53 +08:00
Anthony Calosa
856596a497 Merge pull request #2017 from kevlahnota/newmaster2 
update MatchScreen
 2022-12-05 05:02:33 +08:00
Anthony Calosa
5714f6e05e update MatchScreen 2022-12-05 04:57:33 +08:00
Anthony Calosa
f1bbdc934a Merge pull request #2014 from tool4ever/charmClean 
CharmEffect: Remove redundant code
 2022-12-05 04:55:12 +08:00