Merge remote-tracking branch 'Putnam3145/patch-20' into develop

develop
lethosor 2015-06-15 13:06:39 -04:00
commit 4e391603f5
3 changed files with 5 additions and 4 deletions

@ -30,6 +30,7 @@ DFHack Future
dwarfmonitor widgets' positions, formats, etc. are now customizable (see Readme)
dwarfmonitor weather display now separated from the date display
gui/gm-editor: Pointers can now be displaced
gui/hack-wish: renamed to gui/create-item
"keybinding list" accepts a context
nyan: Can now be stopped with dfhack-run
quicksave: Restricted to fortress mode

@ -2254,7 +2254,7 @@ gui/*
Scripts that implement dialogs inserted into the main game window are put in this
directory.
* gui/hack-wish
* gui/create-item
A graphical interface for creating items.

@ -1,5 +1,5 @@
-- hack-wish.lua
-- Allows for script-based wishing.
-- create-item.lua
-- A gui-based item creation script.
-- author Putnam
-- edited by expwnent
@ -235,7 +235,7 @@ if not args.startup then
if unit then
hackWish(unit)
else
qerror('A unit needs to be selected to use hackwish.')
qerror('A unit needs to be selected to use gui/create-item.')
end
else
eventful.onReactionComplete.hackWishP=function(reaction,unit,input_items,input_reagents,output_items,call_native)