Commit Graph

50617 Commits

Author SHA1 Message Date
John
78b6e16eb3 Add new file 2021-06-02 15:54:59 +00:00
John
682c61d025 Add new file 2021-06-02 15:54:29 +00:00
Northmoc
b026479f78 gaeas_will.txt tidy 2021-06-02 11:54:07 -04:00
John
1d6fbba6d2 Add new file 2021-06-02 15:53:41 +00:00
John
142a47346d Add new file 2021-06-02 15:51:36 +00:00
John
406d1023e8 Add new file 2021-06-02 15:49:57 +00:00
John
895db0526b Add new file 2021-06-02 15:49:16 +00:00
John
d2ecf48af9 Add new file 2021-06-02 15:48:20 +00:00
John
edca8bec50 Add new file 2021-06-02 15:47:16 +00:00
John
b99571c28f Add new file 2021-06-02 15:46:43 +00:00
John
70d9d9273b Add new file 2021-06-02 15:45:59 +00:00
John
bcd0b0cd46 Add new file 2021-06-02 15:44:37 +00:00
John
49238a1283 Add new file 2021-06-02 15:43:32 +00:00
John
7a11129a5e Add new file 2021-06-02 15:41:56 +00:00
Northmoc
395fc13142 blossoming_calm.txt (medusa) 2021-06-02 11:35:14 -04:00
tool4EvEr
3b594d239c Update script 2021-06-02 17:30:31 +02:00
Northmoc
e7701ee0f9 rw_4_4_golem.txt for General Ferrous 2021-06-02 11:27:46 -04:00
Bug Hunter
80e8f5db8a Update goblin_artisans.txt 2021-06-02 06:51:46 +00: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
6ab9bfa0fa Add pump 2021-06-01 22:33:49 +02: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