external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,822 Commits 32 Branches 187 Tags
8196ee531af1d59c85f728a14f2f9f1a080a116c
Commit Graph

49822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John
c5dbc8ddca Update Strixhaven School of Mages.txt 2021-04-06 14:07:29 +00:00
John
eaea041e73 Update blocks.txt 2021-04-06 14:04:16 +00:00
John
20b4ae230f Update Strixhaven School of Mages.txt 2021-04-06 14:02:56 +00:00
Adam Pantel
037dce8be8 Wake the Past 2021-04-06 09:59:08 -04:00
Anthony Calosa
3ad6045377 Merge branch 'master' into 'master' 
update AssetsDownloader

See merge request core-developers/forge!4405
 2021-04-06 12:18:40 +00:00
Anthony Calosa
3f683c3909 update AssetsDownloader 2021-04-06 20:16:45 +08:00
Anthony Calosa
2f9974f6ef Merge branch 'master' into 'master' 
fix downloader

See merge request core-developers/forge!4404
 2021-04-06 11:25:47 +00:00
Anthony Calosa
d2156a1179 Merge remote-tracking branch 'core/master' 2021-04-06 19:24:33 +08:00
Anthony Calosa
d6a0b92f1e fix downloader 2021-04-06 19:21:45 +08:00
Bug Hunter
15aab58415 Merge branch 'TRT-master-patch-76250' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/culling_ritual.txt

See merge request core-developers/forge!4403
 2021-04-06 10:40:56 +00:00
Bug Hunter
1e8679bf94 Update forge-gui/res/cardsfolder/upcoming/culling_ritual.txt 2021-04-06 10:39:39 +00:00
Michael Kamensky
4eeb4c515f Merge branch 'fixtarget' into 'master' 
DestroyAI: Fix illegal targets

See merge request core-developers/forge!4394
 2021-04-06 08:57:17 +00:00
John
76a75942a9 Update triplicate_titan.txt 2021-04-06 08:47:17 +00:00
John
4383c3486a Update digsite_engineer.txt 2021-04-06 08:46:53 +00:00
Anthony Calosa
e629877984 Merge branch 'master' into 'master' 
fix filteredCards, fix NPE devmode

See merge request core-developers/forge!4402
 2021-04-06 07:53:23 +00:00
Anthony Calosa
fb71ea83f0 Merge remote-tracking branch 'core/master' 2021-04-06 15:50:39 +08:00
Anthony Calosa
d9cf090060 update 2021-04-06 15:49:30 +08:00
Michael Kamensky
a0fd16513a Merge branch 'c21_5' into 'master' 
C21 - 5 April

See merge request core-developers/forge!4396
 2021-04-06 07:30:26 +00:00
Michael Kamensky
c7c6d4e162 Merge branch 'new-cards' into 'master' 
Strict Proctor

See merge request core-developers/forge!4393
 2021-04-06 07:27:15 +00:00
Anthony Calosa
9a2eaa7a1d fix filteredCards, fix NPE devmode 2021-04-06 15:27:14 +08:00
Michael Kamensky
3b12843d5f Merge branch 'card-fixes' into 'master' 
Typo in Liliana's Scorn

See merge request core-developers/forge!4398
 2021-04-06 07:25:20 +00:00
Michael Kamensky
6685649e39 Merge branch 'AIplayCantBeCast' into 'master' 
AI: Add missing CantBeCast check from PlayEffect

See merge request core-developers/forge!4391
 2021-04-06 07:23:55 +00:00
John
7e63c902d3 Update triplicate_titan.txt 2021-04-06 06:50:50 +00:00
John
c1e1530cd9 Update losheel_clockwork_scholar.txt 2021-04-06 06:49:52 +00:00
John
b1a190093c Update digsite_engineer.txt 2021-04-06 06:49:01 +00:00
Hans Mackowiak
fcc7cf0566 Merge branch 'kevlahnota-master-patch-51370' into 'master' 
Update lathiel_the_bounteous_dawn.txt

See merge request core-developers/forge!4400
 2021-04-06 06:47:33 +00:00
Anthony Calosa
ca3d51157f Update lathiel_the_bounteous_dawn.txt 2021-04-06 06:47:33 +00:00
John
899a7b2500 Update bronze_guardian.txt 2021-04-06 06:46:58 +00:00
John
d19be1731e Update angel_of_ruins.txt 2021-04-06 06:45:26 +00:00
John
90768b6933 Update alibou_ancient_witness.txt 2021-04-06 06:43:39 +00:00
John
89d6f050d1 Add new file 2021-04-06 06:40:06 +00:00
John
5bfe7a2146 Add new file 2021-04-06 06:39:07 +00:00
John
e54dc157ac Add new file 2021-04-06 06:38:17 +00:00
John
5be7472dd9 Add new file 2021-04-06 06:37:16 +00:00
John
1a2de2bbc2 Add new file 2021-04-06 06:36:01 +00:00
John
0c9935b1b5 Add new file 2021-04-06 06:34:55 +00:00
John
aba00ad17b Add new file 2021-04-06 06:33:04 +00:00
Anthony Calosa
5ca05394d6 Merge branch 'kevlahnota-master-patch-58460' into 'master' 
Update ImageCache.java

See merge request core-developers/forge!4399
 2021-04-06 03:59:42 +00:00
Anthony Calosa
5165415fb1 Update ImageCache.java 
Don't dispose defaultImage
 2021-04-06 03:59:21 +00:00
Adam Pantel
1f1060b97c Typo in Liliana's Scorn 2021-04-05 23:50:37 -04:00
Adam Pantel
3e9dabe2a5 Demonstrate keyword and Excavation Technique 2021-04-05 23:19:33 -04:00
Northmoc
86d72b15c5 support for archaeomancers_map.txt 2021-04-05 23:05:56 -04:00
Northmoc
3fd3a3e5aa archaeomancers_map.txt 2021-04-05 23:05:16 -04:00
Northmoc
3fbcf09326 ruin_grinder.txt 2021-04-05 23:04:47 -04:00
Anthony Calosa
d97cd9eabe Merge branch 'STX_edition' into 'master' 
STX edition missing cards

See merge request core-developers/forge!4392
 2021-04-06 01:32:58 +00:00
Sol
de52bb1036 Merge branch 'card-fixes' into 'master' 
MoJhoSto improvements

See merge request core-developers/forge!4395
 2021-04-06 01:19:38 +00:00
Adam Pantel
f9a073fd93 Momir script improvement 2021-04-05 19:32:51 -04:00
Adam Pantel
c77f99cf9b MoJhoSto logging 2021-04-05 18:57:36 -04:00
Northmoc
af8c1b2092 cursed_mirror.txt 2021-04-05 18:45:59 -04:00
Adam Pantel
9095dcd9d8 Add infinite loop protection for Stonehewer 2021-04-05 18:21:32 -04:00