Commit Graph

50604 Commits

Author SHA1 Message Date
Northmoc
47291206ae 36 packs in box 2021-06-04 12:59:06 -04:00
Northmoc
77578174b7 - improve booster 2021-06-04 12:59:06 -04:00
Northmoc
f0f7b9e6e4 Modern Horizons 2.txt boosters (initial attempt) 2021-06-04 12:59:05 -04:00
Northmoc
dbb87a6a79 blocks.txt add MH2 2021-06-04 12:59:05 -04:00
Michael Kamensky
a23a1fa928 Merge branch 'handcount' into 'master'
Fix full fizzling for targeted players & SA

See merge request core-developers/forge!4817
2021-06-04 15:39:04 +00:00
swordshine
fca3aade63 Merge branch 'restartg' into 'master'
RestartGameEffect: Reset extras turns

See merge request core-developers/forge!4821
2021-06-04 11:19:43 +00:00
tool4EvEr
a2cd1fa8ef Reset extras after restart 2021-06-04 12:46:40 +02:00
Michael Kamensky
d9db3a6edf Merge branch 'fixpay' into 'master'
Fix source of manapool for payment of second human

See merge request core-developers/forge!4815
2021-06-04 03:55:22 +00:00
Michael Kamensky
1d749eba48 Merge branch 'entwine' into 'master'
Entwine reminder text

See merge request core-developers/forge!4818
2021-06-04 03:55:02 +00:00
Michael Kamensky
22917b7e0a Merge branch 'caprichrome' into 'master'
MH2: Caprichrome with necessary Devour keyword tweaks

See merge request core-developers/forge!4811
2021-06-04 03:54:47 +00:00
Michael Kamensky
e4ca35cae8 Merge branch 'fix' into 'master'
tiamat.txt fix

See merge request core-developers/forge!4820
2021-06-04 03:54:13 +00:00
Michael Kamensky
0c74ee2602 Merge branch 'cardupdates' into 'master'
Small card updates

See merge request core-developers/forge!4819
2021-06-04 03:53:59 +00:00
Michael Kamensky
40e533d9d8 Merge branch 'Williams-master-patch-03324' into 'master'
MH2 Contributions 02/06

See merge request core-developers/forge!4807
2021-06-04 03:53:22 +00:00
Northmoc
01f4bb9494 tiamat.txt fix 2021-06-03 18:38:31 -04:00
tool4EvEr
e386c8e87c Update X 2021-06-03 23:43:32 +02:00
tool4EvEr
bf3b1b03e8 Update card 2021-06-03 23:18:41 +02:00
tool4EvEr
a69c1534f6 Small card updates 2021-06-03 22:22:08 +02:00
Northmoc
41671d7acf caprichrome.txt add AI hints 2021-06-03 16:18:16 -04:00
Northmoc
a909fc1fa8 CardFactoryUtil expand Devour keyword possibilities 2021-06-03 16:18:15 -04:00
Northmoc
919a49b22e Card.java override reminder text for Devouring non-creature stuff 2021-06-03 16:18:15 -04:00
Northmoc
9ae599cf05 caprichrome.txt 2021-06-03 16:18:14 -04:00
Northmoc
5aad37c613 Entwine reminder text 2021-06-03 16:07:29 -04:00
tool4EvEr
69e580e37d Fix full fizzling 2021-06-03 21:09:16 +02:00
tool4EvEr
c735195d33 Fix source of manapool for payment of second human 2021-06-03 19:16:27 +02:00
John
857f0d2dcc Update wavesifter.txt 2021-06-03 14:41:12 +00:00
John
9b6e1f4c64 Update lazotep_chancellor.txt 2021-06-03 14:40:51 +00:00
John
8a41b35317 Update foundry_helix.txt 2021-06-03 14:40:30 +00:00
Michael Kamensky
f08cb0f0b5 Merge branch 'activation' into 'master'
ActivationTable: Fix NPE for triggers without OverridingAbility

Closes #1859

See merge request core-developers/forge!4799
2021-06-03 14:07:15 +00:00
Michael Kamensky
bbf1e373ad Merge branch 'fixstuff' into 'master'
Some smaller fixes

Closes #1868

See merge request core-developers/forge!4806
2021-06-03 14:02:50 +00:00
tool4EvEr
069403ab6c Clean up 2021-06-03 14:22:56 +02:00
Tim Mocny
73ac435b92 Merge branch 'editions' into 'master'
MH2 and RMH1 updates

See merge request core-developers/forge!4812
2021-06-03 12:13:05 +00:00
Tim Mocny
4b439dc7bb Merge branch 'boon' into 'master'
skyblades_boon.txt fix

See merge request core-developers/forge!4813
2021-06-03 12:12:44 +00:00
Northmoc
4c7879f423 skyblades_boon.txt fix 2021-06-03 08:10:51 -04:00
tool4EvEr
fc7540ed1e Fix multiplayer rulings (count player who lost) 2021-06-03 11:52:37 +02:00
tool4EvEr
08fd9b98c8 Fix missing sub 2021-06-03 11:19:50 +02:00
tool4EvEr
1af8cee719 Fix crash on payment with Channel 2021-06-03 10:39:50 +02:00
John
ca6c9c454d Add new file 2021-06-03 08:25:22 +00:00
John
8adcc14422 Add new file 2021-06-03 08:24:56 +00:00
John
65777750ab Add new file 2021-06-03 08:24:31 +00:00
John
96b437c0b4 Add new file 2021-06-03 08:24:01 +00:00
John
d3ae5c38d9 Add new file 2021-06-03 08:23:26 +00:00
John
c6452b2fea Add new file 2021-06-03 08:23:01 +00:00
John
caf1900484 Add new file 2021-06-03 08:22:30 +00:00
John
2e79d34f75 Add new file 2021-06-03 08:22:03 +00:00
John
28566c4272 Add new file 2021-06-03 08:21:34 +00:00
John
28fd2d18fa Add new file 2021-06-03 08:20:44 +00:00
John
df7ce97d40 Add new file 2021-06-03 08:20:16 +00:00
John
5b2504ba3f Add new file 2021-06-03 08:19:51 +00:00
John
cbf4d17c7f Add new file 2021-06-03 08:18:35 +00:00
John
642ba05dcf Add new file 2021-06-03 08:18:08 +00:00