Commit Graph

51054 Commits

Author SHA1 Message Date
tool4EvEr
828d4e17c9 Add Ask AI button 2021-06-11 23:25:57 +02:00
paul_snoops
233c1f6d00 Merge branch 'master' into net_decks 2021-06-11 22:24:22 +01:00
Sol
dbe1683ba9 Merge branch 'zabaz' into 'master'
Zabaz: add Cause to ReplaceAddCounter

See merge request core-developers/forge!4863
2021-06-11 12:29:46 +00:00
Bug Hunter
a5b7f93971 Merge branch 'fixnpe' into 'master'
Fix CostTapType NPE

See merge request core-developers/forge!4865
2021-06-11 10:34:21 +00:00
tool4EvEr
d853ca6615 Fix CostTapType NPE 2021-06-11 12:33:37 +02:00
Michael Kamensky
418d2bf012 Merge branch 'update_card_translations' into 'master'
Update card translations

See merge request core-developers/forge!4862
2021-06-11 10:07:29 +00:00
Lyu Zong-Hong
030f1f4056 Update Japanese translations 2021-06-11 16:56:17 +09:00
Churrufli
45f598e0b9 Oathbreaker Net Decks implementation 2021-06-11 09:07:41 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
Lyu Zong-Hong
6feb18c11c Update card translations 2021-06-11 15:10:49 +09:00
Michael Kamensky
c07f3ea34d Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-11 07:50:33 +03:00
Michael Kamensky
8948210e0a Merge branch 'fixland' into 'master'
Fix playLand ETB check failing if lands changed by another effect

See merge request core-developers/forge!4860
2021-06-11 03:47:55 +00:00
paul_snoops
df0b5362c2 Net decks updates 2021-06-10 20:09:40 +01:00
tool4EvEr
a9b60a87e0 Fix playLand ETB check failing if lands changed by another effect 2021-06-10 18:10:42 +02:00
Sol
694317a50f Merge branch 'fixes' into 'master'
More small fixes

See merge request core-developers/forge!4855
2021-06-10 15:36:25 +00:00
tool4EvEr
a856834693 Refactor guard 2021-06-10 17:29:26 +02:00
Michael Kamensky
35b71da140 Merge branch 'master' into 'master'
Gauntlet Updates

See merge request core-developers/forge!4859
2021-06-10 11:49:55 +00:00
Churrufli
3b2e39808e Gauntlet Updates 2021-06-10 10:41:45 +02:00
Churrufli
697a2ace20 Gauntlet Updates 2021-06-10 10:37:24 +02:00
Sol
c38c53d513 Merge branch 'fix-play-effect' into 'master'
isBlank() is from Java 11

See merge request core-developers/forge!4858
2021-06-10 01:58:13 +00:00
friarsol
31745fe31e isBlank() is from Java 11 2021-06-09 21:57:47 -04:00
Sol
f8e3f4dd31 Merge branch 'migrate-mh2' into 'master'
Migrate Modern Horizons 2

See merge request core-developers/forge!4857
2021-06-10 01:47:40 +00:00
friarsol
965ec4bc47 Migrate Modern Horizons 2 2021-06-09 21:46:33 -04:00
Sol
9cf28e7041 Update u_0_3_crab.txt 2021-06-10 01:28:52 +00:00
Sol
71f639d45e Merge branch 'garth_one_eye' into 'master'
Add Garth One-Eye and necessary support

See merge request core-developers/forge!4856
2021-06-10 00:43:30 +00:00
tool4EvEr
084476b8b0 Clean up 2021-06-09 18:43:34 +02:00
Lyu Zong-Hong
f9abb8ca75 Add Garth One-Eye and necessary support 2021-06-09 23:07:55 +09:00
tool4EvEr
4b0c748eaf Fix Myr Battlesphere allowing you to tap for X = 0 2021-06-09 11:40:11 +02:00
tool4EvEr
083674071b Reset xPaid after ability resolved 2021-06-09 11:40:01 +02:00
tool4EvEr
96ccf0afc6 More small fixes 2021-06-09 09:43:02 +02:00
Michael Kamensky
cfb755ce20 Merge branch 'clean' into 'master'
Small fixes

See merge request core-developers/forge!4854
2021-06-09 05:52:47 +00:00
tool4EvEr
cc8753b563 Small fixes 2021-06-08 23:17:55 +02:00
Michael Kamensky
454c51f1b1 Merge branch 'fix' into 'master'
Various card patches

See merge request core-developers/forge!4831
2021-06-08 14:56:34 +00:00
Michael Kamensky
fa83326710 Merge branch 'mh2_7' into 'master'
MH2 - 7 June

See merge request core-developers/forge!4848
2021-06-08 14:55:48 +00:00
Northmoc
eb60690973 viashino_lashclaw.txt add AILogic 2021-06-08 10:17:43 -04:00
Northmoc
0983c72ea0 viashino_lashclaw.txt 2021-06-08 10:17:42 -04:00
Northmoc
49436a00b3 graceful_restoration.txt 2021-06-08 10:17:42 -04:00
Northmoc
8345bf890b glimmer_bairn.txt 2021-06-08 10:17:42 -04:00
Northmoc
5b2980562b emergent_growth.txt clean up stackdesc 2021-06-08 10:16:03 -04:00
Northmoc
b86249635f drake_stone.txt fix ManaCost 2021-06-08 10:16:03 -04:00
Northmoc
4286429402 gravebreaker_lamia.txt add Mandatory 2021-06-08 10:16:02 -04:00
Michael Kamensky
6578fb79e6 Merge branch 'master' into 'master'
Net Decks Archive Updates - New Gauntlets

See merge request core-developers/forge!4852
2021-06-08 10:33:26 +00:00
Bug Hunter
f1169511ab Merge branch 'TRT-master-patch-20578' into 'master'
Update forge-gui/res/cardsfolder/b/bog_rats.txt

Closes #1883

See merge request core-developers/forge!4853
2021-06-08 07:33:29 +00:00
Bug Hunter
6f5f04bb7e Update forge-gui/res/cardsfolder/b/bog_rats.txt 2021-06-08 07:32:14 +00:00
Churrufli
b33595d840 Net Decks Archive Updates - New Gauntlets 2021-06-08 09:25:52 +02:00
Churrufli
653b484674 Net Decks Archive Updates - New Gauntlets 2021-06-08 09:16:34 +02:00
Michael Kamensky
5a0a63940d Merge branch 'typefix' into 'master'
Fix missing type

See merge request core-developers/forge!4849
2021-06-08 03:31:57 +00:00
Michael Kamensky
d734fdf761 Merge branch 'fixnpe' into 'master'
Fix NPE with Grakmaw when run from ChooseType

See merge request core-developers/forge!4850
2021-06-08 03:31:41 +00:00
tool4EvEr
3ab7fcf224 Fix NPE with Grakmaw when run from ChooseType 2021-06-07 22:40:16 +02:00
tool4EvEr
4f4fe04683 Fix missing type 2021-06-07 22:08:21 +02:00