Merge pull request #48 from mBlinkii/dev

Ver. 2.95.1
mBlinkii · Apr 3, 2023 · d8140d7 · d8140d7
2 parents b03e003 + a4ed4b8
commit d8140d7
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 315 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,12 @@
 [Eng] - All changes to this project will be documented in this file. The latest changes are at the top.
 [Ger] - Alle Änderungen an diesem Projekt werden in dieser Datei dokumentiert. Die neuesten Änderungen stehen ganz oben.
 
+## [ver. 2.95.1] - 03.04.2023
+### Update
+- FIX again Max Health Error in NP Healthmarker
+- FIX Dock NoIcon
+- UPDATE Interrupt color and code update
+
 ## [ver. 2.95] - 01.04.2023
 ### Update
 - FIX Healthmarker - if no Healthbar

diff --git a/ElvUI_mMediaTag.toc b/ElvUI_mMediaTag.toc
@@ -1,7 +1,7 @@
 ## Interface: 100007
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.95
+## Version: 2.95.1
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

diff --git a/ElvUI_mMediaTag_Classic.toc b/ElvUI_mMediaTag_Classic.toc
@@ -1,7 +1,7 @@
 ## Interface: 11403
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.95
+## Version: 2.95.1
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

diff --git a/ElvUI_mMediaTag_Mainline.toc b/ElvUI_mMediaTag_Mainline.toc
@@ -1,7 +1,7 @@
 ## Interface: 100007
 ## Title: |cff1784d1ElvUI|r |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r
 ## Author: Blinkii
-## Version: 2.95
+## Version: 2.95.1
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 # RequiredDeps: ElvUI
 ## Dependencies: ElvUI

diff --git a/ElvUI_mMediaTag_Wrath.toc b/ElvUI_mMediaTag_Wrath.toc
@@ -1,7 +1,7 @@
 ## Interface: 30401
 ## Title: |cff1784d1ElvUI|r |CFF8E44ADm|r|CFF2ECC71Media|r|CFF3498DBTag|r
 ## Author: Blinkii
-## Version: 2.95
+## Version: 2.95.1
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled

diff --git a/core/core.lua b/core/core.lua
diff --git a/core/init.lua b/core/init.lua
@@ -4,6 +4,16 @@ local mMT = E:NewModule(mPlugin, "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0")
 local EP = _G.LibStub("LibElvUIPlugin-1.0")
 local addon, ns = ...
 
+E.Media.MailIcons.mMT1 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail1.tga]]
+E.Media.MailIcons.mMT2 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail2.tga]]
+E.Media.MailIcons.mMT3 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail3.tga]]
+E.Media.MailIcons.mMT4 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail4.tga]]
+E.Media.MailIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail5.tga]]
+E.Media.MailIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail6.tga]]
+E.Media.MailIcons.mMT7 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail7.tga]]
+E.Media.MailIcons.mMT8 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail8.tga]]
+E.Media.MailIcons.mMT9 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail9.tga]]
+E.Media.MailIcons.mMT10 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail10.tga]]
 --Variables
 local wipe = table.wipe
 ns.mName = "|CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r"
@@ -55,17 +65,6 @@ function mMT:Initialize()
 	E.Media.CombatIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning7.tga]]
 	E.Media.CombatIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning9.tga]]
 
-	E.Media.MailIcons.mMT1 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail1.tga]]
-	E.Media.MailIcons.mMT2 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail2.tga]]
-	E.Media.MailIcons.mMT3 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail3.tga]]
-	E.Media.MailIcons.mMT4 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail4.tga]]
-	E.Media.MailIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail5.tga]]
-	E.Media.MailIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail6.tga]]
-	E.Media.MailIcons.mMT7 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail7.tga]]
-	E.Media.MailIcons.mMT8 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail8.tga]]
-	E.Media.MailIcons.mMT9 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail9.tga]]
-	E.Media.MailIcons.mMT10 = [[Interface\AddOns\ElvUI_mMediaTag\media\mail\mail10.tga]]
-
 	if E.Retail then
 		if E.private.nameplates.enable and E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
 			mMT:StartNameplateTools()

diff --git a/core/mSettings.lua b/core/mSettings.lua
@@ -416,8 +416,8 @@ P[mPlugin] = {
 		},
 		["kickintime"] = {
 			["r"] = 0.03,
-			["g"] = 0.93,
-			["b"] = 0.2,
+			["g"] = 0.2,
+			["b"] = 0.93,
 		},
 		["inactivetime"] = .8,
 		["kickintimeb"] = {

diff --git a/media/icons/bigsword15.tga b/media/icons/bigsword15.tga
diff --git a/misc/Dock/mNoIcon.lua b/misc/Dock/mNoIcon.lua
@@ -26,6 +26,8 @@ local function OnEvent(self, event, ...)
 
 		wipe(self.mIcon)
 		wipe(self.mSettings)
+		self.mIcon = nil
+		self.mSettings = nil
 	end
 end