Commit Graph

51886 Commits

Author SHA1 Message Date
Michael Kamensky
6687ad0b76 Merge branch 'eldrainequest' into 'master'
Eldraine Quest World! – by Xyx

See merge request core-developers/forge!5186
2021-08-07 04:11:41 +00:00
Michael Kamensky
a4af507992 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.44.001

See merge request core-developers/forge!5193
2021-08-07 03:43:08 +00:00
Michael Kamensky
1ef490bf5e - Preparing Forge for Android publish 1.6.44.001 [incremental]. 2021-08-07 06:42:00 +03:00
Michael Kamensky
1a7845117b [maven-release-plugin] prepare for next development iteration 2021-08-07 06:30:54 +03:00
Michael Kamensky
5c768baf64 [maven-release-plugin] prepare release forge-1.6.44 forge-1.6.44 2021-08-07 06:30:45 +03:00
Michael Kamensky
789ed51ca6 Merge branch 'command' into 'master'
Resolve "Word of Command: crash when trying to play card outside of timing restriction (e. g. Chaotic Strike)"

Closes #1857

See merge request core-developers/forge!5190
2021-08-07 03:20:56 +00:00
Michael Kamensky
307c8e5dd1 Merge branch 'prey' into 'master'
prey_upon.txt cleanup descs

See merge request core-developers/forge!5192
2021-08-07 03:20:36 +00:00
Northmoc
4d4c427ca9 prey_upon.txt cleanup descs 2021-08-06 20:47:01 -04:00
tool4EvEr
7838a9dfba Fix crash when empty 2021-08-07 00:22:56 +02:00
Michael Kamensky
8a64097a85 Merge branch 'wc' into 'master'
wintermoor_commander.txt add AI logic - by Xyx

See merge request core-developers/forge!5187
2021-08-06 17:33:12 +00:00
Sol
a8e11227f9 Merge branch 'announce' into 'master'
announcements

See merge request core-developers/forge!5188
2021-08-06 16:17:39 +00:00
Northmoc
ea9001f582 announcement 2021-08-06 09:44:43 -04:00
Northmoc
dc42f9caa7 announcement 2021-08-06 09:32:29 -04:00
Northmoc
bbdc74f9a4 wintermoor_commander.txt add AI logic - by Xyx 2021-08-06 09:29:37 -04:00
Northmoc
f494e8fdf9 Eldraine Quest World! – by Xyx 2021-08-06 09:13:52 -04:00
Michael Kamensky
2a7fa0f691 Merge branch 'mulligan' into 'master'
Fix mulligan with zero cards

Closes #1945

See merge request core-developers/forge!5183
2021-08-06 03:30:00 +00:00
Michael Kamensky
37de739a9c Merge branch 'fix_phyrexian_mana' into 'master'
Add pure Phyrexian mana symbol for Rage Extractor

See merge request core-developers/forge!5184
2021-08-06 03:29:42 +00:00
Lyu Zong-Hong
763d509638 Add pure Phyrexian mana symbol for Rage Extractor 2021-08-06 09:46:59 +09:00
tool4EvEr
32b4407b04 Fix mulligan with zero cards 2021-08-05 21:42:04 +02:00
Michael Kamensky
1d4f68d95f Merge branch 'fixes' into 'master'
Fix Minimus Containment

See merge request core-developers/forge!5182
2021-08-05 15:59:06 +00:00
tool4EvEr
bb2c967f6e Fix Minimus Containment on equipment 2021-08-05 17:48:51 +02:00
tool4EvEr
6ccb41cfa6 NPE protection 2021-08-05 17:48:27 +02:00
Michael Kamensky
118e81d046 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!5181
2021-08-05 11:42:55 +00:00
CCTV-1
a146996c33 translate new settings. 2021-08-05 16:40:12 +08:00
Michael Kamensky
f6977fad35 Merge branch 'j21_4' into 'master'
J21 - 4 Aug

See merge request core-developers/forge!5179
2021-08-05 03:44:32 +00:00
Michael Kamensky
9c71c7914b Merge branch 'twosat-master-patch-87442' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5180
2021-08-05 03:44:21 +00:00
Andreas Bendel
88e3f473d7 Update de-DE.properties
translated cbpCardArtFormat and nlCardArtFormat
2021-08-04 20:08:45 +00:00
Northmoc
a44452f3c9 benalish_partisan.txt 2021-08-04 12:20:19 -04:00
Michael Kamensky
54569bffeb Merge branch 'j21_3' into 'master'
J21 – Most of the rest

See merge request core-developers/forge!5175
2021-08-04 14:14:51 +00:00
Michael Kamensky
97fa6f1312 Merge branch 'j21_teyo' into 'master'
J21 - Teyo, Freyalise, and conjure improvements

See merge request core-developers/forge!5169
2021-08-04 14:14:15 +00:00
Northmoc
4201fa63db MakeCardEffect - put made card in None zone before moving to destination 2021-08-04 07:48:22 -04:00
Northmoc
caf067ec68 freyalise_skyshroud_partisan.txt 2021-08-04 07:38:22 -04:00
Northmoc
606ded6fc2 fix typo 2021-08-04 07:38:21 -04:00
Northmoc
18b3e14f2e teyo_aegis_adept.txt 2021-08-04 07:38:21 -04:00
Northmoc
80a24a1f93 fix desc typo 2021-08-04 07:37:47 -04:00
Northmoc
53653d5cc6 finish common "perpetually boost creature in hand" cycle 2021-08-04 07:37:46 -04:00
Northmoc
e718903957 bounty_of_the_deep.txt 2021-08-04 07:37:46 -04:00
Northmoc
ca27221188 update Editions file 2021-08-04 07:37:45 -04:00
Northmoc
21e9dd3976 add "Perpetually" to Effect names for fun 2021-08-04 07:37:45 -04:00
Northmoc
dcdf064e43 scion_of_shiv.txt 2021-08-04 07:37:44 -04:00
Northmoc
3103e4d575 baffling_defenses.txt 2021-08-04 07:37:44 -04:00
Northmoc
ea3353ee2c ethereal_grasp.txt 2021-08-04 07:37:44 -04:00
Northmoc
4360cc7fd5 add AI hint 2021-08-04 07:37:43 -04:00
Northmoc
babd2deb71 davriels_withering.txt 2021-08-04 07:37:43 -04:00
Northmoc
7c657dadf1 skyshroud_lookout.txt 2021-08-04 07:37:42 -04:00
Hans Mackowiak
f292ad2fb6 Card fix disabled static ability conditions 2021-08-04 07:21:28 +02:00
Michael Kamensky
49b4db24ea Merge branch 'cleanup' into 'master'
Clean up some triggers

See merge request core-developers/forge!5173
2021-08-04 05:10:00 +00:00
Michael Kamensky
904524ea6d Merge branch 'changetargets' into 'master'
ChangeTargets: Fix same choices

See merge request core-developers/forge!5174
2021-08-04 05:09:35 +00:00
Michael Kamensky
2d16490aab Merge branch 'reveal' into 'master'
allow "Random" and "RevealValid" in same Reveal

See merge request core-developers/forge!5178
2021-08-04 05:08:47 +00:00
Michael Kamensky
048995fb47 Merge branch 'fix_the_deck_of_many_things' into 'master'
Fix lose effect of The Deck of Many Things

See merge request core-developers/forge!5177
2021-08-04 05:08:38 +00:00