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

50508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
2144de87d4 Merge branch 'velus' into 'master' 
MH2: Mount Velus Manticore and support

See merge request core-developers/forge!4809
 2021-06-03 05:15:59 +00:00
Michael Kamensky
7a3c9c5b49 Merge branch 'sojourn' into 'master' 
MH2: Sojourner's Companion w/ updates to TypeCycling to parse "Artifact.Land"

See merge request core-developers/forge!4810
 2021-06-03 05:15:34 +00:00
Michael Kamensky
df35468771 Merge branch 'mh2_2' into 'master' 
MH2 - 2 June

See merge request core-developers/forge!4805
 2021-06-03 05:14:59 +00:00
Northmoc
5ac9d3fdff AbilityUtils support for Count$CardNumTypes / Count$RememberedCardNumTypes 2021-06-02 15:52:41 -04:00
Northmoc
de73ed1986 mount_velus_manticore.txt 2021-06-02 15:51:13 -04:00
Northmoc
da2a92b74a CardFactoryUtil prep TypeCycling for Artifact landcycling 2021-06-02 15:06:29 -04:00
Northmoc
9aba2db8ce KeywordWithCostAndType.java set artifact landcycling for reminder text 2021-06-02 15:05:30 -04:00
Northmoc
5141be475b sojourners_companion.txt 2021-06-02 15:04:38 -04:00
Northmoc
b026479f78 gaeas_will.txt tidy 2021-06-02 11:54:07 -04:00
Northmoc
395fc13142 blossoming_calm.txt (medusa) 2021-06-02 11:35:14 -04:00
Northmoc
e7701ee0f9 rw_4_4_golem.txt for General Ferrous 2021-06-02 11:27:46 -04:00
Michael Kamensky
608eea8e7d Merge branch 'mh2_1' into 'master' 
MH2 - 1 June

See merge request core-developers/forge!4804
 2021-06-02 04:42:00 +00:00
Michael Kamensky
7dae92b042 Merge branch 'fixing' into 'master' 
Card fixes

Closes #1866

See merge request core-developers/forge!4803
 2021-06-02 04:41:15 +00:00
Northmoc
62bc67cbe1 blacksmiths_skill.txt (Suthro) 2021-06-01 19:17:55 -04:00
Northmoc
fbcbf0afe5 barbed_spike.txt (Suthro) 2021-06-01 19:13:50 -04:00
Northmoc
6b06873568 arcbound_javelineer.txt (medusa) 2021-06-01 19:10:18 -04:00
Northmoc
2007a8d05c kaleidoscorch.txt 2021-06-01 18:53:51 -04:00
Northmoc
1007772ef3 funnel_web_recluse.txt 2021-06-01 18:53:19 -04:00
Northmoc
23785ea8b6 add AI hint 2021-06-01 18:52:58 -04:00
Northmoc
10a6b43a97 tavern_scoundrel.txt 2021-06-01 18:39:12 -04:00
Northmoc
72e1d8177c ornithopter_of_paradise.txt 2021-06-01 18:38:53 -04:00
tool4EvEr
faeb73d8b7 Clean up 2021-06-01 22:29:15 +02:00
tool4EvEr
beff3d4832 Fix Runaway Carriage 2021-06-01 22:11:01 +02:00
tool4EvEr
29a4fdb47a prevent StackDescription from revealing face 2021-06-01 21:47:58 +02:00
tool4EvEr
931411b6e4 Fix Wandering Archaic 2021-06-01 18:38:26 +02:00
tool4EvEr
8157172a9f Fix City in a Bottle 2021-06-01 17:53:53 +02:00
Michael Kamensky
5ac73d9f90 Merge branch 'fix-deck-editor-custom-editions-image-view' into 'master' 
Improvements to Deck Editor for Custom Editions

See merge request core-developers/forge!4796
 2021-06-01 04:26:05 +00:00
Michael Kamensky
27085243c4 Merge branch 'historic-formats' into 'master' 
Update the "historic" formats

See merge request core-developers/forge!4802
 2021-06-01 04:25:39 +00:00
Michael Kamensky
16b2fd93d8 Merge branch 'spellcast' into 'master' 
Fix missing intrinsic Cast trigger from copied host

See merge request core-developers/forge!4754
 2021-06-01 04:25:28 +00:00
Bug Hunter
edce6ed9e8 Fix missing intrinsic Cast trigger from copied host 2021-06-01 04:25:27 +00:00
Rob Schnautz
e9b6db6994 erroneous date/name 2021-05-31 20:30:24 +00:00
Rob Schnautz
f5a1671e86 Catching up old formats 2021-05-31 20:04:04 +00:00
leriomaggio
560d8ec5c0 Refactored duplicate code in StaticData w/ new getCardEdition method 
StaticData now includes a new method, namely `getCardEdition` which looks for a CardEdition instance into editions and customeditions given an input set code.

This new method has been refactored and used throughout the new changes in Advanced Search and Filters.
 2021-05-31 19:57:33 +01:00
leriomaggio
4e7a3fe515 Updated Chinese translation after CCTV-1 suggestions in MR comments 2021-05-31 19:30:43 +01:00
leriomaggio
1ac28b5203 Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view 2021-05-31 19:25:20 +01:00
Michael Kamensky
9b69d79a78 Merge branch 'Williams-master-patch-60436' into 'master' 
MH2 Contributions 30/05

See merge request core-developers/forge!4801
 2021-05-31 16:53:19 +00:00
John
9e78a4ef99 Update tireless_provisioner.txt 2021-05-31 13:17:30 +00:00
John
8d2ef41d54 Update tide_shaper.txt 2021-05-31 13:17:03 +00:00
John
c507e960fd Update thought_monitor.txt 2021-05-31 13:16:05 +00:00
John
490f700e37 Update skyblades_boon.txt 2021-05-31 13:15:47 +00:00
John
355f379f21 Update combine_chrysalis.txt 2021-05-31 13:13:34 +00:00
Michael Kamensky
e69f8a2e7a Merge branch 'fixes' into 'master' 
Some card fixes

Closes #1860

See merge request core-developers/forge!4798
 2021-05-31 11:10:12 +00:00
Bug Hunter
450d5b6144 Some card fixes 2021-05-31 11:10:11 +00:00
John
41fdc485b4 Add new file 2021-05-31 10:33:54 +00:00
John
4d25aee6dc Add new file 2021-05-31 10:33:16 +00:00
John
46574f8137 Add new file 2021-05-31 10:32:35 +00:00
John
71cbd1221b Add new file 2021-05-31 10:31:22 +00:00
John
7386a9b614 Add new file 2021-05-31 10:30:50 +00:00
John
d5cfc39744 Add new file 2021-05-31 10:29:35 +00:00
leriomaggio
8a1770ffda FIX Editions in Checkboxlist sorted (latest to earliest) 2021-05-31 11:19:08 +01:00