Skip to content

Commit

Permalink
Merge pull request #4018 from xBlackTalonX/fix#3978-buildingplan-filt…
Browse files Browse the repository at this point in the history
…er-editor-hotkey-conflict

Fix #3978 buildingplan filter editor hotkey conflict
  • Loading branch information
myk002 authored Nov 14, 2023
2 parents a9f5c99 + 2f15d25 commit 3cf9ff7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/lua/buildingplan/filterselection.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
},
Expand Down

0 comments on commit 3cf9ff7

Please sign in to comment.