Skip to content

Commit

Permalink
11.0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Amadeus- committed Oct 22, 2024
1 parent 2188f08 commit 4abb967
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Cecile_MeterOverlay.toc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Interface: 110002
## Interface: 110005
## Title: |cffffffffCecile|r_|cfffff569MeterOverlay|r
## Notes: Display your damage meter as overlay
## Author: Cecile, shadowphoenix (Details support), ckaotik (Numeration support), Amadeus (maintainer since 1.2.2)
## Version: 11.0.2.0
## Version: 11.0.5.0
## SavedVariables: Cecile_MeterOverlayDB
## OptionalDeps: ElvUI,Tukui,Skada,Recount,TinyDPS,DBM-Core,BigWigs,Details,Numeration

Expand Down
4 changes: 2 additions & 2 deletions config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ Engine.Options = {
order = 0,
type = "description",
fontSize = "large",
name = string.format(L["CONFIG_WINDOW"],GetAddOnMetadata(AddOnName, "Title"),GetAddOnMetadata(AddOnName, "Version"))
name = string.format(L["CONFIG_WINDOW"],C_AddOns.GetAddOnMetadata(AddOnName, "Title"),C_AddOns.GetAddOnMetadata(AddOnName, "Version"))
},
Header = {
order = 1,
Expand Down Expand Up @@ -984,7 +984,7 @@ Engine.Options = {

-- Interface - Addons (Ace3 Blizzard Options)
Engine.blizzardOptions = {
name = string.format(L["CONFIG_WINDOW"],GetAddOnMetadata(AddOnName, "Title"),GetAddOnMetadata(AddOnName, "Version")),
name = string.format(L["CONFIG_WINDOW"],C_AddOns.GetAddOnMetadata(AddOnName, "Title"),C_AddOns.GetAddOnMetadata(AddOnName, "Version")),
handler = x,
type = 'group',
args = {
Expand Down
11 changes: 7 additions & 4 deletions libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
-- @class file
-- @name AceConfigDialog-3.0
-- @release $Id: AceConfigDialog-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
-- @release $Id: AceConfigDialog-3.0.lua 1351 2024-07-24 18:23:24Z funkehdude $

local LibStub = LibStub
local gui = LibStub("AceGUI-3.0")
local reg = LibStub("AceConfigRegistry-3.0")

local MAJOR, MINOR = "AceConfigDialog-3.0", 86
local MAJOR, MINOR = "AceConfigDialog-3.0", 87
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

if not AceConfigDialog then return end
Expand Down Expand Up @@ -544,6 +544,7 @@ local function GetFuncName(option)
end
end
do
local InCombatLockdown = InCombatLockdown
local frame = AceConfigDialog.popup
if not frame or oldminor < 81 then
frame = CreateFrame("Frame", nil, UIParent)
Expand All @@ -556,13 +557,15 @@ do
frame:SetFrameLevel(100) -- Lots of room to draw under it
frame:SetScript("OnKeyDown", function(self, key)
if key == "ESCAPE" then
self:SetPropagateKeyboardInput(false)
if not InCombatLockdown() then
self:SetPropagateKeyboardInput(false)
end
if self.cancel:IsShown() then
self.cancel:Click()
else -- Showing a validation error
self:Hide()
end
else
elseif not InCombatLockdown() then
self:SetPropagateKeyboardInput(true)
end
end)
Expand Down
3 changes: 2 additions & 1 deletion main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ function AddOn:PLAYER_ENTERING_WORLD()
--get version
local Version = AddOn:GetModule("version");

print(string.format(L["LOAD_MESSAGE"],Version.Title,Version.Label,Engine.slash1,Engine.slash2));
-- TODO: This broke with 11.0.2 (due to Ace addon not being updated yet?) We don't really need it, so going to disable it for now.
--print(string.format(L["LOAD_MESSAGE"],Version.Title,Version.Label,Engine.slash1,Engine.slash2));

self:UnregisterEvent("PLAYER_ENTERING_WORLD");
end
Expand Down
4 changes: 2 additions & 2 deletions modules/utils/version.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function mod:OnInitialize()
mod.Release = 0;

--get the version from metadata
local versionStr = GetAddOnMetadata(Engine.Name, "Version");
local versionStr = C_AddOns.GetAddOnMetadata(Engine.Name, "Version");

--parse the version
if(versionStr) then
Expand All @@ -165,7 +165,7 @@ function mod:OnInitialize()
end

--get addon title
local title = GetAddOnMetadata(Engine.Name, "Title");
local title = C_AddOns.GetAddOnMetadata(Engine.Name, "Title");

if (title) then
mod.Title = title;
Expand Down

0 comments on commit 4abb967

Please sign in to comment.