Commit Graph

56242 Commits

Author SHA1 Message Date
Northmoc
f93b863102 dokuchi_shadow_walker.txt (Medusa) 2022-01-28 15:23:05 -05:00
Northmoc
1d87fc8995 akki_ember_keeper.txt 2022-01-28 15:18:14 -05:00
Northmoc
c341d993bf unstoppable_ogre.txt 2022-01-28 15:00:21 -05:00
Northmoc
d343720b58 befriending_the_moths_imperial_moth.txt 2022-01-28 14:55:29 -05:00
Northmoc
6e35cf2b44 mirror_box.txt 2022-01-28 14:53:45 -05:00
Northmoc
bd74bfc50f invoke_despair.txt 2022-01-28 14:38:33 -05:00
Northmoc
d057834964 anointer_of_valor.txt use ImmediateTrigger 2022-01-28 14:14:10 -05:00
Michael Kamensky
c8d9e00904 Merge branch 'neo_lp' into 'master'
NEO [leaked]: Light-Paws, Emperor's Voice

See merge request core-developers/forge!6035
2022-01-28 16:04:04 +00:00
Paul Hammerton
bbd72968c9 Merge branch 'neo_edition' into 'master'
Update NEO edition file

See merge request core-developers/forge!6090
2022-01-28 10:46:24 +00:00
Paul Hammerton
b444cce177 Update Kamigawa Neon Dynasty.txt 2022-01-28 10:43:59 +00:00
Michael Kamensky
3e9639d0fd Merge branch 'neo_kw_ok' into 'master'
NEO: The Kami War // O-Kagachi Made Manifest and support

See merge request core-developers/forge!5997
2022-01-28 04:32:02 +00:00
Tim Mocny
b6a4ed2a4c Merge branch 'revert-9d32ec86' into 'master'
Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"

See merge request core-developers/forge!6087
2022-01-27 21:50:13 +00:00
Tim Mocny
fbb7308747 Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"
This reverts merge request !6085
2022-01-27 21:48:54 +00:00
Northmoc
fd6c308325 fix typo 2022-01-27 13:57:39 -05:00
Northmoc
0472b9f91b tweak Saga reminder builder for double-faced 2022-01-27 13:56:58 -05:00
Northmoc
b25edbc6f1 the_kami_war_o_kagachi_made_manifest.txt 2022-01-27 13:56:58 -05:00
Michael Kamensky
9d32ec86f3 Merge branch 'paco-aicannotplaybyarea' into 'master'
[Desktop] Display which DeckZone the unplayable cards are from

See merge request core-developers/forge!6085
2022-01-27 05:08:33 +00:00
Paco Ito
2493b08093 [Desktop] Display which DeckZone the unplayable cards are from 2022-01-27 05:08:33 +00:00
Michael Kamensky
085883c025 Merge branch 'master' into 'master'
Net Decks Archive Updates

See merge request core-developers/forge!6084
2022-01-27 05:08:04 +00:00
Churrufli
3d285b2f0e Add "Current Historic Brawl Metagame" in Net Decks Brawl Format 2022-01-26 23:53:04 +01:00
Churrufli
53119a8dfe Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2022-01-26 23:50:47 +01:00
Michael Kamensky
93f42be5ec Merge branch 'mvn-http' into 'master'
override https requirement for 4thline-repo

