Merge branch 'develop' into automelt

develop
eamondo2 2023-01-22 17:26:55 -05:00
commit d6c4f15e33
2 changed files with 7 additions and 7 deletions

@ -4,8 +4,8 @@
# temporarily overridden in the active session with the `quickfort set` command. # temporarily overridden in the active session with the `quickfort set` command.
# #
# If you have edited this file but want to revert to "factory defaults", delete # If you have edited this file but want to revert to "factory defaults", delete
# this file and a fresh one will be copied from # this file and a default one will be regenerated for you the next time you
# dfhack-config/default/quickfort/quickfort.txt the next time you start DFHack. # start DFHack.
# Directory tree to search for blueprints. Can be set to an absolute or relative # Directory tree to search for blueprints. Can be set to an absolute or relative
# path. If set to a relative path, resolves to a directory under the DF folder. # path. If set to a relative path, resolves to a directory under the DF folder.
@ -30,8 +30,8 @@ query_unsafe=false
# Set to the maximum number of resources you want assigned to stockpiles of the # Set to the maximum number of resources you want assigned to stockpiles of the
# relevant types. Set to -1 for DF defaults (number of stockpile tiles for # relevant types. Set to -1 for DF defaults (number of stockpile tiles for
# stockpiles that take barrels and bins, 1 wheelbarrow for stone stockpiles). # stockpiles that take barrels and bins, 1 wheelbarrow for stone stockpiles).
# The default here for wheelbarrows is 0 since using wheelbarrows normally # The default here for wheelbarrows is 0 since restricting stockpiles to a
# *decreases* the efficiency of your fort. # single wheelbarrow can drastically *decrease* the efficiency of your fort.
stockpiles_max_barrels=-1 stockpiles_max_barrels=-1
stockpiles_max_bins=-1 stockpiles_max_bins=-1
stockpiles_max_wheelbarrows=0 stockpiles_max_wheelbarrows=0

@ -218,9 +218,9 @@ end
function ListBox:onRenderFrame(dc,rect) function ListBox:onRenderFrame(dc,rect)
ListBox.super.onRenderFrame(self,dc,rect) ListBox.super.onRenderFrame(self,dc,rect)
if self.select2_hint then --if self.select2_hint then
dc:seek(rect.x1+2,rect.y2):key('SEC_SELECT'):string(': '..self.select2_hint,COLOR_GREY) -- dc:seek(rect.x1+2,rect.y2):key('SEC_SELECT'):string(': '..self.select2_hint,COLOR_GREY)
end --end
end end
function ListBox:getWantedFrameSize() function ListBox:getWantedFrameSize()