Commit Graph

16315 Commits

Author SHA1 Message Date
klaxnek
17e13d1b47 Update es-ES.properties 2021-03-09 08:55:42 +00:00
Anthony Calosa
275ea61129 Update skinsList.txt 2021-03-08 22:25:25 +00:00
Adam Pantel
8d14f9ff39 Fix some bad replacements from the References change 2021-03-08 11:38:52 -05:00
Michael Kamensky
7fe38f8dfa Merge branch 'master' into 'master'
Torrent of Lava and other fixes

See merge request core-developers/forge!4136
2021-03-08 14:07:46 +00:00
John
fff8e4d065 Update Guilds of Ravnica Promos.txt 2021-03-08 10:53:31 +00:00
Michael Kamensky
5625c9ae28 Merge branch 'improve-edition-tracking' into 'master'
Improve editions for tracking scripts

See merge request core-developers/forge!4144
2021-03-08 04:16:40 +00:00
Michael Kamensky
0969645033 Merge branch 'card-fixes' into 'master'
Card fixes

Closes #1763

See merge request core-developers/forge!4142
2021-03-08 04:15:31 +00:00
Michael Kamensky
f349da99d8 Merge branch 'unset-cards' into 'master'
[Un-cards] Minigame cards

See merge request core-developers/forge!4141
2021-03-08 04:11:19 +00:00
Michael Kamensky
37b66bf074 Merge branch 'master' into 'master'
[Un-cards] Kharis & The Beholder

See merge request core-developers/forge!4140
2021-03-08 04:10:37 +00:00
Adam Pantel
3c70759ab1 Card fixes 2021-03-07 22:56:54 -05:00
CCTV-1
c517d8712d fix missing simplified chinese translations 2021-03-08 11:47:28 +08:00
friarsol
21f2395089 Improve editions for tracking scripts 2021-03-07 22:29:17 -05:00
Adam Pantel
aa866eb42f Add notifications to minigame cards 2021-03-07 19:07:05 -05:00
Adam Pantel
dcda2ade1d [Un-cards] Minigame cards 2021-03-07 17:26:36 -05:00
Lykrast
1928759ff9 Fix 11 result misread 2021-03-07 22:18:47 +00:00
Lykrast
d467e7b7f4 Kharis & The Beholder 2021-03-07 21:51:06 +00:00
Michael Kamensky
f97c3e06ad Merge branch 'master' into 'master'
Fix a variety of Roll Dice card- and AI-related issues, improve AI for AF RollDice

See merge request core-developers/forge!4138
2021-03-07 17:08:33 +00:00
Michael Kamensky
2eefa72494 - Fix a variety of issues with "Roll dice" silver-bordered cards
- Add some additional AI to RollDiceAi
- Fix NeedsToPlay(Var) not being properly enforced for lands
- Minor other tweaks/fixes.
2021-03-07 20:07:05 +03:00
Michael Kamensky
60f79e90a7 Merge branch 'master' into 'master'
Added an AI hint for Jirina Kudro

See merge request core-developers/forge!4137
2021-03-07 14:41:08 +00:00
Michael Kamensky
1da63ef83e - Added an AI hint for Jirina Kudro 2021-03-07 17:40:37 +03:00
Hythonia
a13d8ec83b Reap Intellect 2021-03-07 15:25:32 +01:00
Hythonia
ecff4f02a3 Miscellaneous fixes and adjustments 2021-03-07 15:22:09 +01:00
Bug Hunter
a8c01b4487 Merge branch 'fixhead' into 'master'
Fix Elite Headhunter cost

See merge request core-developers/forge!4134
2021-03-07 10:10:53 +00:00
tool4EvEr
f466fd690b Fix Elite Headhunter cost 2021-03-07 11:10:32 +01:00
Anthony Calosa
e8046e0483 fix Time Spiral Remastered promo 2021-03-07 09:52:37 +00:00
Adam Pantel
fd44c9745d Remove References$ from scripts 2021-03-07 00:39:14 -05:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 2021-03-07 08:00:30 +03:00
Michael Kamensky
73a6d65118 - Update ANNOUNCEMENTS.txt
- Rename a method in ChangeZoneAi
2021-03-07 07:42:48 +03:00
Michael Kamensky
8cff34e488 Merge branch 'unset-cards' into 'master'
[Un-cards] DeckLimit keyword + Cardboard Carapace

See merge request core-developers/forge!4127
2021-03-07 04:34:27 +00:00
Michael Kamensky
1efda3f97b Merge branch 'pcel' into 'master'
[Un-cards] PCEL

See merge request core-developers/forge!4129
2021-03-07 04:33:06 +00:00
Michael Kamensky
04e25abdc6 Update shichifukujin_dragon.txt 2021-03-07 04:32:33 +00:00
Michael Kamensky
8d025dffbf Update robot_chicken.txt [AI hint] 2021-03-07 04:31:38 +00:00
Michael Kamensky
df17c3a31b Merge branch 'master' into 'master'
[Desktop] update ImageView for Decks

See merge request core-developers/forge!4128
2021-03-07 04:28:46 +00:00
Adam Pantel
41cae28145 [Un-cards] PCEL 2021-03-06 23:16:58 -05:00
Anthony Calosa
e73f117037 [Desktop] update ImageView for Decks 2021-03-07 08:39:12 +08:00
John
92ca4f2dc6 Update Time Spiral Remastered.txt 2021-03-06 21:21:18 +00:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00
John
5123b1d434 Update Time Spiral Remastered.txt 2021-03-06 20:21:03 +00:00
John
96dfc7425e Update Time Spiral Remastered.txt 2021-03-06 20:15:01 +00:00
John
05e8afdeb2 Update Time Spiral Remastered.txt 2021-03-06 20:03:02 +00:00
John
6f50a0520b Update blocks.txt 2021-03-06 19:44:37 +00:00
John
f30689ff4a Add new file 2021-03-06 19:40:46 +00:00
John
db9af67f33 Add new file 2021-03-06 18:12:59 +00:00
Michael Kamensky
671aca556a Merge branch 'fixEphara' into 'master'
Ephara, God of the Polis: fix card drawing for opponent

See merge request core-developers/forge!4123
2021-03-06 12:37:59 +00:00
tool4EvEr
f46e96170a Fix card drawing for opponent 2021-03-06 13:02:52 +01:00
Michael Kamensky
5decca1571 Merge branch 'master' into 'master'
[Un-cards] Mine, Mine, Mine!

See merge request core-developers/forge!4122
2021-03-06 11:09:29 +00:00
Hythonia
67e532534d Merge remote-tracking branch 'origin/master' 2021-03-06 12:03:09 +01:00
Hythonia
849c1faaff ULG: Mine, Mine, Mine! 2021-03-06 12:02:38 +01:00
Michael Kamensky
398d4220dc Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!4117
2021-03-06 09:56:20 +00:00