Northmoc
a99d0391d3
geistwave.txt
2021-09-16 07:42:41 -04:00
Northmoc
8aec7e6492
duel_for_dominance.txt
2021-09-16 07:41:58 -04:00
Northmoc
4684dca5f5
keyword stringbuilder tweaks
2021-09-16 07:40:56 -04:00
Hans Mackowiak
603fdec980
Merge branch 'sac' into 'master'
...
SacrificedThisTurn: switch to List
See merge request core-developers/forge!5371
2021-09-16 09:11:10 +00:00
TRT
baee7c605e
SacrificedThisTurn: switch to List
2021-09-16 10:11:41 +02:00
Michael Kamensky
6492ff4e62
Merge branch 'counters_sb' into 'master'
...
CountersPutEffect – improve Stack Description string builder
See merge request core-developers/forge!5364
2021-09-16 04:25:45 +00:00
Michael Kamensky
7f9c65ca51
Merge branch 'mid_15' into 'master'
...
MID - 15 Sep
See merge request core-developers/forge!5369
2021-09-16 04:25:05 +00:00
Michael Kamensky
e67722adef
Merge branch 'fix-foil-crash' into 'master'
...
Fix quest foil crash
See merge request core-developers/forge!5370
2021-09-16 04:24:35 +00:00
friarsol
74688f2a40
I think this fixes quest foil crash
2021-09-15 20:46:53 -04:00
Northmoc
45ac11a34a
curse_of_surveillance.txt + new PlayerProperty
2021-09-15 19:52:18 -04:00
Northmoc
5e4d174bb3
mystic_skull_mystic_monstrosity.txt
2021-09-15 19:52:17 -04:00
Northmoc
652ba57ac3
diregraf_horde.txt
2021-09-15 19:52:16 -04:00
Northmoc
c0fabf3528
dryads_revival.txt
2021-09-15 19:52:16 -04:00
Northmoc
0b4df8c859
remove unneeded and tidy up a few more lines
2021-09-15 17:10:38 -04:00
Michael Kamensky
9deb569764
Merge branch 'mid_15' into 'master'
...
MID - 15 Sep
See merge request core-developers/forge!5365
2021-09-15 18:33:12 +00:00
Michael Kamensky
30e8327dd5
Merge branch 'formats_update' into 'master'
...
MID formats update
See merge request core-developers/forge!5368
2021-09-15 18:32:56 +00:00
Michael Kamensky
ae75b54ade
Merge branch 'MID_MIC_cards' into 'master'
...
MIC/MID cards 15 Sep
See merge request core-developers/forge!5366
2021-09-15 18:32:29 +00:00
Northmoc
559dd9581e
mask_of_griselbrand.txt add AI hint
2021-09-15 13:48:15 -04:00
Northmoc
9447230406
mask_of_griselbrand.txt
2021-09-15 13:47:39 -04:00
Northmoc
beecd0eb4e
clean up unicycle.txt
2021-09-15 13:47:06 -04:00
Northmoc
489062390b
normalize "*+" for Consuming Blob and token
2021-09-15 13:32:32 -04:00
Northmoc
38934bfce4
consuming_blob.txt and token
2021-09-15 13:32:03 -04:00
paul_snoops
97585b37a1
fixes
2021-09-15 18:15:17 +01:00
paul_snoops
44ab79ae80
MID formats update
2021-09-15 17:53:03 +01:00
Northmoc
eb72996822
rise_of_the_ants.txt and token
2021-09-15 12:49:22 -04:00
paul_snoops
44fa10eeff
MIC/MID cards 15 Sep
2021-09-15 15:05:46 +01:00
Michael Kamensky
98301b0113
Merge branch 'patch-cardpicture-panel-image-copy-from-subimage' into 'master'
...
Patch to CardPicturePanel to work on cropped Card Images
See merge request core-developers/forge!5362
2021-09-15 13:08:01 +00:00
Bug Hunter
29ea9e2d7b
Merge branch 'typo' into 'master'
...
gargantuan_gorilla.txt cleanup
See merge request core-developers/forge!5363
2021-09-15 11:35:03 +00:00
Northmoc
9f5e90cff1
ritual_of_hope.txt
2021-09-15 07:17:21 -04:00
Northmoc
84cbc4c078
gargantuan_gorilla.txt cleanup
2021-09-15 07:14:51 -04:00
Northmoc
fdd3a8fdf3
improve StackDesc sb
2021-09-15 07:11:33 -04:00
leriomaggio
62bd8efd1c
Patch to CardPicturePanel to work on cropped Card Images
...
BufferedImage (deep) copy procedure applied in CardPicturePanel may not always work when the input image has been originally cropped.
The issue is caused by `image.copyData(null)` which may sometimes work on the original (uncropped) underlying raster.
This patch fixes this issue!
Source: https://stackoverflow.com/a/26894825/2969461
2021-09-15 11:46:22 +01:00
Michael Kamensky
16612a8c7a
Merge branch 'MIC_edition' into 'master'
...
MIC edition update
See merge request core-developers/forge!5361
2021-09-15 10:19:20 +00:00
paul_snoops
657ff62583
MIC edition update
2021-09-15 08:46:06 +01:00
Michael Kamensky
ea5b9d9bc0
Merge branch 'mid_14' into 'master'
...
MID – 14 Sep
See merge request core-developers/forge!5360
2021-09-15 04:31:48 +00:00
Northmoc
5efb43c22e
siphon_insight.txt
2021-09-14 17:19:08 -04:00
Northmoc
d2b7bd7101
dire_strain_rampage.txt
2021-09-14 17:18:36 -04:00
Michael Kamensky
c7c6343d67
Merge branch 'mid_14' into 'master'
...
MID - 14 Sep
See merge request core-developers/forge!5357
2021-09-14 20:29:27 +00:00
Michael Kamensky
8d5517ecff
Merge branch 'TRT-master-patch-24147' into 'master'
...
Update forge-gui/res/cardsfolder/p/pirs_whim.txt
See merge request core-developers/forge!5358
2021-09-14 20:29:24 +00:00
Michael Kamensky
eb290dd4a9
Merge branch 'pump_sb' into 'master'
...
Pump auto stackdescription sb improvements
See merge request core-developers/forge!5359
2021-09-14 20:28:53 +00:00
Michael Kamensky
69f560d25f
Merge branch 'MID_cards' into 'master'
...
MID 13 Sep
See merge request core-developers/forge!5346
2021-09-14 20:28:37 +00:00
paul_snoops
d5fa07ebe4
delete blessed_defiance.txt for another MR once working
2021-09-14 21:21:33 +01:00
paul_snoops
991b0783b8
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
8089224fe7
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
521dcdca75
fixes
2021-09-14 21:19:47 +01:00
paul_snoops
76fd4a754d
MID 13 Sep
2021-09-14 21:19:46 +01:00
Bug Hunter
a82bb3b075
Merge branch 'moonveil' into 'master'
...
MID: Moonveil Regent
See merge request core-developers/forge!5353
2021-09-14 17:57:20 +00:00
Northmoc
cac9d8fbf0
moonveil_regent.txt
2021-09-14 13:52:34 -04:00
Northmoc
1c6a460d93
corrections for 1 or 2 keywords
2021-09-14 13:41:58 -04:00
Northmoc
32a14fa82a
Pump auto stackdescription sb improvements
2021-09-14 13:25:17 -04:00
