diff --git a/.gitignore b/.gitignore index 56aeaf0..3da7f15 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,9 @@ luac.out *.x86_64 *.hex -.vscode \ No newline at end of file +<<<<<<< HEAD +.vscode +======= +.vscode + +>>>>>>> 1.4.2 diff --git a/.vscode/settings.json b/.vscode/settings.json index c3ab688..d6824c9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "Lua.diagnostics.globals": [ "ReloadUI", "StaticPopupDialogs", @@ -10,5 +11,26 @@ "unpack", "SetCVar", "UIParent" +======= + "Lua.runtime.version": "Lua 5.1", + "Lua.runtime.builtin": { + "basic": "disable", + "debug": "disable", + "io": "disable", + "math": "disable", + "os": "disable", + "package": "disable", + "string": "disable", + "table": "disable", + "utf8": "disable" + }, + "Lua.workspace.library": [ + "~\\.vscode\\extensions\\ketho.wow-api-0.17.4\\Annotations" + ], + "Lua.diagnostics.globals": [ + "ReloadUI", + "StaticPopupDialogs", + "StaticPopup_Show" +>>>>>>> 1.4.2 ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index d7c2bb0..4775e9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [1.4.2] + +### Updated + +- Updated TOC for all versions of the game + +### Added + +- Check if Baganator is loaded. If so disable ElvUI bags by default (More bags to be added to check in later version) + ## [1.4.1] ### Updated diff --git a/Code.lua b/Code.lua index b1118b9..a9ec41a 100644 --- a/Code.lua +++ b/Code.lua @@ -1,6 +1,7 @@ -- Don't worry about this local addon, Engine, ns = ... -local Version = GetAddOnMetadata(addon, "Version") +-- local Version = GetAddOnMetadata(addon, "Version") +local Version = C_AddOns.GetAddOnMetadata(addon, "Version") -- Cache Lua / WoW API local format = string.format @@ -195,7 +196,7 @@ local InstallerData = { end) PluginInstallFrame.Option2:SetText("Healer") -- Check if WA is installed - if (IsAddOnLoaded("WeakAuras")) then + if (C_AddOns.IsAddOnLoaded("WeakAuras")) then if E.Wrath then -- WOTLK PluginInstallFrame.Option3:Show() PluginInstallFrame.Option3:SetScript("OnClick", function() @@ -204,6 +205,11 @@ local InstallerData = { PluginInstallFrame.Option3:SetText("Luxthos WA") end end + -- Check if Baganator is loaded and disable ElvUI bags + -- TODO: Add more bag mod checks + if (C_AddOns.IsAddOnLoaded("Baganator")) then + E.private["bags"]["enable"] = false + end end, [5] = function() PluginInstallFrame.SubTitle:SetText("Installation Complete") diff --git a/NoobTacoUI.toc b/NoobTacoUI.toc index 16d2e40..cf1ad67 100644 --- a/NoobTacoUI.toc +++ b/NoobTacoUI.toc @@ -1,7 +1,4 @@ -## Interface: 100205 -## Interface-Classic: 11500 -## Interface-BCC: 20504 -## Interface-Wrath: 30403 +## Interface: 11503, 40400, 111000, 111002 ## Title: |cFF16C3F2NoobTaco|r|cFFFFFFFFUI|r ## Author: NoobTaco ## Version: 1.4.2