Commit Graph

18628 Commits

Author SHA1 Message Date
TRT
c2d44efbc5 Fix Muse Vessel + Hexproof 2021-10-19 12:05:33 +02:00
Michael Kamensky
cc0d4eedfd Merge branch 'pwcombat' into 'master'
Smarter check for AI if specific attacker should go for PW

See merge request core-developers/forge!5585
2021-10-19 04:05:05 +00:00
Michael Kamensky
30416e87ab Merge branch 'fix' into 'master'
Dragon's Fire tweaks

See merge request core-developers/forge!5586
2021-10-19 04:04:57 +00:00
Northmoc
15a3d1ee9d dragons_fire.txt streamline 2021-10-18 18:53:08 -04:00
Northmoc
e6823049c5 will_the_wise.txt 2021-10-18 18:42:57 -04:00
Northmoc
c1df6ddf87 max_the_daredevil.txt 2021-10-18 18:20:10 -04:00
Northmoc
cbaf707822 lucas add AI hint 2021-10-18 18:15:24 -04:00
tool4EvEr
baf89b344c Update script 2021-10-18 22:39:11 +02:00
tool4EvEr
3653b800a4 Multiplayer improvements 2021-10-18 22:15:53 +02:00
tool4EvEr
ae68e6b9b2 Clean up 2021-10-18 22:00:23 +02:00
Michael Kamensky
ff43491d07 Merge branch 'reusable-costs-ai-fix' into 'master'
Improve Clay Golem AI behavior, switch CostFlipCoin/CostRollDice to being reusable.

See merge request core-developers/forge!5582
2021-10-18 16:27:43 +00:00
Michael Kamensky
33566c037c Merge branch 'gauntletfix' into 'master'
Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583
2021-10-18 16:27:26 +00:00
Northmoc
d095dc7156 InvestigateEffect - support Optional and RememberInvestigatingPlayers 2021-10-18 10:33:21 -04:00
Northmoc
e29407d868 lucas_the_sharpshooter.txt 2021-10-18 10:00:43 -04:00
TRT
5b72d1f682 Fix some more NPE related to gauntlets 2021-10-18 15:26:09 +02:00
Michael Kamensky
4644305733 - Switch CostFlipCoin and CostRollDice to being reusable.
- Somewhat improve the AI behavior for Clay Golem.
2021-10-18 16:22:33 +03:00
Northmoc
338465889a mike_the_dungeon_master.txt 2021-10-18 07:58:02 -04:00
Northmoc
631c9c671d chief_jim_hopper.txt 2021-10-18 07:58:02 -04:00
Northmoc
75e66f9469 dustin_gadget_genius.txt 2021-10-18 07:58:02 -04:00
Northmoc
8a52de252f eleven_the_mage.txt 2021-10-18 07:58:02 -04:00
Northmoc
80171918dd initial Friends forever 2021-10-18 07:58:01 -04:00
Northmoc
c641f6950c mind_flayer_the_shadow.txt 2021-10-18 07:58:01 -04:00
TRT
501d5501db Fix Master of the Wild Hunt 2021-10-18 12:01:43 +02:00
John Williams
487956ec2c Update Year of the Ox 2021.txt 2021-10-18 08:39:08 +00:00
tool4EvEr
c6bf9e3c6d Clean up 2021-10-18 10:21:28 +02:00
Churrufli
d3eabbd1d5 Update net-decks-archive-pauper.txt 2021-10-17 23:05:44 +00:00
Churrufli
2f8aaab41e Net Decks Archive Updates 2021-10-18 00:03:11 +02:00
Michael Kamensky
1f0e7f7348 Merge branch 'vulns' into 'master'
update to fix known vulnerabilities

See merge request core-developers/forge!5576
2021-10-17 13:49:21 +00:00
Bug Hunter
afae48e04e Update forge-gui/res/cardsfolder/v/volition_reins.txt 2021-10-17 10:40:17 +00:00
Jamin W. Collins
859c170e75 update to fix known vulnerabilities
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569178
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569179
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569180
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569181
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569182
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569183
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569185
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569186
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569187
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569189
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569190
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569191
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569176
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569177
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1294540
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088338
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088336
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088337
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088335
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088334
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088332
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088331
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088330
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088333
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088329
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1088328
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1051966
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1051967
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1040458
* https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-456705

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2021-10-16 20:37:38 -07:00
Jamin W. Collins
4f6096bd3a update to fix known vulnerabilities
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-567761
* https://snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-31409

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2021-10-16 20:34:42 -07:00
Michael Kamensky
a3385b2430 Merge branch 'johnwilliams7-master-patch-65807' into 'master'
Pioneer Challenge Decks 2021 Promos

See merge request core-developers/forge!5574
2021-10-17 03:14:55 +00:00
tool4EvEr
18eace5fbb Fix card 2021-10-16 23:33:31 +02:00
tool4EvEr
654e671afb Clean up 2021-10-16 23:16:32 +02:00
tool4EvEr
1a1088399e Cleanup 2021-10-16 21:34:12 +02:00
John Williams
e00faa8ffc Add new file 2021-10-16 19:29:45 +00:00
Michael Kamensky
e69cf66ec8 Revert "Merge branch 'adventure' into 'master'"
This reverts merge request !5318
2021-10-16 18:09:31 +00:00
Andreas Bendel
5a9fea3f55 Update de-DE.properties
translation #VStatisticsImporter
2021-10-16 16:57:12 +00:00
Michael Kamensky
87521416b2 Merge branch 'deck-importer-decks-file-format' into 'master'
NEW Deck Importer

See merge request core-developers/forge!5296
2021-10-16 16:47:29 +00:00
Michael Kamensky
c89c0181d3 Merge branch 'adventure' into 'master'
Add Adventure mode

See merge request core-developers/forge!5318
2021-10-16 16:47:21 +00:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 2021-10-16 18:52:12 +03:00
Michael Kamensky
8653d97081 - Rudimentary Announcements update, part 2 2021-10-16 18:46:10 +03:00
Michael Kamensky
0c998f971b - Rudimentary Announcements update. 2021-10-16 18:44:11 +03:00
Michael Kamensky
dcb398f195 - Migrate Upcoming (MID/MIC) 2021-10-16 18:40:22 +03:00
John Williams
804c1c2961 Update Resale Promos.txt 2021-10-16 09:53:09 +00:00
leriomaggio
eb7f3d75c3 Restored FDeckImportDialog mobile translation entries
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-16 08:24:49 +01:00
leriomaggio
8b58f6caa2 Restored FDeckImportDialog mobile translation entries
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-16 08:12:16 +01:00
leriomaggio
7c386b5ddf Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 00:47:30 +01:00
leriomaggio
ef03ea37d8 Finalised full Italian Translation for DeckImport
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-16 00:47:10 +01:00