Merge pull request #4018 from xBlackTalonX/fix#3978-buildingplan-filter-editor-hotkey-conflict

Fix #3978 buildingplan filter editor hotkey conflict
develop
Myk 2023-11-13 19:05:55 -08:00 committed by GitHub
commit 3cf9ff7356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

@ -65,6 +65,7 @@ Template for new versions:
- `caravan`: price of vermin swarms correctly adjusted down. a stack of 10000 bees is worth 10, not 10000
- `sort`: when filtering out already-established temples in the location assignment screen, also filter out the "No specific deity" option if a non-denominational temple has already been established
- RemoteServer: continue to accept connections as long as the listening socket is valid instead of closing the socket after the first disconnect
- `buildingplan`: edit filter interface now uses ctrl-x to reset the filter to avoid conflict with increasing the filter's minimum quality (shift-x)
## Misc Improvements
- `buildingplan`: display how many items are available on the planner panel

@ -234,7 +234,7 @@ function QualityAndMaterialsPage:init()
frame={l=30, t=2},
label='Reset filter',
auto_width=true,
key='CUSTOM_SHIFT_X',
key='CUSTOM_CTRL_X',
on_activate=self:callback('clear_filter'),
},
},