See merge request core-developers/forge!6083
2022-01-26 20:25:54 +00:00
Jamin W. Collins
cfbad651a7 override https requirement for 4thline-repo
Maven blocks external HTTP repositories by default since version 3.8.1
(see https://maven.apache.org/docs/3.8.1/release-notes.html)

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2022-01-26 12:23:56 -07:00
Hans Mackowiak
3d6baa441b Merge branch 'neo_modified' into 'master'
NEO: initial support for "modified" property

See merge request core-developers/forge!6001
2022-01-26 16:47:28 +00:00
Tim Mocny
06e95e0293 NEO: initial support for "modified" property 2022-01-26 16:47:28 +00:00
Michael Kamensky
5e16d91e83 Merge branch 'rebalanced_27_jan_2022' into 'master'
January 27, 2022 Arena Rebalanced Cards

See merge request core-developers/forge!6082
2022-01-26 04:56:19 +00:00
paul_snoops
939ad1f02d remaining cards, editions and oracle fixes 2022-01-25 21:12:30 +00:00
paul_snoops
46f0fa646c amend names 2022-01-25 18:31:29 +00:00
paul_snoops
9cbff0d3f5 January 25, 2022 Arena Rebalanced Cards 2022-01-25 18:25:52 +00:00
Paul Hammerton
6f67674ee3 Merge branch 'br_25_jan_22' into 'master'
January 25, 2022 Banned and Restricted

See merge request core-developers/forge!6081
2022-01-25 17:22:21 +00:00
paul_snoops
6edba1c6f4 B&R - January 25, 2022 2022-01-25 17:19:20 +00:00
Paul Hammerton
913d0f64a2 Merge branch 'historic_fix' into 'master'
Historic format: add missing legal sets

See merge request core-developers/forge!6080
2022-01-25 11:41:41 +00:00
paul_snoops
d93d2c934f removed bans 2022-01-25 11:39:48 +00:00
paul_snoops
dc177114cb Historic format fix 2022-01-25 11:09:42 +00:00
Hans Mackowiak
f3d2f1ecfd Merge branch 'TRT-master-patch-29303' into 'master'
Update forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt

Closes #2070

See merge request core-developers/forge!6079
2022-01-25 08:44:08 +00:00
Bug Hunter
61fc8eed5c Update forge-gui/res/cardsfolder/p/prowling_geistcatcher.txt 2022-01-25 08:30:31 +00:00
Hans Mackowiak
b28737e2e7 fix curse_of_verbosity 2022-01-25 07:10:40 +01:00
Michael Kamensky
a0a0c89c19 Merge branch 'crash' into 'master'
Fix crash when all choices invalid

See merge request core-developers/forge!6078
2022-01-24 11:28:00 +00:00
TRT
ba0d6b3da4 Fix crash when all choices invalid 2022-01-24 11:31:22 +01:00
Bug Hunter
38d706c883 Merge branch 'goadedFix' into 'master'
Goad: fixed using PlayerCollection

See merge request core-developers/forge!6077
2022-01-24 08:54:54 +00:00
Hans Mackowiak
d8ab18e673 Goad: fixed using PlayerCollection 2022-01-24 06:52:19 +01:00
Michael Kamensky
47a2f4b81e Merge branch 'master' into 'master'
Ghitu Lavarunner AI hint

See merge request core-developers/forge!6076
2022-01-24 05:38:09 +00:00
Michael Kamensky
2940f34a9c - Ghitu Lavarunner AI hint 2022-01-24 08:36:52 +03:00
Michael Kamensky
635890a447 Merge branch 'mayflashsac' into 'master'
Fix MayFlashSac

See merge request core-developers/forge!6075
2022-01-23 20:20:42 +00:00
Bug Hunter
01e9a321a9 Fix MayFlashSac 2022-01-23 20:20:42 +00:00
Michael Kamensky
06e487b033 Merge branch 'goad' into 'master'
Goad doesn't stack

See merge request core-developers/forge!6074
2022-01-23 20:20:36 +00:00
Bug Hunter
2b7fb8c5be Goad doesn't stack 2022-01-23 20:20:35 +00:00
Michael Kamensky
6208336ac3 Merge branch 'walkerTokenTextChange' into 'master'
Walker Token protected by Text Change

See merge request core-developers/forge!6073
2022-01-23 20:20:07 +00:00
Hans Mackowiak
be383eb2c4 Walker Token protected by Text Change 2022-01-23 11:30:30 +01:00
Hans Mackowiak
f5430b7e26 Merge branch 'definedPlayerValid' into 'master'
AbilityUtils.getDefinedPlayer use valid like with getDefinedCards

See merge request core-developers/forge!6067
2022-01-23 10:19:56 +00:00