v1.54.6 merge

- omni-key consistency improvements (inventory pixel-check is now mandatory)
- fixes: cheat-sheets, item-info class-specific highlighting, map-info magic monsters
- item-info: improved ilvl detection for mods, changed highlighting

Lailloken UI.ahk

@@ -4,7 +4,7 @@
 #InstallKeybdHook
 #InstallMouseHook
 #Hotstring NoMouse
-#Hotstring EndChars `n
+#UseHook
 #MaxThreads 255
 #MaxMem 1024
 #Include %A_ScriptDir%
@@ -826,7 +826,7 @@ Loop_main()
 	{
 		If vars.general.wMouse && vars.hwnd.LLK_panel.main && !WinExist("ahk_id " vars.hwnd.LLK_panel.main) && LLK_IsBetween(vars.general.xMouse, vars.toolbar.x, vars.toolbar.x2) && LLK_IsBetween(vars.general.yMouse, vars.toolbar.y, vars.toolbar.y2)
 			LLK_Overlay(vars.hwnd.LLK_panel.main, "show")
-		Else If !vars.toolbar.drag && !GetKeyState(settings.hotkeys.tab, "P") && WinExist("ahk_id " vars.hwnd.LLK_panel.main) && !(LLK_IsBetween(vars.general.xMouse, vars.toolbar.x, vars.toolbar.x2) && LLK_IsBetween(vars.general.yMouse, vars.toolbar.y, vars.toolbar.y2))
+		Else If !vars.toolbar.drag && !GetKeyState(vars.hotkeys.tab, "P") && WinExist("ahk_id " vars.hwnd.LLK_panel.main) && !(LLK_IsBetween(vars.general.xMouse, vars.toolbar.x, vars.toolbar.x2) && LLK_IsBetween(vars.general.yMouse, vars.toolbar.y, vars.toolbar.y2))
 			LLK_Overlay(vars.hwnd.LLK_panel.main, "hide")
 	}
 

data/changelog.json

@@ -1,4 +1,10 @@
 [
+  [
+	["1.54.6", 15406],
+	"omni-key consistency improvements (inventory pixel-check is now mandatory)",
+	"fixes: cheat-sheets, item-info class-specific highlighting, map-info magic monsters",
+	"item-info: improved ilvl detection for mods, changed highlighting"
+  ],
   [
 	["1.54.5", 15405],
 	"item-info: added support for new item bases, recalibrated base-info percentages",

data/english/map-info.txt

@@ -480,9 +480,9 @@ type	=	area
 text	=	rogue exiles: +
 ID	=	078
 
-[# more magic monsters]
+[# increased magic monsters]
 type	=	monsters
-text	=	more magic: %
+text	=	magic: +%
 ID	=	079
 
 [area contains two unique bosses]