From 27922b54a0fe31d6f5589f726a06cc53417ca22d Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Tue, 28 Mar 2023 19:14:43 +0200
Subject: [PATCH 01/12] gardient interrupt colors and fix talent menu button

---
 .vscode/settings.json |   3 +-
 core/mSettings.lua    |  11 ++++++
 media/textures/r1.tga | Bin 21967 -> 21967 bytes
 misc/mCastbar.lua     |  86 +++++++++++++++++++++++++++++++++++++-----
 misc/mSystemMenu.lua  |  14 ++++---
 5 files changed, 97 insertions(+), 17 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2d5126c5..2aeef50e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -118,7 +118,8 @@
         "ShowOptionsPanel",
         "STAT_CATEGORY_ENHANCEMENTS",
         "STAT_MASTERY",
-        "CreateBaseTooltipInfo"
+        "CreateBaseTooltipInfo",
+        "class"
     ],
     "Lua.diagnostics.disable": [
         "redundant-parameter",
diff --git a/core/mSettings.lua b/core/mSettings.lua
index 4e5c5446..f1626f61 100644
--- a/core/mSettings.lua
+++ b/core/mSettings.lua
@@ -398,16 +398,27 @@ P[mPlugin] = {
 	},
 	["mCastbar"] = {
 		["enable"] = true,
+		["gardient"] = true,
 		["kickcd"] = {
 			["r"] = 0.545098,
 			["g"] = 0,
 			["b"] = 0.545098,
 		},
+		["kickcdb"] = {
+			["r"] = 0.545098,
+			["g"] = 0,
+			["b"] = 0.545098,
+		},
 		["kickintime"] = {
 			["r"] = 0,
 			["g"] = 0.74902,
 			["b"] = 1,
 		},
+		["kickintimeb"] = {
+			["r"] = 0,
+			["g"] = 0.74902,
+			["b"] = 1,
+		},
 	},
 	["mHealthmarker"] = {
 		["enable"] = false,
diff --git a/media/textures/r1.tga b/media/textures/r1.tga
index d4044248cc5310c3959b4b7ca34c45bfd7dfb545..8c68721642febf2528387f5c87a658e0156fde0a 100644
GIT binary patch
delta 43
ycmX@Vn(_Q<#to*S+{_FT4A0pG7>pSVCSMFTm|PIb#cHZ&pl1Z+$xNOdY61W(^9_Rl

delta 44
zcmX@Vn(_Q<#to*S+&m0y4A0p47&I7^CtnOUm|PIb#b%;stY>Hh<VsJT9clsqH3|)q

diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index 741d9b66..f2a16496 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -87,7 +87,9 @@ end
 function mMT:mSetupCastbar()
 	interruptSpellId = interruptSpellList[select(1, GetSpecializationInfo(GetSpecialization()))]
 	local colorKickonCD = E.db[mPlugin].mCastbar.kickcd
+	local colorKickonCDb= E.db[mPlugin].mCastbar.kickcdb
 	local colorKickinTime = E.db[mPlugin].mCastbar.kickintime
+	local colorKickinTimeb = E.db[mPlugin].mCastbar.kickintimeb
 
 	if interruptSpellId then
 		hooksecurefunc(NP, "Castbar_CheckInterrupt", function(unit)
@@ -111,10 +113,20 @@ function mMT:mSetupCastbar()
 				end
 
 				if not unit.notInterruptible then
-					if interruptCD > 0 and interruptReadyInTime then
-						unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
-					elseif interruptCD > 0 then
-						unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
+					if E.db[mPlugin].mCastbar.gardient then
+						if interruptCD > 0 and interruptReadyInTime then
+							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1},
+								{r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1})
+						elseif interruptCD > 0 then
+							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1},
+								{r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1})
+						end
+					else
+						if interruptCD > 0 and interruptReadyInTime then
+							unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
+						elseif interruptCD > 0 then
+							unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
+						end
 					end
 				end
 			end
@@ -146,10 +158,20 @@ function mMT:mSetupCastbar()
 				end
 
 				if not unit.notInterruptible then
-					if interruptCD > 0 and interruptReadyInTime then
-						unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
-					elseif interruptCD > 0 then
-						unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
+					if E.db[mPlugin].mCastbar.gardient then
+						if interruptCD > 0 and interruptReadyInTime then
+							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1},
+								{r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1})
+						elseif interruptCD > 0 then
+							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1},
+								{r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1})
+						end
+					else
+						if interruptCD > 0 and interruptReadyInTime then
+							unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
+						elseif interruptCD > 0 then
+							unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
+						end
 					end
 				end
 			end
@@ -187,6 +209,22 @@ local function mCastbarOptions()
 			type = "description",
 			name = "\n\n",
 		},
+		gardient = {
+			order = 5,
+			type = "toggle",
+			name = L["Gardient Mode"],
+			get = function(info)
+				return E.db[mPlugin].mCastbar.gardient
+			end,
+			set = function(info, value)
+				E.db[mPlugin].mCastbar.gardient = value
+			end,
+		},
+		spacer4 = {
+			order = 6,
+			type = "description",
+			name = "\n\n",
+		},
 		colorkickcd = {
 			type = "color",
 			order = 11,
@@ -201,14 +239,28 @@ local function mCastbarOptions()
 				t.r, t.g, t.b = r, g, b
 			end,
 		},
-		spacer3 = {
+		colorkickcdb = {
+			type = "color",
 			order = 13,
+			name = L["Gardient color"],
+			hasAlpha = false,
+			get = function(info)
+				local t = E.db[mPlugin].mCastbar.kickcdb
+				return t.r, t.g, t.b
+			end,
+			set = function(info, r, g, b)
+				local t = E.db[mPlugin].mCastbar.kickcdb
+				t.r, t.g, t.b = r, g, b
+			end,
+		},
+		spacer3 = {
+			order = 14,
 			type = "description",
 			name = "\n\n",
 		},
 		colorkickintime = {
 			type = "color",
-			order = 14,
+			order = 15,
 			name = L["Kick ready in Time"],
 			hasAlpha = false,
 			get = function(info)
@@ -220,6 +272,20 @@ local function mCastbarOptions()
 				t.r, t.g, t.b = r, g, b
 			end,
 		},
+		colorkickintimeb = {
+			type = "color",
+			order = 16,
+			name = L["Gardient color"],
+			hasAlpha = false,
+			get = function(info)
+				local t = E.db[mPlugin].mCastbar.kickintimeb
+				return t.r, t.g, t.b
+			end,
+			set = function(info, r, g, b)
+				local t = E.db[mPlugin].mCastbar.kickintimeb
+				t.r, t.g, t.b = r, g, b
+			end,
+		},
 	}
 end
 
diff --git a/misc/mSystemMenu.lua b/misc/mSystemMenu.lua
index e842788f..40e5bd13 100644
--- a/misc/mSystemMenu.lua
+++ b/misc/mSystemMenu.lua
@@ -300,14 +300,16 @@ local function OnClick(self, button)
 					text = format("%s%s|r", mColor(2), TALENTS_BUTTON),
 					isTitle = false,
 					func = function()
-						if not PlayerTalentFrame then
-							TalentFrame_LoadUI()
+						local frame = _G.ClassTalentFrame
+						if not frame then
+							LoadAddOn('Blizzard_ClassTalentUI')
+							frame = _G.ClassTalentFrame
 						end
-
-						if not PlayerTalentFrame:IsShown() then
-							ShowUIPanel(PlayerTalentFrame)
+			
+						if frame:IsShown() then
+							HideUIPanel(frame)
 						else
-							HideUIPanel(PlayerTalentFrame)
+							ShowUIPanel(frame)
 						end
 					end,
 				},

From 3815b2bb82022a33f6074f0056cae0f1e12d89ed Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Tue, 28 Mar 2023 19:31:37 +0200
Subject: [PATCH 02/12] fix talent menu

---
 misc/mSystemMenu.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/misc/mSystemMenu.lua b/misc/mSystemMenu.lua
index 40e5bd13..4871ba35 100644
--- a/misc/mSystemMenu.lua
+++ b/misc/mSystemMenu.lua
@@ -121,14 +121,16 @@ local function OnClick(self, button)
 					text = format("%s %s%s|r", mMenuIcons(mIconTALENTS), mColor(2), TALENTS_BUTTON),
 					isTitle = false,
 					func = function()
-						if not PlayerTalentFrame then
-							TalentFrame_LoadUI()
+						local frame = _G.ClassTalentFrame
+						if not frame then
+							LoadAddOn('Blizzard_ClassTalentUI')
+							frame = _G.ClassTalentFrame
 						end
 
-						if not PlayerTalentFrame:IsShown() then
-							ShowUIPanel(PlayerTalentFrame)
+						if frame:IsShown() then
+							HideUIPanel(frame)
 						else
-							HideUIPanel(PlayerTalentFrame)
+							ShowUIPanel(frame)
 						end
 					end,
 				},
@@ -300,16 +302,14 @@ local function OnClick(self, button)
 					text = format("%s%s|r", mColor(2), TALENTS_BUTTON),
 					isTitle = false,
 					func = function()
-						local frame = _G.ClassTalentFrame
-						if not frame then
-							LoadAddOn('Blizzard_ClassTalentUI')
-							frame = _G.ClassTalentFrame
+						if not PlayerTalentFrame then
+							TalentFrame_LoadUI()
 						end
-			
-						if frame:IsShown() then
-							HideUIPanel(frame)
+
+						if not PlayerTalentFrame:IsShown() then
+							ShowUIPanel(PlayerTalentFrame)
 						else
-							ShowUIPanel(frame)
+							HideUIPanel(PlayerTalentFrame)
 						end
 					end,
 				},

From a6c2e684f1d354a76a077c03d9fb6b78f87d0025 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Wed, 29 Mar 2023 16:11:32 +0200
Subject: [PATCH 03/12] interrupt ready marker

---
 core/mSettings.lua |   5 ++
 misc/mCastbar.lua  | 122 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/core/mSettings.lua b/core/mSettings.lua
index f1626f61..4d0d3d77 100644
--- a/core/mSettings.lua
+++ b/core/mSettings.lua
@@ -404,6 +404,11 @@ P[mPlugin] = {
 			["g"] = 0,
 			["b"] = 0.545098,
 		},
+		["readymarker"] = {
+			["r"] = 0.545098,
+			["g"] = 0,
+			["b"] = 0.545098,
+		},
 		["kickcdb"] = {
 			["r"] = 0.545098,
 			["g"] = 0,
diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index f2a16496..16f8e8bc 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -87,39 +87,65 @@ end
 function mMT:mSetupCastbar()
 	interruptSpellId = interruptSpellList[select(1, GetSpecializationInfo(GetSpecialization()))]
 	local colorKickonCD = E.db[mPlugin].mCastbar.kickcd
-	local colorKickonCDb= E.db[mPlugin].mCastbar.kickcdb
+	local colorKickonCDb = E.db[mPlugin].mCastbar.kickcdb
 	local colorKickinTime = E.db[mPlugin].mCastbar.kickintime
 	local colorKickinTimeb = E.db[mPlugin].mCastbar.kickintimeb
 
 	if interruptSpellId then
 		hooksecurefunc(NP, "Castbar_CheckInterrupt", function(unit)
-			if unit.unit == "vehicle" or unit.unit == "player" then
-				return
-			end
+			if not unit.notInterruptible then
+				if unit.unit == "vehicle" or unit.unit == "player" then
+					return
+				end
 
-			local interruptCD = nil
-			local interruptReadyInTime = false
+				local interruptCD = nil
+				local interruptReadyInTime = false
 
-			if interruptSpellId then
-				local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
-				local _, statusMax = unit:GetMinMaxValues()
-				local value = unit:GetValue()
-				interruptCD = (cdStart > 0 and cdDur - (GetTime() - cdStart)) or 0
+				if interruptSpellId then
+					local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
+					local _, statusMax = unit:GetMinMaxValues()
+					local value = unit:GetValue()
+					interruptCD = (cdStart > 0 and cdDur - (GetTime() - cdStart)) or 0
 
-				if unit.channeling then
-					interruptReadyInTime = (interruptCD + 0.5) < value
-				else
-					interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
-				end
+					if unit.channeling then
+						interruptReadyInTime = (interruptCD + 0.5) < value
+					else
+						interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
+					end
+
+					if not unit.IntterruptMarker then
+						unit.IntterruptMarker = unit:CreateTexture(nil, "overlay")
+						unit.IntterruptMarker:SetColorTexture(E.db[mPlugin].mCastbar.readymarker.r, E.db[mPlugin].mCastbar.readymarker.g, E.db[mPlugin].mCastbar.readymarker.b)
+					end
+
+					unit.IntterruptMarker:Hide()
+
+					if interruptCD > 0 and interruptReadyInTime then
+						local range = (interruptCD / statusMax)
+						if range then
+							local overlaySize = unit:GetWidth() * range
+							unit.IntterruptMarker:SetSize(2, unit:GetHeight())
+							unit.IntterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+							unit.IntterruptMarker:SetVertexColor(1, 1, 1)
+							unit.IntterruptMarker:Show()
+						end
+					else
+						unit.IntterruptMarker:Hide()
+					end
 
-				if not unit.notInterruptible then
 					if E.db[mPlugin].mCastbar.gardient then
 						if interruptCD > 0 and interruptReadyInTime then
-							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1},
-								{r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1})
+							unit:GetStatusBarTexture():SetGradient(
+								"HORIZONTAL",
+								{ r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1 },
+								{ r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1 }
+							)
 						elseif interruptCD > 0 then
-							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1},
-								{r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1})
+							unit:GetStatusBarTexture():SetGradient(
+								"HORIZONTAL",
+								{ r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1 },
+								{ r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1 }
+							)
 						end
 					else
 						if interruptCD > 0 and interruptReadyInTime then
@@ -157,14 +183,41 @@ function mMT:mSetupCastbar()
 					interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
 				end
 
+				if not unit.IntterruptMarker then
+					unit.IntterruptMarker = unit:CreateTexture(nil, "overlay")
+					unit.IntterruptMarker:SetColorTexture(E.db[mPlugin].mCastbar.readymarker.r, E.db[mPlugin].mCastbar.readymarker.g, E.db[mPlugin].mCastbar.readymarker.b)
+					unit.IntterruptMarker:SetBlendMode("ADD")
+				end
+
+				unit.IntterruptMarker:Hide()
+
+				if interruptCD > 0 and interruptReadyInTime then
+					local range = (interruptCD / statusMax)
+					if range then
+						local overlaySize = unit:GetWidth() * range
+						unit.IntterruptMarker:SetSize(2, unit:GetHeight())
+						unit.IntterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+						unit.IntterruptMarker:SetVertexColor(1, 1, 1)
+						unit.IntterruptMarker:Show()
+					end
+				else
+					unit.IntterruptMarker:Hide()
+				end
+
 				if not unit.notInterruptible then
 					if E.db[mPlugin].mCastbar.gardient then
 						if interruptCD > 0 and interruptReadyInTime then
-							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1},
-								{r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1})
+							unit:GetStatusBarTexture():SetGradient(
+								"HORIZONTAL",
+								{ r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1 },
+								{ r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1 }
+							)
 						elseif interruptCD > 0 then
-							unit:GetStatusBarTexture():SetGradient("HORIZONTAL", {r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1},
-								{r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1})
+							unit:GetStatusBarTexture():SetGradient(
+								"HORIZONTAL",
+								{ r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1 },
+								{ r = colorKickonCDb.r, g = colorKickonCDb.g, b = colorKickonCDb.b, a = 1 }
+							)
 						end
 					else
 						if interruptCD > 0 and interruptReadyInTime then
@@ -286,6 +339,25 @@ local function mCastbarOptions()
 				t.r, t.g, t.b = r, g, b
 			end,
 		},
+		spacer5 = {
+			order = 20,
+			type = "description",
+			name = "\n\n",
+		},
+		marker = {
+			type = "color",
+			order = 11,
+			name = L["Readymarker"],
+			hasAlpha = false,
+			get = function(info)
+				local t = E.db[mPlugin].mCastbar.readymarker
+				return t.r, t.g, t.b
+			end,
+			set = function(info, r, g, b)
+				local t = E.db[mPlugin].mCastbar.readymarker
+				t.r, t.g, t.b = r, g, b
+			end,
+		},
 	}
 end
 

From b59c337dda13655513c10db0ceae942da61d1e06 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Wed, 29 Mar 2023 16:12:25 +0200
Subject: [PATCH 04/12] update settings

