diff --git a/modules/corelib/ui/uicombobox.lua b/modules/corelib/ui/uicombobox.lua index 37d92a76..f6c94e9a 100644 --- a/modules/corelib/ui/uicombobox.lua +++ b/modules/corelib/ui/uicombobox.lua @@ -28,6 +28,10 @@ function UIComboBox:getOption(text) end end +function UIComboBox:setOption(text, dontSignal) + self:setCurrentOption(text, dontSignal) +end + function UIComboBox:setCurrentOption(text, dontSignal) if not self.options then return end for i,v in ipairs(self.options) do diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua index 8cbeca96..b0379680 100644 --- a/modules/game_interface/gameinterface.lua +++ b/modules/game_interface/gameinterface.lua @@ -433,7 +433,11 @@ function addMenuHook(category, name, callback, condition, shortcut) end function removeMenuHook(category, name) - hookedMenuOptions[category][name] = nil + if not name then + hookedMenuOptions[category] = {} + else + hookedMenuOptions[category][name] = nil + end end function createThingMenu(menuPosition, lookThing, useThing, creatureThing) diff --git a/modules/game_interface/styles/countwindow.otui b/modules/game_interface/styles/countwindow.otui index 15604604..6cef1341 100644 --- a/modules/game_interface/styles/countwindow.otui +++ b/modules/game_interface/styles/countwindow.otui @@ -1,7 +1,7 @@ CountWindow < MainWindow id: countWindow !text: tr('Move Stackable Item') - size: 196 80 + size: 196 90 SpinBox id: spinBox diff --git a/modules/gamelib/game.lua b/modules/gamelib/game.lua index 98c7e974..eb0188f6 100644 --- a/modules/gamelib/game.lua +++ b/modules/gamelib/game.lua @@ -48,18 +48,25 @@ end function g_game.getSupportedClients() return { - 740, 760, 770, 772, + 740, 741, 750, 760, 770, 772, 780, 781, 782, 790, 792, - 800, 810, 811, 840, 842, 850, - 853, 854, 860, 861, 862, 870, + 800, 810, 811, 820, 821, 822, + 830, 831, 840, 842, 850, 853, + 854, 855, 857, 860, 861, 862, + 870, 871, - 910, 940, 944, 953, 954, 960, 961, - 963, 970, 972, 973, 980, 981, 982, - 983, 984, 985, 986, + 900, 910, 920, 931, 940, 943, + 944, 951, 952, 953, 954, 960, + 961, 963, 970, 971, 972, 973, + 980, 981, 982, 983, 984, 985, + 986, - 1001, 1002, 1010, 1020, 1021, 1022, 1031, - 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041 + 1000, 1001, 1002, 1010, 1011, + 1012, 1013, 1020, 1021, 1022, + 1030, 1031, 1032, 1033, 1034, + 1035, 1036, 1037, 1038, 1039, + 1040, 1041 } end