Verified Commit 1d528ea7 authored by Merathilis's avatar Merathilis

Merge branch 'development'

parents e2719c20 022ba173
[b][color=orange]v4.54[/color], 27.08.2020[/b][list]
[*]Fixed an incompatibility error, which errors out my Plugin[/list]
[b][color=orange]v4.53[/color], 27.08.2020[/b][list]
[*]Added Holographic Digitalization to the LocPanel Hearthstones
[*]Updated the logo for my SplashScreen
......
** v4.54, 27.08.2020**
* Fixed an incompatibility error, which errors out my Plugin
** v4.53, 27.08.2020**
* Added Holographic Digitalization to the LocPanel Hearthstones
* Updated the logo for my SplashScreen
......
## Interface: 80300
## Author: Merathilis
## Version: 4.53
## Version: 4.54
## Title: |cFF1784d1ElvUI|r |cffff7d0aMerathilisUI|r
## Notes: A decorative edit for ElvUI + additional features.
## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
......@@ -11,7 +11,7 @@
## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
## X-Credits: Benik, Blazeflack, Azilroka, Simpy, NihilisticPandemonium, Darth Predator, fgprodigal, siweia, Solor, Elv & all AddOn Authors who inspired me.
## X-ElvVersion: 11.50
## X-Curse-Packaged-Version: 4.53
## X-Curse-Packaged-Version: 4.54
## X-Curse-Project-Name: MerathilisUI
## X-Curse-Project-ID: merathilis-ui
## X-Tukui-ProjectID: 1
......
local MER, E, L, V, P, G = unpack(select(2, ...))
local module = MER:NewModule('MERArmory', 'AceEvent-3.0', 'AceTimer-3.0', 'AceHook-3.0')
local LCG = LibStub('LibCustomGlow-1.0')
local COMP = MER:GetModule("mUICompatibility")
local LSM = E.LSM or E.Libs.LSM
if IsAddOnLoaded("ElvUI_SLE") then return end
-- Cache global variables
-- Lua functions
......@@ -296,7 +296,7 @@ function module:Initialize()
MER:RegisterDB(self, "armory")
if not module.db.enable or E.private.skins.blizzard.character ~= true then return end
if (IsAddOnLoaded("ElvUI_SLE") and E.db.sle.Armory.Character.Enable) then return end
if (COMP.SLE and E.db.sle.armory.character.enable) then return end
if not E.db.general.itemLevel.displayCharacterInfo then return end
module:RegisterEvent("UPDATE_INVENTORY_DURABILITY", "UpdatePaperDoll", false)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment