Skip to content

Commit 6f3e697

Browse files
authored
Merge pull request #49 from Puresyn/development
Development
2 parents e355fd0 + 5c61bb9 commit 6f3e697

File tree

14 files changed

+325
-164
lines changed

14 files changed

+325
-164
lines changed

Core/Localization/Localization.koKR.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ L.INSTANCETIMER = "던전 정보"
8585
L.VAULTINFORMATION = "쐐기 주간보상(금고)"
8686
L.TIMELIMIT = "제한 시간"
8787
L.SEASON = "시즌"
88-
L.COMBATMESSAGE = { errormsg = "Key Master는 전투중 사용할 수 없습니다.", chatmsg = "The interface will open once you exit combat."}
88+
L.COMBATMESSAGE = { errormsg = "Key Master는 전투 중 사용할 수 없습니다.", chatmsg = "Key Master는 전투 중 사용할 수 없습니다." }
8989

9090
L.COMMANDLINE = {} -- translate whatever in this section would be standard of an addon in the language. i.e. /km show, /km XXXX, or /XX XXXX It will work just fine.
9191
L.COMMANDLINE["/km"] = { name = "/km", text = "/km"}

Core/UI/MainFrame.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ function MainInterface:CreateMainFrame()
3939
-- Closes Key Master whenever a spell is cast or an ability is used
4040
hooksecurefunc("CastSpellByName", function() hideOnEvent(mainFrame) end)
4141
hooksecurefunc("CastSpellByID", function() hideOnEvent(mainFrame) end)
42-
hooksecurefunc("UseAction", function() hideOnEvent(mainFrame) end)
42+
43+
--[[ Commented the following line out because it prevents /km to be used in a macro.
44+
May need to find a better solution if it becomes an issue. ]]
45+
--hooksecurefunc("UseAction", function() hideOnEvent(mainFrame) end)
46+
4347

4448
return mainFrame
4549
end

Core/UI/WhatsNew.lua

+5-11
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,14 @@ local function setWhatsNewContent(parent)
2626
<p>]]..KeyMasterLocals.DISPLAYVERSION..KM_AUTOVERSION.." "..KM_VERSION_STATUS..[[</p>
2727
<br/>
2828
<h2>|cff]]..h2Color..[[Updates:|r</h2>
29-
<p>Added a lock icon above dungeon maps in the party frame when a portal is not yet unlocked for you.</p>
29+
<p>Updated Ace3 libraries.</p>
3030
<br/>
31-
<p>Added Korean localization.</p>
31+
<p>Updated KR localization.</p>
3232
<br/>
33-
<h2>|cff]]..h2Color..[[Fixes:|r</h2>
34-
<p>Fixed bug introduced in 1.1.5 when logging into a character under max level.</p>
35-
<br/>
36-
<p>Dungeon portal buttons now update on dungeon completion.</p>
37-
<br/>
38-
<p>Mythic plus vault progression now updates on dungeon completion.</p>
33+
<p>Changed the auto-closing of the Key Master interface so it can be opened with a macro. Side effect: The interface no longer closes automatically when using an action. This option may be added to the mconfiguration later. (Does not apply to spells unless they are within a macro.)</p>
3934
<br/>
40-
<p>Mythic zeros added to vault progression.</p>
41-
<br/>
42-
<p>Fixed empty player frame when in Group/Raid finder groups.</p>
35+
<h2>|cff]]..h2Color..[[Fixes:|r</h2>
36+
<p>Another fix for real-time portal updating.</p>
4337
<br/>
4438
<h2>|cff]]..h2Color..[[Open Items:|r</h2>
4539
<p>None</p>

KeyMaster.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## X-Max-Interface: 100206
33
## X-Min-Interface: 100205
44

5-
## Version: 1.1.6
5+
## Version: 1.1.7
66
## Title: |cffb09c60Key Master|r
77
## Title-ptBR: |cffb09c60Key Master|r
88
## Title-ruRU: |cffb09c60Key Master|r [|cffe6b080Мастер ключей|r]

Libs/External/AceComm-3.0/AceComm-3.0.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
-- make into AceComm.
1010
-- @class file
1111
-- @name AceComm-3.0
12-
-- @release $Id: AceComm-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
12+
-- @release $Id: AceComm-3.0.lua 1333 2024-05-05 16:24:39Z nevcairiel $
1313

1414
--[[ AceComm-3.0
1515
@@ -20,7 +20,7 @@ TODO: Time out old data rotting around from dead senders? Not a HUGE deal since
2020
local CallbackHandler = LibStub("CallbackHandler-1.0")
2121
local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
2222

23-
local MAJOR, MINOR = "AceComm-3.0", 12
23+
local MAJOR, MINOR = "AceComm-3.0", 14
2424
local AceComm,oldminor = LibStub:NewLibrary(MAJOR, MINOR)
2525

2626
if not AceComm then return end
@@ -93,12 +93,12 @@ function AceComm:SendCommMessage(prefix, text, distribution, target, prio, callb
9393

9494
local textlen = #text
9595
local maxtextlen = 255 -- Yes, the max is 255 even if the dev post said 256. I tested. Char 256+ get silently truncated. /Mikk, 20110327
96-
local queueName = prefix..distribution..(target or "")
96+
local queueName = prefix
9797

9898
local ctlCallback = nil
9999
if callbackFn then
100-
ctlCallback = function(sent)
101-
return callbackFn(callbackArg, sent, textlen)
100+
ctlCallback = function(sent, sendResult)
101+
return callbackFn(callbackArg, sent, textlen, sendResult)
102102
end
103103
end
104104

0 commit comments

Comments
 (0)