---
 misc/mCastbar.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index 16f8e8bc..6554add3 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -346,7 +346,7 @@ local function mCastbarOptions()
 		},
 		marker = {
 			type = "color",
-			order = 11,
+			order = 21,
 			name = L["Readymarker"],
 			hasAlpha = false,
 			get = function(info)

From 00f08f57825c65c3c8e91f02fb56aaf8224668eb Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Wed, 29 Mar 2023 20:24:32 +0200
Subject: [PATCH 05/12] hide marker if not interrupteble

---
 misc/mCastbar.lua | 108 ++++++++++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 46 deletions(-)

diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index 6554add3..e248f849 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -93,11 +93,15 @@ function mMT:mSetupCastbar()
 
 	if interruptSpellId then
 		hooksecurefunc(NP, "Castbar_CheckInterrupt", function(unit)
-			if not unit.notInterruptible then
-				if unit.unit == "vehicle" or unit.unit == "player" then
-					return
-				end
+			if unit.unit == "vehicle" or unit.unit == "player" then
+				return
+			end
+
+			if unit.InterruptMarker then
+				unit.InterruptMarker:Hide()
+			end
 
+			if not unit.notInterruptible then
 				local interruptCD = nil
 				local interruptReadyInTime = false
 
@@ -113,24 +117,28 @@ function mMT:mSetupCastbar()
 						interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
 					end
 
-					if not unit.IntterruptMarker then
-						unit.IntterruptMarker = unit:CreateTexture(nil, "overlay")
-						unit.IntterruptMarker:SetColorTexture(E.db[mPlugin].mCastbar.readymarker.r, E.db[mPlugin].mCastbar.readymarker.g, E.db[mPlugin].mCastbar.readymarker.b)
+					if not unit.InterruptMarker then
+						unit.InterruptMarker = unit:CreateTexture(nil, "overlay")
+						unit.InterruptMarker:SetColorTexture(
+							E.db[mPlugin].mCastbar.readymarker.r,
+							E.db[mPlugin].mCastbar.readymarker.g,
+							E.db[mPlugin].mCastbar.readymarker.b
+						)
 					end
 
-					unit.IntterruptMarker:Hide()
+					unit.InterruptMarker:Hide()
 
 					if interruptCD > 0 and interruptReadyInTime then
 						local range = (interruptCD / statusMax)
 						if range then
 							local overlaySize = unit:GetWidth() * range
-							unit.IntterruptMarker:SetSize(2, unit:GetHeight())
-							unit.IntterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
-							unit.IntterruptMarker:SetVertexColor(1, 1, 1)
-							unit.IntterruptMarker:Show()
+							unit.InterruptMarker:SetSize(2, unit:GetHeight())
+							unit.InterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+							unit.InterruptMarker:SetVertexColor(1, 1, 1)
+							unit.InterruptMarker:Show()
 						end
 					else
-						unit.IntterruptMarker:Hide()
+						unit.InterruptMarker:Hide()
 					end
 
 					if E.db[mPlugin].mCastbar.gardient then
@@ -163,48 +171,56 @@ function mMT:mSetupCastbar()
 				return
 			end
 
-			local db = unit:GetParent().db
-			if not db or not db.castbar then
-				return
+			if unit.InterruptMarker then
+				unit.InterruptMarker:Hide()
 			end
 
-			local interruptCD = 0
-			local interruptReadyInTime = false
+			if not unit.notInterruptible then
+				local db = unit:GetParent().db
+				if not db or not db.castbar then
+					return
+				end
 
-			if interruptSpellId then
-				local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
-				local _, statusMax = unit:GetMinMaxValues()
-				local value = unit:GetValue()
-				interruptCD = (cdStart > 0 and cdDur - (GetTime() - cdStart)) or 0
+				local interruptCD = 0
+				local interruptReadyInTime = false
 
-				if unit.channeling then
-					interruptReadyInTime = (interruptCD + 0.5) < value
-				else
-					interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
-				end
+				if interruptSpellId then
+					local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
+					local _, statusMax = unit:GetMinMaxValues()
+					local value = unit:GetValue()
+					interruptCD = (cdStart > 0 and cdDur - (GetTime() - cdStart)) or 0
 
-				if not unit.IntterruptMarker then
-					unit.IntterruptMarker = unit:CreateTexture(nil, "overlay")
-					unit.IntterruptMarker:SetColorTexture(E.db[mPlugin].mCastbar.readymarker.r, E.db[mPlugin].mCastbar.readymarker.g, E.db[mPlugin].mCastbar.readymarker.b)
-					unit.IntterruptMarker:SetBlendMode("ADD")
-				end
+					if unit.channeling then
+						interruptReadyInTime = (interruptCD + 0.5) < value
+					else
+						interruptReadyInTime = (interruptCD + 0.5) < (statusMax - value)
+					end
 
-				unit.IntterruptMarker:Hide()
+					if not unit.InterruptMarker then
+						unit.InterruptMarker = unit:CreateTexture(nil, "overlay")
+						unit.InterruptMarker:SetColorTexture(
+							E.db[mPlugin].mCastbar.readymarker.r,
+							E.db[mPlugin].mCastbar.readymarker.g,
+							E.db[mPlugin].mCastbar.readymarker.b
+						)
+						unit.InterruptMarker:SetBlendMode("ADD")
+					end
 
-				if interruptCD > 0 and interruptReadyInTime then
-					local range = (interruptCD / statusMax)
-					if range then
-						local overlaySize = unit:GetWidth() * range
-						unit.IntterruptMarker:SetSize(2, unit:GetHeight())
-						unit.IntterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
-						unit.IntterruptMarker:SetVertexColor(1, 1, 1)
-						unit.IntterruptMarker:Show()
+					unit.InterruptMarker:Hide()
+
+					if interruptCD > 0 and interruptReadyInTime then
+						local range = (interruptCD / statusMax)
+						if range then
+							local overlaySize = unit:GetWidth() * range
+							unit.InterruptMarker:SetSize(2, unit:GetHeight())
+							unit.InterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+							unit.InterruptMarker:SetVertexColor(1, 1, 1)
+							unit.InterruptMarker:Show()
+						end
+					else
+						unit.InterruptMarker:Hide()
 					end
-				else
-					unit.IntterruptMarker:Hide()
-				end
 
-				if not unit.notInterruptible then
 					if E.db[mPlugin].mCastbar.gardient then
 						if interruptCD > 0 and interruptReadyInTime then
 							unit:GetStatusBarTexture():SetGradient(

From a7858659b38a9b372531695cb808a822f0cca9c6 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Thu, 30 Mar 2023 19:13:06 +0200
Subject: [PATCH 06/12] fix marker position if reversfill is active add
 Inactivetime

---
 core/mSettings.lua |  1 +
 misc/mCastbar.lua  | 72 +++++++++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/core/mSettings.lua b/core/mSettings.lua
index 4d0d3d77..08837eb0 100644
--- a/core/mSettings.lua
+++ b/core/mSettings.lua
@@ -419,6 +419,7 @@ P[mPlugin] = {
 			["g"] = 0.74902,
 			["b"] = 1,
 		},
+		["inactivetime"] = .8,
 		["kickintimeb"] = {
 			["r"] = 0,
 			["g"] = 0.74902,
diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index e248f849..fae93cc1 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -104,7 +104,8 @@ function mMT:mSetupCastbar()
 			if not unit.notInterruptible then
 				local interruptCD = nil
 				local interruptReadyInTime = false
-
+				local overlaySize = 0
+				local inactivetime = E.db[mPlugin].mCastbar.inactivetime
 				if interruptSpellId then
 					local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
 					local _, statusMax = unit:GetMinMaxValues()
@@ -124,31 +125,29 @@ function mMT:mSetupCastbar()
 							E.db[mPlugin].mCastbar.readymarker.g,
 							E.db[mPlugin].mCastbar.readymarker.b
 						)
+						unit.InterruptMarker:Hide()
 					end
-
-					unit.InterruptMarker:Hide()
-
-					if interruptCD > 0 and interruptReadyInTime then
+					if interruptCD > inactivetime and interruptReadyInTime then
 						local range = (interruptCD / statusMax)
 						if range then
-							local overlaySize = unit:GetWidth() * range
+							local width = unit:GetWidth()
+							local pos = "left"
+							overlaySize = width * range
 							unit.InterruptMarker:SetSize(2, unit:GetHeight())
-							unit.InterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+							unit.InterruptMarker:SetPoint(pos, unit, pos, overlaySize, 0)
 							unit.InterruptMarker:SetVertexColor(1, 1, 1)
 							unit.InterruptMarker:Show()
 						end
-					else
-						unit.InterruptMarker:Hide()
 					end
 
 					if E.db[mPlugin].mCastbar.gardient then
-						if interruptCD > 0 and interruptReadyInTime then
+						if interruptCD > inactivetime and interruptReadyInTime then
 							unit:GetStatusBarTexture():SetGradient(
 								"HORIZONTAL",
 								{ r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1 },
 								{ r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1 }
 							)
-						elseif interruptCD > 0 then
+						elseif interruptCD > inactivetime then
 							unit:GetStatusBarTexture():SetGradient(
 								"HORIZONTAL",
 								{ r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1 },
@@ -156,9 +155,9 @@ function mMT:mSetupCastbar()
 							)
 						end
 					else
-						if interruptCD > 0 and interruptReadyInTime then
+						if interruptCD > inactivetime and interruptReadyInTime then
 							unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
-						elseif interruptCD > 0 then
+						elseif interruptCD > inactivetime then
 							unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
 						end
 					end
@@ -183,6 +182,8 @@ function mMT:mSetupCastbar()
 
 				local interruptCD = 0
 				local interruptReadyInTime = false
+				local overlaySize = 0
+				local inactivetime = E.db[mPlugin].mCastbar.inactivetime
 
 				if interruptSpellId then
 					local cdStart, cdDur = GetSpellCooldown(interruptSpellId)
@@ -203,32 +204,30 @@ function mMT:mSetupCastbar()
 							E.db[mPlugin].mCastbar.readymarker.g,
 							E.db[mPlugin].mCastbar.readymarker.b
 						)
-						unit.InterruptMarker:SetBlendMode("ADD")
+						unit.InterruptMarker:Hide()
 					end
 
-					unit.InterruptMarker:Hide()
-
-					if interruptCD > 0 and interruptReadyInTime then
+					if interruptCD > inactivetime and interruptReadyInTime then
 						local range = (interruptCD / statusMax)
 						if range then
-							local overlaySize = unit:GetWidth() * range
+							local width = unit:GetWidth()
+							local pos = "left"
+							overlaySize = unit:GetReverseFill() and (width - (width * range)) or (width * range)
 							unit.InterruptMarker:SetSize(2, unit:GetHeight())
-							unit.InterruptMarker:SetPoint("left", unit, "left", overlaySize, 0)
+							unit.InterruptMarker:SetPoint(pos, unit, pos, overlaySize, 0)
 							unit.InterruptMarker:SetVertexColor(1, 1, 1)
 							unit.InterruptMarker:Show()
 						end
-					else
-						unit.InterruptMarker:Hide()
 					end
 
 					if E.db[mPlugin].mCastbar.gardient then
-						if interruptCD > 0 and interruptReadyInTime then
+						if interruptCD > inactivetime and interruptReadyInTime then
 							unit:GetStatusBarTexture():SetGradient(
 								"HORIZONTAL",
 								{ r = colorKickinTime.r, g = colorKickinTime.g, b = colorKickinTime.b, a = 1 },
 								{ r = colorKickinTimeb.r, g = colorKickinTimeb.g, b = colorKickinTimeb.b, a = 1 }
 							)
-						elseif interruptCD > 0 then
+						elseif interruptCD > inactivetime then
 							unit:GetStatusBarTexture():SetGradient(
 								"HORIZONTAL",
 								{ r = colorKickonCD.r, g = colorKickonCD.g, b = colorKickonCD.b, a = 1 },
@@ -236,9 +235,9 @@ function mMT:mSetupCastbar()
 							)
 						end
 					else
-						if interruptCD > 0 and interruptReadyInTime then
+						if interruptCD > inactivetime and interruptReadyInTime then
 							unit:SetStatusBarColor(colorKickinTime.r, colorKickinTime.g, colorKickinTime.b)
-						elseif interruptCD > 0 then
+						elseif interruptCD > inactivetime then
 							unit:SetStatusBarColor(colorKickonCD.r, colorKickonCD.g, colorKickonCD.b)
 						end
 					end
@@ -281,7 +280,7 @@ local function mCastbarOptions()
 		gardient = {
 			order = 5,
 			type = "toggle",
-			name = L["Gardient Mode"],
+			name = L["Gradient  Mode"],
 			get = function(info)
 				return E.db[mPlugin].mCastbar.gardient
 			end,
@@ -289,8 +288,23 @@ local function mCastbarOptions()
 				E.db[mPlugin].mCastbar.gardient = value
 			end,
 		},
-		spacer4 = {
+		inactivetime = {
 			order = 6,
+			name = L["Inactivetime"],
+			desc = L["do not show when the interrupt cast is ready in x seconds"],
+			type = "range",
+			min = 0,
+			max = 40,
+			step = 0.1,
+			get = function(info)
+				return E.db[mPlugin].mCastbar.inactivetime
+			end,
+			set = function(info, value)
+				E.db[mPlugin].mCastbar.inactivetime = value
+			end,
+		},
+		spacer4 = {
+			order = 7,
 			type = "description",
 			name = "\n\n",
 		},
@@ -311,7 +325,7 @@ local function mCastbarOptions()
 		colorkickcdb = {
 			type = "color",
 			order = 13,
-			name = L["Gardient color"],
+			name = L["Gradient color"],
 			hasAlpha = false,
 			get = function(info)
 				local t = E.db[mPlugin].mCastbar.kickcdb
@@ -344,7 +358,7 @@ local function mCastbarOptions()
 		colorkickintimeb = {
 			type = "color",
 			order = 16,
-			name = L["Gardient color"],
+			name = L["Gradient color"],
 			hasAlpha = false,
 			get = function(info)
 				local t = E.db[mPlugin].mCastbar.kickintimeb

From df3b6ba50584deba180b992f5ef8c5c156264f45 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Thu, 30 Mar 2023 20:13:18 +0200
Subject: [PATCH 07/12] range update

---
 misc/mCastbar.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/mCastbar.lua b/misc/mCastbar.lua
index fae93cc1..c94ace60 100644
--- a/misc/mCastbar.lua
+++ b/misc/mCastbar.lua
@@ -294,7 +294,7 @@ local function mCastbarOptions()
 			desc = L["do not show when the interrupt cast is ready in x seconds"],
 			type = "range",
 			min = 0,
-			max = 40,
+			max = 4,
 			step = 0.1,
 			get = function(info)
 				return E.db[mPlugin].mCastbar.inactivetime

From 609ee6be300e580156be99f0c5bd938b0b92b143 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Thu, 30 Mar 2023 20:21:14 +0200
Subject: [PATCH 08/12] fix for no helth max

---
 core/init.lua            | 2 +-
 misc/mNameplateTools.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/init.lua b/core/init.lua
index 861a165a..09973144 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -49,7 +49,7 @@ function mMT:Initialize()
 	mMT:mMisc() -- module laden
 
 	if E.Retail then
-		if E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
+		if E.private.nameplates.enable and E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
 			mMT:StartNameplateTools()
 		end
 
diff --git a/misc/mNameplateTools.lua b/misc/mNameplateTools.lua
index bb6a2f56..b20b42e6 100644
--- a/misc/mNameplateTools.lua
+++ b/misc/mNameplateTools.lua
@@ -307,7 +307,7 @@ end
 
 local function mNameplateTools(table, event, frame)
 	if table.isNamePlate then
-		if table.Health and E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
+		if table.Health and table.Health.max and E.db[mPlugin].mHealthmarker.enable or E.db[mPlugin].mExecutemarker.enable then
 			local percent = math.floor((table.Health.cur or 100) / table.Health.max * 100 + 0.5)
 			if E.db[mPlugin].mHealthmarker.enable then
 				healthMarkers(table, percent)

From 0d476a79991ad0d6dabf72802b662946f87eea8e Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Fri, 31 Mar 2023 19:19:53 +0200
Subject: [PATCH 09/12] add combat icons to elvui dropdown - thx eltreum

---
 core/init.lua                     | 7 +++++++
 core/settings/defaultSettings.lua | 5 -----
 core/settings/load_settings.xml   | 4 ----
 core/settings/main.lua            | 0
 4 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 core/settings/defaultSettings.lua
 delete mode 100644 core/settings/load_settings.xml
 delete mode 100644 core/settings/main.lua

diff --git a/core/init.lua b/core/init.lua
index 09973144..b10973d3 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -48,6 +48,13 @@ function mMT:Initialize()
 
 	mMT:mMisc() -- module laden
 
+	E.Media.CombatIcons.mMT1 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\combat1.tga]]
+	E.Media.CombatIcons.mMT2 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\combat2.tga]]
+	E.Media.CombatIcons.mMT3 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\fire1.tga]]
+	E.Media.CombatIcons.mMT4 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\fire9.tga]]
+	E.Media.CombatIcons.mMT5 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning7.tga]]
+	E.Media.CombatIcons.mMT6 = [[Interface\AddOns\ElvUI_mMediaTag\media\icons\lightning9.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/settings/defaultSettings.lua b/core/settings/defaultSettings.lua
deleted file mode 100644
index 0a8d3157..00000000
--- a/core/settings/defaultSettings.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local mMT, E, L, V, P, G = unpack(select(2, ...))
-
-P["mMT"] = {
-
-}
\ No newline at end of file
diff --git a/core/settings/load_settings.xml b/core/settings/load_settings.xml
deleted file mode 100644
index acd3bfc3..00000000
--- a/core/settings/load_settings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file="defaultSettings.lua"/>
-	<Script file="main.lua"/>
-</Ui>
\ No newline at end of file
diff --git a/core/settings/main.lua b/core/settings/main.lua
deleted file mode 100644
index e69de29b..00000000

From 91a8032e9ed5e40e1e39cc1a3a22174005a0d4d6 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Sat, 1 Apr 2023 18:08:05 +0200
Subject: [PATCH 10/12] add mail icons

---
 core/init.lua         |  11 +++++++++++
 media/mail/mail1.tga  | Bin 0 -> 3121 bytes
 media/mail/mail10.tga | Bin 0 -> 2607 bytes
 media/mail/mail2.tga  | Bin 0 -> 1994 bytes
 media/mail/mail3.tga  | Bin 0 -> 4553 bytes
 media/mail/mail4.tga  | Bin 0 -> 2797 bytes
 media/mail/mail5.tga  | Bin 0 -> 4624 bytes
 media/mail/mail6.tga  | Bin 0 -> 3443 bytes
 media/mail/mail7.tga  | Bin 0 -> 4185 bytes
 media/mail/mail8.tga  | Bin 0 -> 2820 bytes
 media/mail/mail9.tga  | Bin 0 -> 3449 bytes
 11 files changed, 11 insertions(+)
 create mode 100644 media/mail/mail1.tga
 create mode 100644 media/mail/mail10.tga
 create mode 100644 media/mail/mail2.tga
 create mode 100644 media/mail/mail3.tga
 create mode 100644 media/mail/mail4.tga
 create mode 100644 media/mail/mail5.tga
 create mode 100644 media/mail/mail6.tga
 create mode 100644 media/mail/mail7.tga
 create mode 100644 media/mail/mail8.tga
 create mode 100644 media/mail/mail9.tga

diff --git a/core/init.lua b/core/init.lua
index b10973d3..9833546d 100644
--- a/core/init.lua
+++ b/core/init.lua
@@ -55,6 +55,17 @@ 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/media/mail/mail1.tga b/media/mail/mail1.tga
new file mode 100644
index 0000000000000000000000000000000000000000..681805827e4f311553cfc33078a8353c39013a1a
GIT binary patch
literal 3121
zcmeH~yKfUg5Qq2dNLVzuyz)vTL1YObxx6OGkq|_@<nkyeXre1pxOAcr0|Lz3ysyLX
z7r1npGNsFuE?v4D=9~4M?GPc+P@tSOtKFI3%+Aj4&a9m~@A5Bpv5P7r5pmXhrN<ZU
zX%o|{eS!CxCeUF+X}qtEFq$eQpO9IjBiBSzN?{mE9LG|t)x<c+x*vgB!?3xljRcKG
zL&oE=?5R+K>2xYdl8DJbbw8kFO<9LkrHPU>n@u@D#dW*g1-#K;fu}&L)v8P;6X^mk
zF&|u|!2(>;VFo)*Q+aH_!C;UB$EN_ZESm%Ies0kNpW*{w^_ey?y^NkQ#|1BZ0?rzu
z87s|x=CA}OoHeZ5gveOTcS7rkaS^73#Vz0&P*AhkOa>~F5>bV#G+uy<b+eow23%gw
zDL?|`fvEg$aZOo8*qL-V9Lnx!G!l1scqreP!`X(zE4SNiVI^}z*<waw!gi;2-dq$#
zb7hPcXE0MlXi64H)`L=_G$cAB%t)ae<YCy$Wo_+*7U$=9hJi?Fp|Tvg<QbSV;8}R`
zbEHS*e?1hsG#7D){Jkq#*6|s{FZl(R!2pgtL-|<Aud&@0LvgKUnBvk?Q>2VarBcan
zeq$9p0^I3z=3vVoes0WER>2*>^?KcdOQa|`N+Y|g=7Nq~-Ftg<bR?84@5EC2Ne$jp
zi6w#~tZZ#<&B481FSm;m;R1~9EpHo7DOXaa<}BInnHMjyO-8o`QXh!}^+n1{XNnpZ
zt}4`&Wg!Ii9tB4R_Oq%iF}GjA=S#eR5WY3A<zW?=I5R(9=irV96F7KM?)Ur4n=>@C
zZ&u*}2jcknSn%^i=?-+Fp;E;ZaX<%}%SpRpNf<>6rId&hZc^IJ50v{#74z>M%CKUk
zV{d@Cp<*w9fH1K8UZyB}nAoINxKU0}HtSYN{L_I27_X#KLf%oT+JyE@flb(L8%<^T
z62$f@Dc&=ox6TXZk*$lOgR+u`+A9g0_-8MTeSoXm7@5`LL6w@-wN|SolutfRFJ;ru
zr=~LV!5(Qka_Ir)>1Aey>t+FLDeJHZ5{J8ON+SR#nrVQ6v+o~8U`;n@a_)k=<Szd0
zjOqP{+dJ#q4|bxf>-F_3e^QSS2J_!Cuw0w}E4Xv(?#8{%+nYCUTy9<4yuPvSegSb}
Bg^~aO

literal 0
HcmV?d00001

diff --git a/media/mail/mail10.tga b/media/mail/mail10.tga
new file mode 100644
index 0000000000000000000000000000000000000000..0424d26bf7696866645f02eb310017756cebb16e
GIT binary patch
literal 2607
zcmeHJJ8Tm{5M3vcIMLwJ<yFWHRs=$F=_bgQ5J-F?m!UukO_U;qOa2A~gipYTBBns3
zK?*;~rAwD7UAnyTN|(ob&+MFSEs@+nlSFTB_ujnO+1a^loICCOPtDa_9QCs-a|@Zr
zR4l=ifCC`;3X}2880Z1jM=(yNfKd#j-(fNb)E;smlGDQ<Fd{~?MEcVc<p=Z-OGW(4
z6SWf}bN|02A9x--{}FH(IMN#?Hh)4Lyvx`VZ6LY_<2c&@()Tcv4w*aFcO>XG1gh!-
z&e(rFaiNvof|ZC(*?Iz#uOu!cdgDa{3?^;IeN_SWbzO<s+VT#Cc?I8mZ4*U!+rIC)
zE(S&8Sb;>kP{3U;%JX6tbwFQ@7E3YPuz*F(y3&OLz5r{Y%~=s^C5~H;jpJg8bfJLH
zr$r?bH7R=LIUR*@%22vcKoiYwONai_2V^-`Eub=#E)?*o7jav8hTE8>uRW)><PoV^
zm|;h{P(b>sP6?h(%c6|gV9#?y4Dz;NBMqes1>|2=1?=KkR2J;M2xtN04$K_SE+F5Q
zHWZYfi)A^N$;W9f-+{7}E)<X(Rlq|$Cs|q+`<_#ct&YraSGrI@x+&lo&&Wh|%#u%@
zV;8hkV}>}ACKODoEW;%R=%6n9j6t>n41h8~hR^ZwftKLH(>(yvFEDn^ar2|UZK*VO
zL)m4Q*qt`{@{MTQE!bn>^ShI!8+?ONh1g9cIk1V;qnj9XcmwyDY!_fhM~d9X$SrQt
zg8v`k<oOROu;L0XId#TW-1$XU+rD*YYp1exdndkFS*=_+P9Bpi{P~@BTs|93rZ=wL
UTw8BkZ(O}{u6e0(d9C7p126C>yZ`_I

literal 0
HcmV?d00001

diff --git a/media/mail/mail2.tga b/media/mail/mail2.tga
new file mode 100644
index 0000000000000000000000000000000000000000..bba6ad2dc7f01ecfb21877be6f4d287f93913c2d
GIT binary patch
literal 1994
zcmeH{xlijr5XLtgBBCLsOP3T7MM6l3$_<D}=sm=xl%}AdK`tmL1L8)4cW__sfd7Ef
zqN1csNtrTbO7neR*af4fC(+P=qZ!ZcZ)SEq*&SoLjeP<W7(bt+X=>i7E6%k+d5{3o
zd&!v#svOi1q_zr`a@2r?=TJt<z#7|tN@;DL(U78V0aD+D5*#|EAxPh7%YvIMh#ja2
zBn*?<rN!97HB>;$+u@uPR}3J{8z`+9ZqpE?Z+vS(Eej$C;#a_m@B>1~-3nB~91pCP
zlB*;M7hQ&U3fw27oA2DhJ<ffDuUC>^{Nvp@2y_lK#{<&j9cx{SEJ%3obkmx6=d-XX
z$oNDj%B3qg5DEN-iw@!=@0&~KW#NP%)9owM9~+gN*r+-T?-la6_d=S-bYNttrT%iH
z;gJQgvK?4ZrKN~FIUiaO(N8;M&b%O#sP_ago>&7pH1G};$o<J7gz>~1p7OqOw^c|%
z30xoIj;m@?+<y!ysk68a=DQ9SD98ct9blRDosD%^`W#;o4n%7f#LA*x+JU(W<be#&
zBV<`239MFg`<K<o+4lYY{)7s2n4GD1^_V_0{L$5-xrN20;^O?0KUgdk2mTlC6Xsri
dZynq3J6pr)$(fPa@>KcfkN(PNd3>a3o&oYdOl<%F

literal 0
HcmV?d00001

diff --git a/media/mail/mail3.tga b/media/mail/mail3.tga
new file mode 100644
index 0000000000000000000000000000000000000000..ef9804c9885a2e54dc689978da625524d7d98a61
GIT binary patch
literal 4553
zcmeH}JB%7v6ozNmRf61@a>^;U@e0YZL`ma_m7)aYB}!66B8^4if|7L{lQ(&jmx4RG
zU^$T}Nk>UZNl8gbd2_!1G6Q6X^|(n9Evqxyd+&MN^PkrZf?GlIs|M8|E>4|uLDuI9
z2mET!?9=7H=Ev+k<`deoXf%FqAIEBD6n(^*J}JW`3_-0{bANQZT^BT)O{cw7=us+k
zV!U1Wi^ZZFkH_wr9l4X)Z04dU;yTc1Cs45El5JE!hdCIHMqa;d2c=84#LqJFmsu{C
z?oXHtrBW%;THUdtH8zsbzr<LrR<C1><JjFWDmqy>-oW#}$esbEa5|sQT~ZF^a@kF%
zQ>T+cvTLPtEDL@>MYvwCU8~h{k14XSUavb!QfGOTd@m*ae&12Qs%c7gj$Nav-=T-l
z7B-uW`wodbs=t+LT*5Ue3QgtOsHHZ-s&2IOXS5|6mE`gm_*w>5tChp;N2W>Lvv2>D
z)LHR_&e}EFcq8DtSS*}m^BDO`?&3HA0EAa$DyK%}PwZSRJhIi;U!vV^JL2MHbA<9s
zd4ltlcWPi|D(hb)2CBAN_%mWP7z~``@_6yN4B$A^LrMT=W7IV&_7fv*TdlnjqQ<z8
zY#t+@$_S2kI-OlS#-=hRsDi0vtAU59(P%iLC%HTZz}khw;ZV~gg=t|bYd<Ci%C?$$
z4~bT<*HhZ|kj-O+VeLX3uT(0#Sdg}zU+hR;G;Fo<7a(Gj$;3%6j{#ECg*Z;#dMHfY
z&?x#114M?j?HO&;mZ%Xu$sRGn#E*@Xq$Dgw=0b*eTHB$W^SY=!#Sp95XmV*E7bbA=
z=x_zX&$iKC2f_$<BXg7;-pG}pkL*19JuyPidxt^yMlgvcqp}_idhh@Mw{&EPhYRN^
zB!5#oQ#=G0UhKu=?CeZ^RB{1TA{k=}iaQf58~%X0<~8P_q6?))$gJv5i5F+Kn))*U
zC9@<Kkddj8fqEO(u@Q8=K+<=-H`#E}ixra$xV#)mlRo;;J``ShOUjtXnDWDf7s`aL
zofc#UbRLa^p&(;&N{`vl)>WfzKLRxJ><El=<E+pO<=rtDRdWZUVr6pvp`3Qvj%{uG
z(?LyW4$^l$0>(8oiatw>z7Wz>u5WTBIZ0pAjU(F{DUJma7I>*I4=*$PN~dV27tRMS
zc#`pcoX~M)xMo{>5Hlb=#8-NtAXa=(^^y<^CC!<F2^WokIji*?!hC96f|>i;?<mM5
zBYArWvfND50+7eKK<1K^f6Hjwgp;E8=uq@mT3(r988G+rLF?~&Q0UoHp{e2d4T@g`
z-zh-Q^=StHLP7g9N={OU2IgH!*X6~P=HVVh$&1Vn_e`fNDsx_g|8_bVTYjcyj=Po`
zk_KzySl2GKmlr%Wue-hsr~NZF;fW&r3T4Fg@t+^%bkJ{-f~fEu4$`?xK`fuxM=w1k
z!Ot-K%4h$QE8)lvlS(x$B~uvnS!3en_g^7!Y6-Y{^>%PaUE-yzw%`Bo!Nc<hA3Tij
rotMw=UMCxK7;gXe8BhMc?U(Po_3r)mF5bR)^Nl-=*DhYae;)h;#%#k=

literal 0
HcmV?d00001

diff --git a/media/mail/mail4.tga b/media/mail/mail4.tga
new file mode 100644
index 0000000000000000000000000000000000000000..4f21c80687d7e1056d18414a2a0351a642f884f9
GIT binary patch
literal 2797
zcmeHJJBSle6n)X4gN;*8B~#jL2#An!nw11Z7k{LTg%F!1#THuze_6k~x@vY;F(P8D
zjHs|>%9LBCOe3UBIpuiHiSy!Q9|0Rd*ev(HJ9F-td*;47k2U6$Nq>=vOz8EKBr%I!
zizx=K`~|MbsP=&O?$hPqJXr55T*9jXEVu_ZO<;cW8(hMun*~PSQ^3E=457>mexyK@
z1;QgB`OjO@=GNw62e1gn4KKp_LU=X*hOcl>!!^NL*OYM7R$wDxF49Y&B5h*zHL}ML
zaax<OcpFZ&=c~OSz~}d2#Yb=&^8i6ln5)_rP?5%1SDwL%6d@Q2bCH;qP*e<~DDOF(
zhz$f2;V$A+psLox8uCp=@)5L!xk!(JiZsMp-hmUTh+rVhMS2KSB({G2Eu2VI1Y=<?
z(gskGI#`2ua3*a%kCT|r*?R7hh&)9~ADG3B2x0reT-7)aBC+-LPjDiY5e$XRk@!ST
zL3{^J#4c9<Gn|OTT0C~9lc@tphaI0Yup~9alGG4O^0K6=mB`jdANgpiI1B4riETzk
zgUU)x*0l11_XJ7eCbxt!t0QG>sK5xp^re|9iE2NuB+)8iv!(|*w^8JEQfz{x?xmQd
zT1A_<?W<_!^XS?Hb~JdMl4p{sV*o3v=#w;|j36t!VTalwo6~AI=XR_pJ+{&ha8=qO
z&Uy~%D$JKqLV%!WrFU=@SY;0B`nc_f>X2@Gl9kTgs7V!1kwwxq1Ba!zLGxAEHpd~I
z1FF|LEWN}t&)995Nzdax<<(&vp&D##+bM+Stf2xcyorn09x4*2NAEI;>O<K62HfnE
z-ob@=L&pRP7-h?7;B?HK0O-M3hQrEV4CA)>dPE<QnRAm|`XA2G`VTsgH#svtdD<+Q
zGk;sHar5@-T4D9pT6n%tESy_J4+-Xe|NWVG{HHg)ymsaK@{P*X%H>N-)eDu2%LVfb
DTZq6q

literal 0
HcmV?d00001

diff --git a/media/mail/mail5.tga b/media/mail/mail5.tga
new file mode 100644
index 0000000000000000000000000000000000000000..947753f2e483b4c2027b1fb8734508a9db3a6410
GIT binary patch
literal 4624
zcmeHKTWnNS6y0~GWJY<7&y){!)F>_3I*8ROiX#fPirR>pexi}2{t%)h@?l~Dp&(*`
zf<+AuO0c{u4=tcLzOcSve4vd6sYJ1n2!jyQ_=wxJ_PKZ3(w2-r`ooZY={@({z1Ci5
zoqc9R&XnMjl%&L?X;qaxE^|09gm()OO^A+7xF|<D5iN-FCppJ19&Y1^>{eV9A<5Z%
zXqN%FjU%!MEi5e5rluzC=;+W5n4+Q1&Q5J<Y0>iXa-GR32uaS$y&lGGGsolcxMs6i
z-E6NVlS$5Gw0BJ=Kf`HmZq_ZFDDCa-U3rUUa>(Xmro<f}vu?GlMMXtH)@0XIW{o3^
z!Zw@O4gU1R)AIa}rdV!%q|3Rl+S=OGjpX6bM!xFR)zxV<8g-k*n>=~4?XqX{wfQnj
zLfjrZxZSpv$NkRTZL>moa9Y}fQyq6*j#ERvoR(OU*49?#hMvtNA+jTrii!$1lH+Ex
z^WnD0(z0RAm@&goLglC+dy0CgR7zv9nEx!$(%#DlpuRV6kG!ca8?Acmo4qTr_woT)
zXi0ijK)&_$^*Ya<^{k+(s>)h5d!c&llaz3FZEdadO(v63HhIkl{Ao+lV^uuX!kV74
zXZ)+Wy4uMXCNWCO5z0K*%n+O)Mkyaym%4Y&tn?YehFKHSGCv|~hVl3pqJ>7T<sHqK
znT3lMBoYZtr_-8;q32s=0fb8($m)ziSvi8tolIXxuoNQWoQuEq`6EpRAEFu<NhA6@
zed-LBsp&!o8*D~1d;t~l&pRIJRfziexG=Lc5GYL|Nkp`tvv6)7wFRcP%^LRWVori&
zD5gdvF+?SGrOMtLRerxi<wS)R>>jJKXr#)BL4GU3)HXzn??mm)wo3@NafF@5ZddeO
zrnM5GwGB0fcQSlWVg)MoBUE&v%HN1iFgRYRa%6%^2jbu@D*MN2`0?Q?gTv&`FfR6u
zrZ)}S10Eegjh));5!BddoXZC7FB_B9=ZIt=0g3zt5}hFNYlX@$Ao0_9mG2!9`T8c6
z&&FzGL%GVJ9HEAO$hcNSXabsJJT5eMo@?u*=2zwV^x&Kxe}cwux2qfjjl;L89J<xf
z`1WR%eMyxJR_Ws#RNfz>;i;E8Wsyn}{Vb3vBUHr}!3$Kev*$d1r}K%V?0*`AYWzVO
zP~#XV9EK8ypu_>hH>3eI_JGDmpz+@IDsNq<vi(|>i_ZvhtvMB$5Stb|SnjM8`p4*<
z0}{?7sRWz}9ZrD6QE2fqNc;#bz8eP;&|x14?7`A~I7a1Nkl2N#*?x`6mNJb#S`-jD
z&<7D}k>bV)u_^e~XAOR+NsG-OM^QJe_yg-k&251E0+62qvK5f;0P+n$wgB?gGL?0s
zb;z<ZS40;kl1rgw7Pi(G4V8V*N44IjL*+OSj}Q?>9z>D*eZ<d!_6cG)5Z?ykP9VNU
z#H)dLmC9-awy_}?syUJyw1Wt2-n}rJ{YnFmbF<N0=5b)rT*OObRd)by8>(vt-dbR-
z8l|!V3-es*$(Ui_*_Q=co<?6`wen|xUu%H715V+-GDE{jdwnOt(6Wn|cuvesqgB=*
zUM415)$$S@GH2AuxE``c5v^90S5s4?jg5`^0$aiP-IQ*|9A~Tr#m+!q1_tt7Ozak5
z!$7hTxJ|%)3AMfe?8Xw6#Upj#gO>%>IAi60d>Mt5U#X-?CUv&m77bDfpjrV%<Ge{I
zEaPU#x&ctH0BR+nN>!Etid}dC`s1)j0Jq*&m+f9yaSftz1uki>b&A9IBus<B^2jAB
z9|TZX!Pg0es@4N;HDFevqUQm%)Q6g1tl>L{Ib|)6fvsiMvvBWPCEFhP?Sw?MpjiUk
zX$hVr%kiw?3YCT6KCf6K(}t@=LIHo*Dsw5jj)H+m`_P40ZSdo2uL3`RwPi8WL54c;
zn>eg{x~`*OT_B02Gyx)V5gO5y3sj!C+%4UbkviZp^n^);DuoeOC}p%XwubAwr*Wq+
zCo~{p_EUT#Cs6DJf(zaC-QX*KB*7zJ(tTXA%ys(nUnx+4J<<^wDkW0<Zy~2W@bJ{>
xrBkO&kC&AuN=KjS^*A4T{=e=M!x4HBpL_4QZ~Xn0lPd4NtE75D<;3x&@(<nvHkAMX

literal 0
HcmV?d00001

diff --git a/media/mail/mail6.tga b/media/mail/mail6.tga
new file mode 100644
index 0000000000000000000000000000000000000000..71c9e71e32662ab55dfed85642203e8ed3c02d33
GIT binary patch
literal 3443
zcmeHJT~L%|6h3GJYYfA3$0b*VA<HIVOC%zQK~gdO4VQM&Om*RO;e~feC1_=ft_J4V
znvOw2pkh&$t^FANXq!cCH6}SmTTZg3(=b-k>3Pn#-?xBUGv3sVFz5Z=_dD--p7Zy<
z`-xmD?q8kMNr^9}s&Yj`2QB7cD2DVxk^>l&Z>At4kkC2|VnYsQC6Ls93@VViCpj@C
zmqQ0Im|}dUA~ozPN}u2k)6$~kpsT36s!;j=Q_{nFu>Ru^c0|J7Sg~hSs2f^kPjo_j
z?HGism5|hP7@Q87WwezFZc9Ky)(2d%|3*xgjcE(C879(Ym?G3=GuliAu}2|J+cB;X
zgniv)j(Oa+I~z<F_8QC-o@+cKA6A`@ySgYQeoto^FuQDkVb>_*7rmfg3FgDdl6cPY
z(Co4SZgh=idg#aN@OoDl#U$flD^|&NSC_(Mgx;^EBTR3ctE^dlh6-+*>3tL4B%gA1
z^uEo~F&8sBLeMsd&u$#rv*NwxLbjMZsLNxDJ_}28fn_Y_%C4{=CNaqDi(~`dWwx7F
z<hK-bxjLqxl^M1p=(Am!ON!nb1h=j9AQ-}k*Jkvzl$|>5c4M?zxUE6F#%(pCJkgdQ
zBr1Qk#O2Zom5WW9JGo*^erk-$nT8-sIStxtl`KBld0|?^=4(D+{g5z30k1Lz_zTS{
z=a#D^A*UNuPS$Jg*NqW5vBYmh%7jl4iz0?+u^0Xttfsu9IgXW&2SN(cbaA8m6I4^6
z`n5^r7f}7!sPer-Ctod5`K(sw9cxI)(Hg(~j$~-P)5Xj>&@5ajWYoJ~oD)e(C%QjC
z_uK6%=RtS&HkFBG4&Ap)RmSR6;<YLt->UL{jpoK`BeN(iQYNmLooSbhMcIv&9fuN&
zun=^tmCEm=Lv-gsbrz9LAhJ`CZ%Bvej)U$a(7kty%G=c{uivaPTotq+Gm#qY98km|
zYay9SH)ZJt;T=)Agt#t(Y!b2k46+{(+jsRKLtJAZI=)!t!y1)$L3TI<vPCKfs<dF=
z;=Y-L#ZhorJa+7*5YTb<n@l1OHpCgmffy2i{v6Q906hxmcL4n+php0`uS#War4|j;
zo-%mvGa&hb3m;8;e*w_v2o0}K!|Ri2=o5hb1acJ6M*w{Y(618uCO|J#*#n7I=uG&|
z%i!I<VjHv2)>nXKp$Q#B=HCGHL3lg_=$8Sz`$m-=L6vQRY4GeXA7pfg8^KUIf{A5u
zYg_9h6!z0}VbMo&nD8hp;Rh>K`XIXqU!l@du0`9bodoe3v7UMelkV*pV(c|HN#pfV
zE9Dn%DbsyJ_z}RPl=2Fodjb6-Jl_uZ?sAn)Wm*&o^;?qmlA=%&OM~LVi~@#bdy6p0
z?S3R+05C5BW+!0+Dq8{5Ri^Uv4fvWXb=tF^Pz9)bSUzweki*vq0Z;k?vj^ro;l=ZS
z*pi0WFkf>!%bkOjhQQI5Bh_&^gdkX5D*-%U2~b_>fq7(s%0_swe!kA@s7T0T*E!b#
zzegn>>GjL-qOc5tnd#jP=5%^x6HVcGCz#hQh|tt7utA#UN#DYt><UJ)J#OjRT&8*9
z;Fr=-8kP3zoohA5t^YWra@_CitIz)+1J_87B=ZWTTtZjM_UHo-uUZ{g_2BA~sz5MM
n`ETYWROY1rr*EA5NWQbY_wM@|?{B`R`K~+5+m<)CGzR2vjrfpG

literal 0
HcmV?d00001

diff --git a/media/mail/mail7.tga b/media/mail/mail7.tga
new file mode 100644
index 0000000000000000000000000000000000000000..8c074d1f6a7eeece337934b5af3a3351005b134f
GIT binary patch
literal 4185
zcmeH~Ka3ki6vk)mi!l^%rOPedU|B*)S8fw@Cn2y1AeTphWSWQ~h0D7fi2(sd0b(Q+
zTv|Yc1wnG@(xpq6E?v5GIlSLDyXQ5&i#AAz<~I5!-q|<b`!nyonRD(HmpzF~TwI-c
z?_Gi6GvvzY+M4}8GOT{L!85xtObkZ`cY&;i60i2ehV?TWd}KpnaQ82TZrNLGSQ~t;
zR`a9L$gfr_|I|c$X|vh*$z<Y>j*k2}A_kXim!p2nd>qGqy<Yo2SXNGw1WB+oxO1Bf
zN;5B{Z#*9RKUv_G%jK58z7=P292CR;4B=9}UeDN*ttjrs2AT4g1aoHG2;PL}e@u!W
zm5*dO^|e?me3&Vap#zpiy<X2(tJP2>(dp@_s_k*nH2*;)=-sL0rAjNJ?x}J~l?vGO
z{f<pNs_xRJ?~2;=NF=k_%u~=8kd&|vOOB6^!_1{^k}hJ~x1yzSb-Ue^gvb#=8kdiT
z!=XPsJWRi3vDCUE3i|tYN7zkt>C`@=f9`vrbww0>Es|Xiu(#ju`_J`l*MnB8rIt-E
z^bviM5MG>}orS!a&*z>K!52~fl}L7WCBhec`cmKc)o!;#_{tbYXqh3*50wnrNg|Vq
zs14NnKI7>(s4e3YwD23&N|=aWh6#y$#v92vzi)#-Xf~UEI-U9g3H^mU%TxsFEUY0h
z2rDzjyn(*QdDAvj4NYbeY~XZuBk3;@4ttv#t~-8u(hE0f81!b<sEn@=lJvmioNpO;
zIO}H*Z1C7Y2yk3>ObJ6`s9tk8KD@%&tO``Uw^B#ttP#}>U4tC=CE`j<F;t$SaDg0e
z#3O&=V_$60xg6@_YJb&K97#?fby>mNZg``@$Vw%01%|98B5YV1Ff?3#bVb=wt%VW!
zfZZX~bO-`0)d#fabk88{8#+OGCa1_9Q0Tck2#Tw^aqTM&4F?qvhhVW3Pt?3CP#Xb&
zC^oRqzSHS=W#vE38rauxm)ch+A07Vf+O0FB!W|821G@>4HU;xke{L`sgq8Nm)x>{|
zk`hgY4s&^yIrc<q%eFW+%ncq&^^_83F=J?5LCxnOnOUI>Q$Z4&M<GFFpvvWEcT0s}
zO%^zM)XyTLf!I8l*aR{n!|6bl+kqSzPVlS@O0_+@aX~tz26Q?n$pd!(iLB!Wi~_?B
z-E&+OU1SR=w3*zENEQP96X{*axtx(|E4X?DmvfmAwnC(o3y+A0_QO|fm>Pzut0N}K
z-)+jEEX3Tt#oCMqNM~dnn;tx|VG0?nE+wN_wH4Q<x}-(<3u|zi=f#Th*Zk6d*GzuP
zJG5<t=Q>!3r3xF57Y6)t`jhQxe%-cXlM5s^`9Q3l0+wx+H87h>a5gqLPJB1LVpwPK
zK<eiCuOo0^`L}xMHP>)2zo@EDKl<eEy~f>-@5OI6nvFM}w>;)!l>W;LmRqle*Z1H1
W;P!_ncTV1Y=k@kmCvV?wxW55#=2L0_

literal 0
HcmV?d00001

diff --git a/media/mail/mail8.tga b/media/mail/mail8.tga
new file mode 100644
index 0000000000000000000000000000000000000000..399b30f1d426d9a47e3058581a9dc5da20650ea8
GIT binary patch
literal 2820
zcmeHJJ8Tm{5M2`_PBf%EQC;Z<D-uF-=_V+a5Lo==G89Omi6~OIO!yfPkO&AyLg3N`
zfryXf(xpq6E?r)Er3;GVy=QjLHfKZ{Xp(5wJM-qhvuitd+WEhVtGFoWrD^Jpv^=84
z2`nL~1Bwr@q?C+7T~PTU7N@0vT?9(LU`ZXQ@_-wGWDmb$5iptsl5ZX;-lv98T14MH
zP&o!t_y1e+mgm9qAAvX#LrHYlb0^dSnsO$ZpkN1!BexDp-e8$b$ehtW0jdo_Wz7LO
z&R<tpUZmGRvq%h=MS4Xn&*&uq`tE}!W5>G6AkOug60_LS&U3Q|UAY<KvtdR7xaK{N
zwXs<?OdXJ2p2J;ll;y=NnAec~P_P)Ea~aAm&*5`#G@Icv#Ji6@*2X5wum&#P@mPXQ
zm)UPK5w>?gF1M@C2vBV{`!z`7rygVWb+uy&J0?P>bx@!ehxR=2j#9|0$z1(jQ~L!h
zl>(13B&R2A1)Cmd{vmk+S*EV67+)>e^B7xDV~2GG18HTC6tkBLs;!#~me92^W2Qw;
z>eTDTYI9<1Kx}YpbZ;e8z=SM+%8iXhPJG=Bws6<pXpT~!S?VIwh7kgV$%>K!JJAD$
zR#XGr*e=`%Tp$~23bUGqkQ8;EnNzzF>_$LNH?@dO-`<3V>2KKKjHs^)42+Z^OA9$C
za-<Ae;53}lkUWB9tf8TPE6))x{{XZN${w}E!nHKo3MZKXVH*~T*EQL|lxvdNS77|X
zE4NK~Y|4|$O}Y8E%4|Mgoc??7{m{J6r=nw~!3L=H4oi<kW$AP*ok&hT0<}}hn%GvF
z2Lx%KcT}Ie<)Xp(>=nw`EE-Avns7Yf3gbkY{T^itm!#l-_#A)!gASZ@1s9(><4W%A
zQKQ|xb!T&{w0V0gx=>mvo&S@0M6mGde_C<rM=)WpU%jz<vwE$1<?^}u#p<QilKTnn
CsLDtH

literal 0
HcmV?d00001

diff --git a/media/mail/mail9.tga b/media/mail/mail9.tga
new file mode 100644
index 0000000000000000000000000000000000000000..0b8a036745fa79f68bf147ff7cfaddc2bfe5e5e5
GIT binary patch
literal 3449
zcmeH}J8Tm{5Qg{8iLju+rOT_38!Sr*$>lXciG)DnC6}Q<GEL+nManz?2Lzb65e23|
zxQQ?%NG@HvOzG04OP4N}`DSzHIEkW715F&wM!Pff|Fg3*duz-^ll)>6n<(3})*6rD
zDR!aw=0(~fqn|QZRwg1{k@6F4bO>Y`iH!GTup%bjLaD>NOe2x8h|TBow%u;q(P(6M
z#KeY^$;5WMU0W`f?FJ?yCf-clGcxV49z~HIkH_}6y2WvfB{G~E6QA;QIvu-<p&1T`
zQ{2J^OKLBcCUS(J?kQ@aP)JbYsVS(Dh=%Y-4G+<u8=j}<KNiJjtw*YSeSO{T@9$f;
z;!&YZT!VVOZnN2}Ym#7jd0D&clW&=SRFJ`7Fx$aHZLNTQr@PfE^oZ%b!f`3At*zN@
zx-N}Lbv_{P6r|tpTN-)`kdXU@NER0t-AWppTKmAhnTbtd12RVjxl?S=YPD=GmpdRJ
zmt1t}=R?pq9(O>zoGurw4Y;a+b>vV%seV2LuTqd|wR!|(TXm#}o7NFP&JNVihu~!j
z!pS?3N~NM8FI1Nt?d%TJ&xgQ)%%&kJve!z$v6o7vBRfz(AA;v6?4VYwX;ZvaUD7a{
zTAZ9gv)Q!j=R;6e5VA^QTpB1-;{KpInrT|56fP_3=R@#JL6TC`C_~DWh9di}?Pv69
z8LO`ki7Q8TaXiv5C+slUh5Gpr@OH2P-*GbRa-B5WSJhFf9Q{<+Xf&+)`4G5{B_Y5%
zkfh$fDFIbR()5fBSF8H?fNK;P8i^uF`t&=nbIHAghJz=BvjK<Xoo5sg{s2^;Q6!72
z!Yc)2?zGRAL}&8ueFU3(AF&a_7IDuWs7xr+5zBOjdv$R(&RN!T`jk@Bj7;m8l5-OA
zi|8}dHvyp$>5>ljdJJTm73sV03D*|gw$tnN>^wD0ZvuAUI*|W)b*Iuy>b{GfnHp#;
z)Vdl}Wx2`ww#QCdA~lh$0`xHQ9mWux|Nd15=H&E77cQHkxpG#@+QY{ytHqT^tI_ph
nsd())_XuTh@ORiSQ@iA*_wL+Zc(8PL>GrLwl^aVp7mDUDYqWYe

literal 0
HcmV?d00001


From b4b7cf2e08527184a47223c5115a61d204bed6cd Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Sat, 1 Apr 2023 19:56:02 +0200
Subject: [PATCH 11/12] remove combaticon settings - no more needed

---
 core/mOptions.lua    | 14 -------
 misc/mCombatIcon.lua | 92 --------------------------------------------
 2 files changed, 106 deletions(-)
 delete mode 100644 misc/mCombatIcon.lua

diff --git a/core/mOptions.lua b/core/mOptions.lua
index f4e5252d..75932f5d 100644
--- a/core/mOptions.lua
+++ b/core/mOptions.lua
@@ -410,13 +410,6 @@ local function OptionsCore()
 						childGroups = "tab",
 						args = {},
 					},
-					customcombaticon = {
-						order = 5,
-						type = "group",
-						name = L["Custom Combaticons"],
-						childGroups = "tab",
-						args = {},
-					},
 					customclasscolors = {
 						order = 6,
 						type = "group",
@@ -840,13 +833,6 @@ local function OptionsCoreClassic()
 				type = "group",
 				name = L["Cosmetic"],
 				args = {
-					customcombaticon = {
-						order = 5,
-						type = "group",
-						name = L["Custom Combaticons"],
-						childGroups = "tab",
-						args = {},
-					},
 					rolesymbols = {
 						order = 1,
 						type = "group",
diff --git a/misc/mCombatIcon.lua b/misc/mCombatIcon.lua
deleted file mode 100644
index d5473d4e..00000000
--- a/misc/mCombatIcon.lua
+++ /dev/null
@@ -1,92 +0,0 @@
-local E, L, V, P, G = unpack(ElvUI)
-local mPlugin = "mMediaTag"
-local mMT = E:GetModule(mPlugin)
-
-local addon, ns = ...
-local UF = E:GetModule("UnitFrames")
-local mInsert = table.insert
-
-local function getIcons()
-    return {
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\combat1.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 1",
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\combat2.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 2",
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\fire1.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 3",
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\fire9.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 4",
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\lightning7.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 5",
-        E:TextureString("Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\lightning9.tga", ":16:16:0:0:64:64:4:60:4:60") .. "Combat 6",
-    }
-end
-
-local function setIcons()
-    local icons = {
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\combat1.tga",
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\combat2.tga",
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\fire1.tga",
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\fire9.tga",
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\lightning7.tga",
-        "Interface\\AddOns\\ElvUI_mMediaTag\\media\\icons\\lightning9.tga",
-    }
-    E.db.unitframe.units.player.CombatIcon.customTexture = icons[E.db[mPlugin].mCustomCombatIcons]
-	E.db.unitframe.units.target.CombatIcon.customTexture = icons[E.db[mPlugin].mCustomCombatIcons]
-	E.db.unitframe.units.party.CombatIcon.customTexture = icons[E.db[mPlugin].mCustomCombatIcons]
-    UF:CreateAndUpdateUF("player")
-    UF:CreateAndUpdateUF("target")
-    UF:TestingDisplay_CombatIndicator(UF["player"])
-    UF:TestingDisplay_CombatIndicator(UF["target"])
-end
-
-local function CustomCombatiocn()
-	E.Options.args.mMediaTag.args.cosmetic.args.customcombaticon.args = {
-		combaticonheader = {
-			order = 1,
-			type = "header",
-			name = L["Custom Combat Icons"],
-		},
-		combaticon = {
-			order = 2,
-			type = "toggle",
-			name = L["Custom Combat Icons"],
-			desc = L["This will enable and change the ElvUI combaticons to customicons"],
-			get = function(info)
-				return (
-					E.db.unitframe.units.player.CombatIcon.texture == "CUSTOM"
-					and E.db.unitframe.units.target.CombatIcon.texture == "CUSTOM" and E.db.unitframe.units.party.CombatIcon.texture == "CUSTOM"
-				)
-			end,
-			set = function(info, value)
-				if value then
-					E.db.unitframe.units.player.CombatIcon.texture = "CUSTOM"
-					E.db.unitframe.units.target.CombatIcon.texture = "CUSTOM"
-					E.db.unitframe.units.party.CombatIcon.texture = "CUSTOM"
-				else
-					E.db.unitframe.units.player.CombatIcon.texture = "DEFAULT"
-					E.db.unitframe.units.target.CombatIcon.texture = "DEFAULT"
-					E.db.unitframe.units.party.CombatIcon.texture = "DEFAULT"
-				end
-			end,
-		},
-		combaticontexture = {
-			order = 3,
-			type = "select",
-			name = L["Backdrop Texture"],
-			values = function()
-                return getIcons()
-            end,
-			disabled = function()
-				return not (
-					E.db.unitframe.units.player.CombatIcon.texture == "CUSTOM"
-					and E.db.unitframe.units.target.CombatIcon.texture == "CUSTOM" and E.db.unitframe.units.party.CombatIcon.texture == "CUSTOM"
-				)
-			end,
-			get = function(info)
-				return E.db[mPlugin].mCustomCombatIcons
-			end,
-			set = function(info, value)
-                E.db[mPlugin].mCustomCombatIcons = value
-                setIcons()
-			end,
-		},
-	}
-end
-
-mInsert(ns.Config, CustomCombatiocn)

From d4fb47a8562339cec5f69e965990890967a75432 Mon Sep 17 00:00:00 2001
From: mBlinkii <mtvnow@gmx.de>
Date: Sat, 1 Apr 2023 20:07:24 +0200
Subject: [PATCH 12/12] ## [ver. 2.95] - 01.04.2023 ### Update - FIX
 Healthmarker - if no Healthbar - FIX Game Menu - Talent button - UPDATE
 Combinations now available in the ElvUI dropdown menu - NEW Mail Icons - NEW
 Gradient interrupt colors - NEW Interrupt ready marker

---
 CHANGELOG                    |  9 +++++++++
 ElvUI_mMediaTag.toc          |  2 +-
 ElvUI_mMediaTag_Classic.toc  |  2 +-
 ElvUI_mMediaTag_Mainline.toc |  2 +-
 ElvUI_mMediaTag_Wrath.toc    |  2 +-
 core/mChangelog.lua          |  2 +-
 core/mSettings.lua           | 20 ++++++++++----------
 misc/load_misc.xml           |  1 -
 misc/load_misc_classic.xml   |  1 -
 9 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 16b5a54c..c6edd463 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,15 @@
 [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] - 01.04.2023
+### Update
+- FIX Healthmarker - if no Healthbar
+- FIX Game Menu - Talent button
+- UPDATE Combinations now available in the ElvUI dropdown menu
+- NEW Mail Icons
+- NEW Gradient interrupt colors
+- NEW Interrupt ready marker
+
 ## [ver. 2.94] - 22.03.2023
 ### Update
 - UPDATE TOC update
diff --git a/ElvUI_mMediaTag.toc b/ElvUI_mMediaTag.toc
index 22d4b347..c6b38700 100644
--- 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.94
+## Version: 2.95
 ## 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
index 0f98fcd7..3c62a167 100644
--- 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.94
+## Version: 2.95
 ## 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
index eced3856..dc1dbb03 100644
--- 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.94
+## Version: 2.95
 ## 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
index 086a8b52..e91a4530 100644
--- 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.94
+## Version: 2.95
 ## Notes: ElvUI Plugin from Blinkii@Eu-Arygos | Support: mMediaTag@gmx.de
 ## RequiredDeps: ElvUI
 ## DefaultState: Enabled
diff --git a/core/mChangelog.lua b/core/mChangelog.lua
index e28eb7fa..1961f816 100644
--- a/core/mChangelog.lua
+++ b/core/mChangelog.lua
@@ -9,7 +9,7 @@ local format = format
 
 --Variables
 local ChangelogText =
-	"## [ver. 2.94] - 22.03.2023\n\n### Update\n- |CFFFF7F50Update|r TOC update\n- |CFFFF7F50Update|r Update NP Healthmarker\n- |CFFFF7F50Update|r Currencys Icons to fit the text size\n\n\n\n\n|CFF6495EDIMPORTANT INFO -- With the next version of mMediaTag, the settings of mMediaTag will be reset. This is done for optimisation and because over time many corpses have accumulated in the settings.|r"
+	"## [ver. 2.95] - 01.04.2023\n\n- FIX Healthmarker - if no Healthbar\n- FIX Game Menu - Talent button\n- UPDATE Combinations now available in the ElvUI dropdown menu\n- NEW Mail Icons\n- NEW Gradient interrupt colors\n- NEW Interrupt ready marker"
 
 function mMT:Changelog(opt)
 	local Frame = CreateFrame("Frame", "mMediaTagChangelog", E.UIParent, "BackdropTemplate")
diff --git a/core/mSettings.lua b/core/mSettings.lua
index 08837eb0..d43ff3e8 100644
--- a/core/mSettings.lua
+++ b/core/mSettings.lua
@@ -400,9 +400,9 @@ P[mPlugin] = {
 		["enable"] = true,
 		["gardient"] = true,
 		["kickcd"] = {
-			["r"] = 0.545098,
+			["r"] = 1,
 			["g"] = 0,
-			["b"] = 0.545098,
+			["b"] = 1,
 		},
 		["readymarker"] = {
 			["r"] = 0.545098,
@@ -410,20 +410,20 @@ P[mPlugin] = {
 			["b"] = 0.545098,
 		},
 		["kickcdb"] = {
-			["r"] = 0.545098,
+			["r"] = 0.56,
 			["g"] = 0,
-			["b"] = 0.545098,
+			["b"] = 0.56,
 		},
 		["kickintime"] = {
-			["r"] = 0,
-			["g"] = 0.74902,
-			["b"] = 1,
+			["r"] = 0.03,
+			["g"] = 0.93,
+			["b"] = 0.2,
 		},
 		["inactivetime"] = .8,
 		["kickintimeb"] = {
-			["r"] = 0,
-			["g"] = 0.74902,
-			["b"] = 1,
+			["r"] = 0.08,
+			["g"] = 0.5,
+			["b"] = 0.57,
 		},
 	},
 	["mHealthmarker"] = {
diff --git a/misc/load_misc.xml b/misc/load_misc.xml
index 7c7542ec..9d3f3d50 100644
--- a/misc/load_misc.xml
+++ b/misc/load_misc.xml
@@ -8,7 +8,6 @@
 	<Script file="mCustomClassColors.lua"/>
 	<Script file="mBGTexture.lua"/>
 	<Script file="mCastbar.lua"/>
-	<Script file="mCombatIcon.lua"/>
 	<Script file="mDungeon.lua"/>
 	<Script file="mFPSMS.lua"/>
 	<Script file="mFunctionsMisc.lua"/>
diff --git a/misc/load_misc_classic.xml b/misc/load_misc_classic.xml
index 06ab1146..0bdd73dc 100644
--- a/misc/load_misc_classic.xml
+++ b/misc/load_misc_classic.xml
@@ -13,7 +13,6 @@
 	<Script file="mTools.lua"/>
 	<Script file="mCoordinatesX.lua"/>
 	<Script file="mCoordinatesY.lua"/>
-	<Script file="mCombatIcon.lua"/>
 	<Script file="mFPSMS.lua"/>
 	<Include file="Dock\load_dock_classic.xml"/>
 	<Script file="mBGTexture.lua"/>