Michael Kamensky
|
b317e46353
|
Merge branch 'NPEfix' into 'master'
Fix some payment NPE
See merge request core-developers/forge!6412
|
2022-03-18 17:53:53 +00:00 |
|
tool4EvEr
|
0d009ad982
|
Fix NPE if PW gets removed
|
2022-03-18 18:34:08 +01:00 |
|
TRT
|
469ada0e4c
|
Fix some payment NPE
|
2022-03-18 11:55:21 +01:00 |
|
Michael Kamensky
|
e1bec2013d
|
Merge branch 'y22_kamigawa_edition' into 'master'
Alchemy: Kamigawa Edition file and "Y22" set code fix
See merge request core-developers/forge!6411
|
2022-03-18 10:44:40 +00:00 |
|
Michael Kamensky
|
e0e625ae3e
|
Merge branch 'a22_17' into 'master'
A22 digital-only cards: 17 Mar
See merge request core-developers/forge!6410
|
2022-03-18 10:44:07 +00:00 |
|
Tim Mocny
|
927b38907e
|
A22 digital-only cards: 17 Mar
|
2022-03-18 10:44:06 +00:00 |
|
Michael Kamensky
|
cea6d9fbe8
|
Merge branch 'intense' into 'master'
Y22/J21: Implement Intensity mechanic
See merge request core-developers/forge!6408
|
2022-03-18 10:43:15 +00:00 |
|
Tim Mocny
|
a280a46ffd
|
Y22/J21: Implement Intensity mechanic
|
2022-03-18 10:43:06 +00:00 |
|
paul_snoops
|
f1e8197c6b
|
Alchemy: Kamigawa Edition file and "Y22" set code fix
|
2022-03-18 08:10:38 +00:00 |
|
Michael Kamensky
|
352649b0a8
|
Merge branch 'y22_kamigawa_16_march' into 'master'
Alchemy: Kamigawa - 16 March
See merge request core-developers/forge!6405
|
2022-03-17 17:10:19 +00:00 |
|
Michael Kamensky
|
f7e17d5a0e
|
Merge branch 'BrazilianPortugueseTranslate' into 'master'
Add Brazilian Portuguese Language
See merge request core-developers/forge!6404
|
2022-03-17 17:09:27 +00:00 |
|
Bug Hunter
|
11bb906932
|
Merge branch 'fixes' into 'master'
RestartGame tweak + AI NPE from card changes
See merge request core-developers/forge!6409
|
2022-03-17 13:14:59 +00:00 |
|
TRT
|
8937d5a97d
|
fix RestartGame corner case + AI NPE from card changes
|
2022-03-17 14:13:11 +01:00 |
|
Paul Hammerton
|
f5fbdfafd6
|
Update artillery_enthusiast.txt
|
2022-03-17 11:43:21 +00:00 |
|
Paul Hammerton
|
f1bdebbc33
|
Update artillery_enthusiast.txt
|
2022-03-17 11:41:50 +00:00 |
|
Michael Kamensky
|
86c19ec592
|
Merge branch 'neostandardmeta' into 'master'
archetype NEO
See merge request core-developers/forge!6406
|
2022-03-17 08:21:05 +00:00 |
|
Michael Kamensky
|
6027d060ea
|
Merge branch 'chosd' into 'master'
More changeHiddenOriginStackDescription tweaks
See merge request core-developers/forge!6407
|
2022-03-17 08:20:25 +00:00 |
|
Tim Mocny
|
661a1ff43a
|
More changeHiddenOriginStackDescription tweaks
|
2022-03-17 08:20:24 +00:00 |
|
Michael Kamensky
|
ddc00f68fe
|
Merge branch 'combatAI' into 'master'
Improve notNeededAsBlockers
See merge request core-developers/forge!6398
|
2022-03-17 08:18:58 +00:00 |
|
Bug Hunter
|
b668e1e618
|
Improve notNeededAsBlockers
|
2022-03-17 08:18:51 +00:00 |
|
austinio7116
|
0d375e24d8
|
archetype NEO
|
2022-03-16 23:08:31 +00:00 |
|
paul_snoops
|
a6d8b3eb5d
|
Alchemy: Kamigawa - 16 March
|
2022-03-16 21:41:18 +00:00 |
|
Victor Gonçalves
|
45901071f1
|
Merge remote-tracking branch 'upstream/master' into BrazilianPortugueseTranslate
|
2022-03-16 17:59:02 -03:00 |
|
Victor Gonçalves
|
2f2ffe739c
|
Add Brazilian Portuguese Language
pt-BR.properties file created using crowdin: https://crowdin.com/project/forge-pt-br
cardnames-pt-BR.txt file created using cardnamesTranslations.py
|
2022-03-16 17:52:44 -03:00 |
|
Michael Kamensky
|
c2683878c9
|
Merge branch 'booster' into 'master'
Avoid Alchemy cards showing up in regular boosters/sealed
See merge request core-developers/forge!6402
|
2022-03-16 15:00:47 +00:00 |
|
Tim Mocny
|
283c35ef17
|
Avoid Alchemy cards showing up in regular boosters/sealed
|
2022-03-16 15:00:47 +00:00 |
|
Michael Kamensky
|
34d8bea423
|
Merge branch 'wargate' into 'master'
ChangeZoneEffect changeHiddenOriginStackDescription tweaks
See merge request core-developers/forge!6401
|
2022-03-16 15:00:10 +00:00 |
|
Tim Mocny
|
bdb43026fb
|
ChangeZoneEffect changeHiddenOriginStackDescription tweaks
|
2022-03-16 15:00:09 +00:00 |
|
Michael Kamensky
|
a7e89422b0
|
Merge branch 'y22_fixes' into 'master'
Card fixes
See merge request core-developers/forge!6400
|
2022-03-16 14:59:13 +00:00 |
|
Michael Kamensky
|
3b3ed75ca3
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!6403
|
2022-03-16 14:58:39 +00:00 |
|
CCTV-1
|
9165f1e57d
|
translate new settings.
|
2022-03-16 18:49:19 +08:00 |
|
paul_snoops
|
10c73bbf63
|
Card fixes
|
2022-03-15 14:49:32 +00:00 |
|
Michael Kamensky
|
3b5a045a2c
|
Merge branch 'y22_kamigawa_15_march' into 'master'
Alchemy: Kamigawa - 15 March
See merge request core-developers/forge!6399
|
2022-03-15 10:22:46 +00:00 |
|
paul_snoops
|
e9973d8df8
|
Alchemy: Kamigawa - 15 March
|
2022-03-15 09:54:00 +00:00 |
|
Michael Kamensky
|
76c07a9963
|
Merge branch '1111-dismantle-rework' into 'master'
Resolve "Dismantle Rework"
Closes #2092 and #1111
See merge request core-developers/forge!6354
|
2022-03-14 13:32:50 +00:00 |
|
Michael Kamensky
|
4b566dd118
|
Merge branch 'master' into 'master'
Net Decks Archive Updates
See merge request core-developers/forge!6396
|
2022-03-14 12:52:56 +00:00 |
|
Michael Kamensky
|
cd2df4362b
|
Merge branch 'y22_kamigawa_14_march' into 'master'
Alchemy: Kamigawa - 14 March
See merge request core-developers/forge!6397
|
2022-03-14 12:52:40 +00:00 |
|
paul_snoops
|
08b989f137
|
Mothrider Cavalry
|
2022-03-14 12:36:07 +00:00 |
|
paul_snoops
|
a45dcc98b1
|
Foundry Beetle
|
2022-03-14 12:16:55 +00:00 |
|
paul_snoops
|
9e792e6f46
|
kami of bamboo deckhas
|
2022-03-14 11:14:25 +00:00 |
|
paul_snoops
|
60382a6792
|
Alchemy: Kamigawa - 14 March
|
2022-03-14 11:12:59 +00:00 |
|
Churrufli
|
4ed61d6c38
|
Net Decks Archive Updates
|
2022-03-14 09:22:14 +01:00 |
|
Anthony Calosa
|
3d6978875a
|
Merge branch 'NewMaster' into 'master'
update GameEventCardRegenerated
See merge request core-developers/forge!6395
|
2022-03-13 11:39:07 +00:00 |
|
Hans Mackowiak
|
2eb6b0d971
|
Update AiBlockController.java
|
2022-03-13 11:38:02 +00:00 |
|
Anthony Calosa
|
ffafa3ebf1
|
update GameEventCardRegenerated
|
2022-03-13 19:37:04 +08:00 |
|
Anthony Calosa
|
e4150746b7
|
Merge remote-tracking branch 'core/master'
|
2022-03-13 17:19:23 +08:00 |
|
Hans Mackowiak
|
b648c61e61
|
Merge branch 'diggig' into 'master'
DigEffects: do tapped before changeZone
See merge request core-developers/forge!6387
|
2022-03-13 09:09:18 +00:00 |
|
Bug Hunter
|
8bace43d05
|
DigEffects: do tapped before changeZone
|
2022-03-13 09:09:15 +00:00 |
|
Hans Mackowiak
|
18a9acfd47
|
CountersPutAI: fix NPE for chooseSingleCard on Dismantle
|
2022-03-13 09:19:16 +01:00 |
|
Anthony Calosa
|
c8ee21f79e
|
Merge remote-tracking branch 'core/master'
|
2022-03-13 13:51:35 +08:00 |
|