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 |
|
Anthony Calosa
|
a6de8df2ed
|
Merge branch 'NewMaster' into 'master'
[Adventure] add backdrop for Inn
See merge request core-developers/forge!6394
|
2022-03-13 05:49:34 +00:00 |
|
Anthony Calosa
|
11d4cd9f9d
|
Merge remote-tracking branch 'core/master'
|
2022-03-13 13:11:09 +08:00 |
|
Anthony Calosa
|
895e7034be
|
[Adventure] add backdrop for Inn
|
2022-03-13 13:05:49 +08:00 |
|
Michael Kamensky
|
bee2705cc5
|
Merge branch 'grenzo' into 'master'
changeHiddenOriginResolve: Fix default fallback
Closes #2114
See merge request core-developers/forge!6391
|
2022-03-13 04:25:58 +00:00 |
|
Bug Hunter
|
06d58604d6
|
changeHiddenOriginResolve: Fix default fallback
|
2022-03-13 04:25:53 +00:00 |
|
Michael Kamensky
|
6e5df41780
|
Merge branch 'master' into 'master'
Added NEO/NEC achievements by Marek14.
See merge request core-developers/forge!6393
|
2022-03-12 19:01:07 +00:00 |
|
Michael Kamensky
|
13f30b5e7d
|
- Added NEO/NEC achievements by Marek14.
|
2022-03-12 21:58:49 +03:00 |
|
Michael Kamensky
|
75ad123346
|
Merge branch 'TRT-master-patch-92800' into 'master'
Update forge-gui/res/cardsfolder/b/boon_of_boseiju.txt
Closes #2115
See merge request core-developers/forge!6392
|
2022-03-12 18:31:25 +00:00 |
|
Bug Hunter
|
76966aa981
|
Update forge-gui/res/cardsfolder/b/boon_of_boseiju.txt
|
2022-03-12 13:56:44 +00:00 |
|
Hans Mackowiak
|
917493b2af
|
AI: shortcut for chooseCounterType if there is only one
|
2022-03-12 12:44:01 +01:00 |
|
Anthony Calosa
|
610d0b9d99
|
Merge branch 'NewMaster' into 'master'
[Adventure] fix RewardScene label
See merge request core-developers/forge!6390
|
2022-03-12 08:49:47 +00:00 |
|
Anthony Calosa
|
56ec2b4952
|
[Adventure] fix RewardScene label
- hide gold label when RewardScene is not Shop type
|
2022-03-12 16:47:53 +08:00 |
|
Anthony Calosa
|
fdd320596c
|
Merge branch 'NewMaster' into 'master'
[Adventure] add market BG
See merge request core-developers/forge!6389
|
2022-03-12 06:11:22 +00:00 |
|
Anthony Calosa
|
8a0f2837d9
|
[Adventure] add market BG
|
2022-03-12 14:06:08 +08:00 |
|
Anthony Calosa
|
f4648c3460
|
Merge branch 'NewMaster' into 'master'
[Adventure] update RewardActor
See merge request core-developers/forge!6388
|
2022-03-12 05:10:52 +00:00 |
|
Anthony Calosa
|
03fc7209a8
|
[Adventure] update RewardActor
|
2022-03-12 13:07:34 +08:00 |
|
Michael Kamensky
|
22bf12f07b
|
Merge branch 'miscfix' into 'master'
ControlGain Lose fix
See merge request core-developers/forge!6379
|
2022-03-11 10:28:32 +00:00 |
|
Bug Hunter
|
01f397db9f
|
Merge branch 'TRT-master-patch-26275' into 'master'
Update forge-gui/res/cardsfolder/p/puffer_extract.txt
See merge request core-developers/forge!6386
|
2022-03-11 08:09:17 +00:00 |
|
Bug Hunter
|
66198604ab
|
Update forge-gui/res/cardsfolder/p/puffer_extract.txt
|
2022-03-11 08:08:48 +00:00 |
|
Anthony Calosa
|
931a1e91cd
|
Merge branch 'kevlahnota-master-patch-61149' into 'master'
unused imports
See merge request core-developers/forge!6385
|
2022-03-11 04:55:17 +00:00 |
|
Anthony Calosa
|
5315c90d24
|
unused imports
|
2022-03-11 04:55:00 +00:00 |
|
Anthony Calosa
|
a640b2bb3a
|
Merge branch 'master' into 'master'
[Adventure] Add Gold Indicator
See merge request core-developers/forge!6384
|
2022-03-11 04:50:42 +00:00 |
|
Anthony Calosa
|
4c518fad73
|
[Adventure] Add Gold Indicator
|
2022-03-11 12:49:12 +08:00 |
|
Anthony Calosa
|
74a2d247bc
|
Merge branch 'master' into 'master'
switch check
See merge request core-developers/forge!6383
|
2022-03-10 20:07:50 +00:00 |
|