Rel 1 15 dev merge #4907
Rel 1 15 dev merge #4907
Conversation
It's meant to be run off-thread, so use `.execute()` instead of `.run()`.
…information Do not run the InfoTextSwingWorker on the EDT thread
Swap gridHorizontalHex.svg and gridVerticalHex.svg as they were backwards
…ect-hex-grid-icons Swap hex grid icons in Rod's theme
Fix themes, default property sets not being installed correctly
Fix Mac OS Intel Build
hasLightSource & Campaign Panel drag-drop bug fix
The dialogs were unstylish and intrusive, constantly stealing focus for no reason. While the glass pane does not mention the specific interfaces being scanned, they will be located in the logs in case it ever matters.
…nterfaces Reduce number of interfaces scanned for UPnP gateways
cwisniew
added
the
ignore-for-release-note
|
Commmit bd6f2ef hast so many changes that I can't tell if they are correct as I wasn't really involved in 1.15. I'm not sure if changes that @kwvanderlinde did are undone with it. |
Yeah I just had a look, git has made an absolute mess of the merge. Sadly it looks like we are going to have to go through all the changes in 1.15 and re do them (ugh) |
|
That'll be due to the accidental merge of develop in to release-1.15 (cf937da) and the subsequent revert. We should undo that to avoid any future headaches. I.e., reset
I'd be happy to do it if you'd like to avoid the tedium. |
Identify the Bug or Feature request
Merge 1.15 branch back into develop
This change is