Quantcast

- Added TitanClassicRegen back into the core package.

HonorGoG [09-13-19 - 21:42]
- Added TitanClassicRegen back into the core package.
- Added old localization for TitanClassicRegen.
- Updated toc for new plugin inclusion.
Filename
TitanClassic/TitanClassic.toc
TitanClassic/locale/Localization.BR.lua
TitanClassic/locale/Localization.CN.lua
TitanClassic/locale/Localization.DE.lua
TitanClassic/locale/Localization.ES.lua
TitanClassic/locale/Localization.FR.lua
TitanClassic/locale/Localization.IT.lua
TitanClassic/locale/Localization.KR.lua
TitanClassic/locale/Localization.RU.lua
TitanClassic/locale/Localization.TW.lua
TitanClassic/locale/Localization.lua
TitanClassicAmmo/TitanClassicAmmo.toc
TitanClassicBag/TitanClassicBag.toc
TitanClassicClock/TitanClassicClock.toc
TitanClassicGold/TitanClassicGold.toc
TitanClassicLocation/TitanClassicLocation.toc
TitanClassicLootType/TitanClassicLootType.toc
TitanClassicPerformance/TitanClassicPerformance.toc
TitanClassicRegen/TitanRegen.lua
TitanClassicRegen/TitanRegen.toc
TitanClassicRegen/TitanRegen.xml
TitanClassicRepair/TitanClassicRepair.lua
TitanClassicRepair/TitanClassicRepair.toc
TitanClassicVolume/TitanClassicVolume.toc
TitanClassicXP/TitanClassicXP.toc
diff --git a/TitanClassic/TitanClassic.toc b/TitanClassic/TitanClassic.toc
index 9173380..935c517 100644
--- a/TitanClassic/TitanClassic.toc
+++ b/TitanClassic/TitanClassic.toc
@@ -1,7 +1,7 @@
 ## Interface: 11302
-## Title: Titan Panel Classic |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic |cff00aa001.1.0.11302|r
 ## Author: Titan Panel Development Team
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat
 ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu
 ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins.
diff --git a/TitanClassic/locale/Localization.BR.lua b/TitanClassic/locale/Localization.BR.lua
index 6a2ff18..da08882 100644
--- a/TitanClassic/locale/Localization.BR.lua
+++ b/TitanClassic/locale/Localization.BR.lua
@@ -453,6 +453,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Est. Gains: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "XP Gains To Level (at %s XP gained last): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Exibir Estimated XP Gains To Level";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Health: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Conserto",
@@ -496,7 +511,7 @@ L["REPAIR_LOCALE"] = {
 	TooltipOptions = "Tooltip",
 };

-L["TITAN_REPAIR"] = "Titan Consertos"
+L["TITAN_REPAIR"] = "Titan Classic Consertos"
 L["TITAN_REPAIR_CANNOT_AFFORD"] = "You cannot afford to repair, at this time."
 L["TITAN_REPAIR_REPORT_COST_MENU"] = "Report Repair Cost to Chat"
 L["TITAN_REPAIR_REPORT_COST_CHAT"] = "Custo de conserto foi "
diff --git a/TitanClassic/locale/Localization.CN.lua b/TitanClassic/locale/Localization.CN.lua
index d2ae0fb..8fa71a3 100644
--- a/TitanClassic/locale/Localization.CN.lua
+++ b/TitanClassic/locale/Localization.CN.lua
@@ -451,6 +451,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "预估获得经验: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "升级所需杀怪数 (基于最后杀怪所获%s点经验): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "显示升级所需(基于最后一次所获经验)";

+L["TITAN_REGEN_MENU_TEXT"] = "恢复"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "恢复速度"
+L["TITAN_REGEN_MENU_SHOW2"] = "生命值"
+L["TITAN_REGEN_MENU_SHOW3"] = "法力值"
+L["TITAN_REGEN_MENU_SHOW4"] = "显示百分比"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "法力值: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = "生命值: "
+L["TITAN_REGEN_TOOLTIP1"] = "生命值: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "法力值: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "最快生命回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "最慢生命回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "最快法力回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "最慢法力回复速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "上次战斗法力回复值: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "修理",
diff --git a/TitanClassic/locale/Localization.DE.lua b/TitanClassic/locale/Localization.DE.lua
index 8a688e7..c850211 100644
--- a/TitanClassic/locale/Localization.DE.lua
+++ b/TitanClassic/locale/Localization.DE.lua
@@ -451,6 +451,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Ca. XP-Boni: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "XP-Boni bis Levelaufstieg (bei %s XP zuletzt): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Zeige ungef\195\164hre XP Boni bis zum Levelaufstieg";

+L["TITAN_REGEN_MENU_TEXT"] = "Regeneration"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"]     = "Regenerationsrate"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "Als Prozentsatz"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Gesundheit: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Beste HP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Schlechteste HP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Beste MP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Schlechteste MP Regeneration: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regeneration im letzten Kampf: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Reparieren",
@@ -493,7 +508,7 @@ L["REPAIR_LOCALE"] = {
 	CostEquip = "Kosten f\195\188r angelegte Gegenst\195\164nde",
 	TooltipOptions = "Tooltip",
 };
-L["TITAN_REPAIR"] = "Titan Repair"
+L["TITAN_REPAIR"] = "Titan Classic Repair"
 L["TITAN_REPAIR_CANNOT_AFFORD"] = "Du kannst es Dir momentan nicht leisten, deine Gegenst\195\164nde zu reparieren."
 L["TITAN_REPAIR_REPORT_COST_MENU"] = "Schreibe Reparaturkosten in den Chat"
 L["TITAN_REPAIR_REPORT_COST_CHAT"] = "Die Reparaturkosten betrugen "
diff --git a/TitanClassic/locale/Localization.ES.lua b/TitanClassic/locale/Localization.ES.lua
index d5b90ad..d5013ed 100644
--- a/TitanClassic/locale/Localization.ES.lua
+++ b/TitanClassic/locale/Localization.ES.lua
@@ -467,6 +467,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Gananc. Est.: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Ganancias de XP para subir (a %s XP ganados la útltima vez): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Mostrar ganancias de XP estimadas para subir";

+L["TITAN_REGEN_MENU_TEXT"] = "Regeneración"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Ratios de regeneración"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "Como porcentaje"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Salud: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Maná: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Mejor regeneración de HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Peor regeneración de HP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Mejor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Peor regeneración de MP : \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Regeneración de MP en último combate: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Reparación",
@@ -510,7 +525,7 @@ L["REPAIR_LOCALE"] = {
 	CostEquip = "Coste del equipo",
 };

-L["TITAN_REPAIR"] = "Titan Repair"
+L["TITAN_REPAIR"] = "Titan Classic Repair"
 L["TITAN_REPAIR_CANNOT_AFFORD"] = "No puedes permitirte reparar, en este momento."
 L["TITAN_REPAIR_REPORT_COST_MENU"] = "Informar en el chat del coste de la reparación"
 L["TITAN_REPAIR_REPORT_COST_CHAT"] = "El coste de la reparación ha sido "
diff --git a/TitanClassic/locale/Localization.FR.lua b/TitanClassic/locale/Localization.FR.lua
index b3cf6d7..2297c56 100644
--- a/TitanClassic/locale/Localization.FR.lua
+++ b/TitanClassic/locale/Localization.FR.lua
@@ -453,6 +453,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Est. des gains : ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Gains d'XP pour passer de niveau (à %s XP gagné): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "les estimations de gains d'XP pour monter";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Taux de regen"
+L["TITAN_REGEN_MENU_SHOW2"] = "Sant\195\169 (HP)"
+L["TITAN_REGEN_MENU_SHOW3"] = "Mana (MP)"
+L["TITAN_REGEN_MENU_SHOW4"] = "Double d\195\169cimale"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Sant\195\169 (HP): \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana (MP): \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Meilleur Regen HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Plus mauvais Regen HP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Meilleur Regen MP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Plus mauvais Regen MP: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Regen MP du dernier combat: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Réparation",
@@ -495,7 +510,7 @@ L["REPAIR_LOCALE"] = {
 	CostEquip = "Coût de l'équipement",
 	TooltipOptions = "Tooltip",
 };
-L["TITAN_REPAIR"] = "Titan Repair"
+L["TITAN_REPAIR"] = "Titan Classic Repair"
 L["TITAN_REPAIR_CANNOT_AFFORD"] = "Vous n'avez pas assez pour payer les réparations."
 L["TITAN_REPAIR_REPORT_COST_MENU"] = "Annoncer les coût de réparation sur le chat"
 L["TITAN_REPAIR_REPORT_COST_CHAT"] = "Coût des réparations : "
diff --git a/TitanClassic/locale/Localization.IT.lua b/TitanClassic/locale/Localization.IT.lua
index e8fd49a..a9f811d 100644
--- a/TitanClassic/locale/Localization.IT.lua
+++ b/TitanClassic/locale/Localization.IT.lua
@@ -451,6 +451,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Incrementi PE da ott.: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Incrementi PE al prossimo lv. (%s PE ottenuti l'ultima volta): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Mostra incrementi PE al prossimo lv";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Health: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Riparazione",
diff --git a/TitanClassic/locale/Localization.KR.lua b/TitanClassic/locale/Localization.KR.lua
index 48eed39..c8df241 100644
--- a/TitanClassic/locale/Localization.KR.lua
+++ b/TitanClassic/locale/Localization.KR.lua
@@ -450,6 +450,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "획득: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "레벨당 획득한 경험치 (최근 획득한 경험치 %s 기준): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "레벨당 경험치 획득 표시";

+L["TITAN_REGEN_MENU_TEXT"] = "Regen"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Regen Info"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "As Percentage"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "HP: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " MP: "
+L["TITAN_REGEN_TOOLTIP1"] = "Health: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Mana: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Best HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Worst HP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Best MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Worst MP Regen: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "MP Regen in Last Fight: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "수리",
diff --git a/TitanClassic/locale/Localization.RU.lua b/TitanClassic/locale/Localization.RU.lua
index 7db427c..f7943c0 100644
--- a/TitanClassic/locale/Localization.RU.lua
+++ b/TitanClassic/locale/Localization.RU.lua
@@ -451,6 +451,21 @@ L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "Получение опыта: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "Опыта до уровня (%s опыта в последний раз): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "Показать необходимый опыт до уровня";

+L["TITAN_REGEN_MENU_TEXT"] = "Регенерация"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"] = "Информация о регенерации"
+L["TITAN_REGEN_MENU_SHOW2"] = "ЗД"
+L["TITAN_REGEN_MENU_SHOW3"] = "МН"
+L["TITAN_REGEN_MENU_SHOW4"] = "в процентах"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "ЗД: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = " МН: "
+L["TITAN_REGEN_TOOLTIP1"] = "Здоровье: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "Мана: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "Лучшая регенерация ЗД: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "Худшая регенерация ЗД: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "Лучшая регенерация МН: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "Худшая регенерация МН: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "Регенерация МН в последней схватке: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 --Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "Ремонт",
diff --git a/TitanClassic/locale/Localization.TW.lua b/TitanClassic/locale/Localization.TW.lua
index 8d047d9..f9d4a54 100644
--- a/TitanClassic/locale/Localization.TW.lua
+++ b/TitanClassic/locale/Localization.TW.lua
@@ -450,7 +450,22 @@ L["TITAN_XP_GAIN_PATTERN"] = "(.*)死亡,你獲得(%d+)點經驗。";
 L["TITAN_XP_XPGAINS_LABEL_SHORT"] = "預估獲得經驗: ";
 L["TITAN_XP_XPGAINS_LABEL"] = "升級所需擊殺數(基於最後擊殺獲得的%s點經驗): ";
 L["TITAN_XP_MENU_SIMPLE_BUTTON_XPGAIN"] = "顯示升級所需(基於最後所獲經驗)";
-
+
+L["TITAN_REGEN_MENU_TEXT"] = "角色恢復速度"
+L["TITAN_REGEN_MENU_TOOLTIP_TITLE"]	= "恢復速率"
+L["TITAN_REGEN_MENU_SHOW2"] = "HP"
+L["TITAN_REGEN_MENU_SHOW3"] = "MP"
+L["TITAN_REGEN_MENU_SHOW4"] = "顯示百分比"
+L["TITAN_REGEN_BUTTON_TEXT_HP"] = "法力值: "
+L["TITAN_REGEN_BUTTON_TEXT_MP"] = "生命值: "
+L["TITAN_REGEN_TOOLTIP1"] = "生命: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP2"] = "法力: \t"..GREEN_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." / " ..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..RED_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE..")";
+L["TITAN_REGEN_TOOLTIP3"] = "最高 HP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP4"] = "最低 HP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP5"] = "最高 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP6"] = "最低 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE;
+L["TITAN_REGEN_TOOLTIP7"] = "上一場戰鬥的 MP 恢復速度: \t"..HIGHLIGHT_FONT_COLOR_CODE.."%d"..FONT_COLOR_CODE_CLOSE.." ("..GREEN_FONT_COLOR_CODE.."%.2f"..FONT_COLOR_CODE_CLOSE.."%%)";
+
 -- Titan Repair
 L["REPAIR_LOCALE"] = {
 	menu = "裝備耐久度",
diff --git a/TitanClassic/locale/Localization.lua b/TitanClassic/locale/Localization.lua
index 73461f0..a8b3a59 100644
--- a/TitanClassic/locale/Localization.lua
+++ b/TitanClassic/locale/Localization.lua
@@ -498,7 +498,7 @@ L["REPAIR_LOCALE"] = {
 	CostEquip = "Equip Cost",
 	TooltipOptions = "Tooltip",
 };
-L["TITAN_REPAIR"] = "Titan Repair"
+L["TITAN_REPAIR"] = "Titan Classic Repair"
 L["TITAN_REPAIR_GBANK_TOTAL"] = "Guild Bank Funds :"
 L["TITAN_REPAIR_GBANK_WITHDRAW"] = "Guild Bank Withdrawal Allowed :"
 L["TITAN_REPAIR_GBANK_USEFUNDS"] = "Use Guild Bank Funds"
diff --git a/TitanClassicAmmo/TitanClassicAmmo.toc b/TitanClassicAmmo/TitanClassicAmmo.toc
index 4a58539..eb89b79 100644
--- a/TitanClassicAmmo/TitanClassicAmmo.toc
+++ b/TitanClassicAmmo/TitanClassicAmmo.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fAmmo|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fAmmo|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds an ammo monitor to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicAmmo.xml
\ No newline at end of file
diff --git a/TitanClassicBag/TitanClassicBag.toc b/TitanClassicBag/TitanClassicBag.toc
index d2ca0cc..9ea3159 100644
--- a/TitanClassicBag/TitanClassicBag.toc
+++ b/TitanClassicBag/TitanClassicBag.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fBag|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fBag|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds bag and free slot information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicBag.xml
diff --git a/TitanClassicClock/TitanClassicClock.toc b/TitanClassicClock/TitanClassicClock.toc
index a7a2d54..2c4e977 100644
--- a/TitanClassicClock/TitanClassicClock.toc
+++ b/TitanClassicClock/TitanClassicClock.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fClock|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fClock|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds a clock to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicClock.xml
diff --git a/TitanClassicGold/TitanClassicGold.toc b/TitanClassicGold/TitanClassicGold.toc
index 7d40373..f14b3e3 100644
--- a/TitanClassicGold/TitanClassicGold.toc
+++ b/TitanClassicGold/TitanClassicGold.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fGold|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fGold|r] |cff00aa001.1.0.11302|r
 ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis.
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables: GoldSave
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicGold.xml
diff --git a/TitanClassicLocation/TitanClassicLocation.toc b/TitanClassicLocation/TitanClassicLocation.toc
index 2fe5f73..89a6e88 100644
--- a/TitanClassicLocation/TitanClassicLocation.toc
+++ b/TitanClassicLocation/TitanClassicLocation.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fLocation|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fLocation|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds coordinates and location information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicLocation.xml
diff --git a/TitanClassicLootType/TitanClassicLootType.toc b/TitanClassicLootType/TitanClassicLootType.toc
index 8cadac2..d7fe5a6 100644
--- a/TitanClassicLootType/TitanClassicLootType.toc
+++ b/TitanClassicLootType/TitanClassicLootType.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fLootType|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fLootType|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds group loot and instance difficulty information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicLootType.xml
diff --git a/TitanClassicPerformance/TitanClassicPerformance.toc b/TitanClassicPerformance/TitanClassicPerformance.toc
index 0150155..42aa2fa 100644
--- a/TitanClassicPerformance/TitanClassicPerformance.toc
+++ b/TitanClassicPerformance/TitanClassicPerformance.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fPerformance|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fPerformance|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds FPS and Garbage collection information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicPerformance.xml
diff --git a/TitanClassicRegen/TitanRegen.lua b/TitanClassicRegen/TitanRegen.lua
new file mode 100644
index 0000000..31caf50
--- /dev/null
+++ b/TitanClassicRegen/TitanRegen.lua
@@ -0,0 +1,326 @@
+-- **************************************************************************
+-- * TitanClassicRegen.lua
+-- *
+-- * By: TitanMod, Dark Imakuni, Adsertor and the Titan Panel Development Team
+-- **************************************************************************
+
+-- ******************************** Constants *******************************
+local TITAN_REGEN_ID = "Regen"
+local TITAN_REGEN_HP_FORMAT = "%d";
+local TITAN_REGEN_HP_FORMAT_PERCENT = "%.2f";
+local TITAN_REGEN_MP_FORMAT = "%d";
+local TITAN_REGEN_MP_FORMAT_PERCENT = "%.2f";
+local updateTable = {TITAN_REGEN_ID, TITAN_PANEL_UPDATE_ALL};
+-- ******************************** Variables *******************************
+local TITAN_RegenCurrHealth = 0;
+local TITAN_RegenCurrMana = 0;
+local TITAN_RegenMP         = 0;
+local TITAN_RegenHP         = 0;
+local TITAN_RegenCheckedManaState = 0;
+local TITAN_RegenMaxHPRate = 0;
+local TITAN_RegenMinHPRate = 9999;
+local TITAN_RegenMaxMPRate = 0;
+local TITAN_RegenMinMPRate = 9999;
+local TITAN_RegenMPDuringCombat = 0;
+local TITAN_RegenMPCombatTrack = 0;
+local L = LibStub("AceLocale-3.0"):GetLocale("TitanClassic", true)
+-- ******************************** Functions *******************************
+
+-- **************************************************************************
+-- NAME : TitanRegenTemp_GetColoredTextRGB(text, r, g, b)
+-- DESC : Define colors for colored text and display
+-- VARS : text = text to display, r = red value, g = green value, b = blue value
+-- **************************************************************************
+local function TitanRegenTemp_GetColoredTextRGB(text, r, g, b)
+     if (text and r and g and b) then
+          local redColorCode = format("%02x", r * 255);
+          local greenColorCode = format("%02x", g * 255);
+          local blueColorCode = format("%02x", b * 255);
+          local colorCode = "|cff"..redColorCode..greenColorCode..blueColorCode;
+          return colorCode..text..FONT_COLOR_CODE_CLOSE;
+     end
+end
+
+-- **************************************************************************
+-- NAME : TitanPanelTitanRegenButton_OnLoad()
+-- DESC : Registers the plugin upon it loading
+-- **************************************************************************
+function TitanPanelTitanRegenButton_OnLoad(self)
+     self.registry = {
+          id = TITAN_REGEN_ID,
+		  category = "Built-ins",
+          version = TITAN_VERSION,
+          menuText = L["TITAN_REGEN_MENU_TEXT"],
+          buttonTextFunction = "TitanPanelTitanRegenButton_GetButtonText",
+          tooltipTitle = L["TITAN_REGEN_MENU_TOOLTIP_TITLE"],
+          tooltipTextFunction = "TitanPanelTitanRegenButton_GetTooltipText",
+		controlVariables = {
+			ShowIcon = false,
+			ShowLabelText = true,
+			ShowRegularText = false,
+			ShowColoredText = false,
+			DisplayOnRightSide = false
+		},
+          savedVariables = {
+               ShowLabelText = 1,
+               ShowMPRegen = 1,
+               ShowHPRegen = 1,
+               ShowPercentage = false,
+               ShowColoredText = false
+          }
+
+     };
+
+     self:RegisterEvent("UNIT_HEALTH");
+     self:RegisterEvent("UNIT_MANA");
+     self:RegisterEvent("PLAYER_ENTERING_WORLD");
+     self:RegisterEvent("PLAYER_REGEN_DISABLED");
+     self:RegisterEvent("PLAYER_REGEN_ENABLED");
+end
+
+-- **************************************************************************
+-- NAME : TitanPanelXPButton_OnEvent
+-- DESC : Parse events registered to addon and act on them
+-- **************************************************************************
+function TitanPanelTitanRegenButton_OnEvent(self, event, a1, ...)
+     if ( event == "PLAYER_ENTERING_WORLD") then
+          if (UnitManaMax("player") == 0) then
+               TitanSetVar(TITAN_REGEN_ID, "ShowMPRegen", 0);
+          end
+     end
+
+     if ( event == "PLAYER_REGEN_DISABLED") then
+          TITAN_RegenMPDuringCombat = 0;
+          TITAN_RegenMPCombatTrack = 1;
+     end
+
+     if ( event == "PLAYER_REGEN_ENABLED") then
+          TITAN_RegenMPCombatTrack = 0;
+     end
+
+     local currHealth = 0;
+     local currMana = 0;
+     local runUpdate = 0;
+
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen") == 1) then
+          if ( event == "UNIT_HEALTH" and a1 == "player" ) then
+               currHealth = UnitHealth("player");
+               runUpdate = 1;
+               if ( currHealth > TITAN_RegenCurrHealth and TITAN_RegenCurrHealth ~= 0 ) then
+                    TITAN_RegenHP = currHealth-TITAN_RegenCurrHealth;
+
+                    if (TITAN_RegenHP > TITAN_RegenMaxHPRate) then
+                         TITAN_RegenMaxHPRate = TITAN_RegenHP;
+                    end
+                    if (TITAN_RegenHP < TITAN_RegenMinHPRate or TITAN_RegenMinHPRate == 9999) then
+                         TITAN_RegenMinHPRate = TITAN_RegenHP;
+                    end
+               end
+               TITAN_RegenCurrHealth = currHealth;
+          end
+     end
+
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen") == 1) then
+          if ( event == "UNIT_MANA" and a1 == "player" ) then
+               currMana = UnitMana("player");
+               runUpdate = 1;
+               if ( currMana  > TITAN_RegenCurrMana and TITAN_RegenCurrMana ~= 0 ) then
+                    TITAN_RegenMP = currMana-TITAN_RegenCurrMana;
+
+                    if (TITAN_RegenMPCombatTrack == 1) then
+                         TITAN_RegenMPDuringCombat = TITAN_RegenMPDuringCombat + TITAN_RegenMP;
+                    end
+
+                    if (TITAN_RegenMP > TITAN_RegenMaxMPRate) then
+                         TITAN_RegenMaxMPRate = TITAN_RegenMP;
+                    end
+                    if (TITAN_RegenMP < TITAN_RegenMinMPRate or TITAN_RegenMinMPRate == 9999) then
+                         TITAN_RegenMinMPRate = TITAN_RegenMP;
+                    end
+               end
+               TITAN_RegenCurrMana = currMana;
+          end
+     end
+
+     if (runUpdate == 1) then
+         TitanPanelPluginHandle_OnUpdate(updateTable)
+     end
+end
+
+-- **************************************************************************
+-- NAME : TitanPanelTitanRegenButton_GetButtonText(id)
+-- DESC : Calculate regeneration logic for button text
+-- VARS : id = button ID
+-- **************************************************************************
+function TitanPanelTitanRegenButton_GetButtonText(id)
+     local labelTextHP = "";
+     local valueTextHP = "";
+     local labelTextMP = "";
+     local valueTextMP = "";
+     local OutputStr = "";
+
+     if UnitHealth("player") == UnitHealthMax("player") then
+          TITAN_RegenHP = 0;
+     end
+     if UnitMana("player") == UnitManaMax("player") then
+          TITAN_RegenMP = 0;
+     end
+
+     -- safety in case both are off, then cant ever turn em on
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen") == nil and TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen") == nil) then
+          TitanSetVar(TITAN_REGEN_ID,"ShowHPRegen",1);
+     end
+
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen") == 1) then
+          labelTextHP = L["TITAN_REGEN_BUTTON_TEXT_HP"];
+          if (TitanGetVar(TITAN_REGEN_ID,"ShowPercentage") == 1) then
+               valueTextHP = format(TITAN_REGEN_HP_FORMAT_PERCENT, (TITAN_RegenHP/UnitHealthMax("player"))*100);
+          else
+               valueTextHP = format(TITAN_REGEN_HP_FORMAT, TITAN_RegenHP);
+          end
+          if (TitanGetVar(TITAN_REGEN_ID, "ShowColoredText")) then
+               valueTextHP = TitanUtils_GetGreenText(valueTextHP);
+          else
+               valueTextHP = TitanUtils_GetHighlightText(valueTextHP);
+          end
+     end
+
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen") == 1) then
+          labelTextMP = L["TITAN_REGEN_BUTTON_TEXT_MP"];
+          if (TitanGetVar(TITAN_REGEN_ID,"ShowPercentage") == 1) then
+               valueTextMP = format(TITAN_REGEN_MP_FORMAT_PERCENT, (TITAN_RegenMP/UnitManaMax("player"))*100);
+          else
+               valueTextMP = format(TITAN_REGEN_MP_FORMAT, TITAN_RegenMP);
+          end
+          if (TitanGetVar(TITAN_REGEN_ID, "ShowColoredText")) then
+               valueTextMP = TitanRegenTemp_GetColoredTextRGB(valueTextMP, 0.0, 0.0, 1.0);
+          else
+               valueTextMP = TitanUtils_GetHighlightText(valueTextMP);
+          end
+     end
+
+     -- supports turning off labels
+     return labelTextHP, valueTextHP, labelTextMP, valueTextMP;
+end
+
+-- **************************************************************************
+-- NAME : TitanPanelTitanRegenButton_GetTooltipText()
+-- DESC : Display tooltip text
+-- **************************************************************************
+function TitanPanelTitanRegenButton_GetTooltipText()
+
+     local minHP = TITAN_RegenMinHPRate;
+     local minMP = TITAN_RegenMinMPRate;
+
+     if minHP == 9999 then minHP = 0 end;
+     if minMP == 9999 then minMP = 0 end;
+
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen") == 1) then
+          local regenPercent;
+          regenPercent = (TITAN_RegenMPDuringCombat/UnitManaMax("player"))*100;
+
+          return ""..
+               format(L["TITAN_REGEN_TOOLTIP1"], UnitHealth("player"),UnitHealthMax("player"),UnitHealthMax("player")-UnitHealth("player")).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP2"], UnitMana("player"),UnitManaMax("player"),UnitManaMax("player")-UnitMana("player")).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP3"], TITAN_RegenMaxHPRate).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP4"], minHP).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP5"], TITAN_RegenMaxMPRate).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP6"], minMP).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP7"], TITAN_RegenMPDuringCombat, regenPercent).."\n"
+               ;
+     else
+          return ""..
+               format(L["TITAN_REGEN_TOOLTIP1"], UnitHealth("player"),UnitHealthMax("player"),UnitHealthMax("player")-UnitHealth("player")).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP3"], TITAN_RegenMaxHPRate).."\n"..
+               format(L["TITAN_REGEN_TOOLTIP4"], minHP).."\n"
+               ;
+     end
+end
+
+-- **************************************************************************
+-- NAME : TitanPanelRightClickMenu_PrepareTitanRegenMenu()
+-- DESC : Display rightclick menu options
+-- **************************************************************************
+function TitanPanelRightClickMenu_PrepareTitanRegenMenu()
+     local id = TITAN_REGEN_ID;
+     local info;
+
+     TitanPanelRightClickMenu_AddTitle(TitanPlugins[id].menuText);
+
+     info = {};
+     info.text = L["TITAN_REGEN_MENU_SHOW2"];
+     info.func = TitanRegen_ShowHPRegen;
+     info.checked = TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen");
+     UIDropDownMenu_AddButton(info);
+
+     info = {};
+     info.text = L["TITAN_REGEN_MENU_SHOW3"];
+     info.func = TitanRegen_ShowMPRegen;
+     info.checked = TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen");
+     UIDropDownMenu_AddButton(info);
+
+     info = {};
+     info.text = L["TITAN_REGEN_MENU_SHOW4"];
+     info.func = TitanRegen_ShowPercentage;
+     info.checked = TitanGetVar(TITAN_REGEN_ID,"ShowPercentage");
+     UIDropDownMenu_AddButton(info);
+
+     TitanPanelRightClickMenu_AddSpacer();
+
+     info = {};
+     info.text = L["TITAN_PANEL_MENU_SHOW_COLORED_TEXT"];
+     info.func = TitanRegen_ShowColoredText;
+     info.checked = TitanGetVar(TITAN_REGEN_ID, "ShowColoredText");
+     UIDropDownMenu_AddButton(info);
+
+     TitanPanelRightClickMenu_AddToggleLabelText("TitanRegen");
+     TitanPanelRightClickMenu_AddCommand(L["TITAN_PANEL_MENU_HIDE"], id, TITAN_PANEL_MENU_FUNC_HIDE);
+end
+
+-- **************************************************************************
+-- NAME : TitanRegen_UpdateSettings()
+-- DESC : Update button text on setting change
+-- **************************************************************************
+function TitanRegen_UpdateSettings()
+     -- safety in case both are off, then cant ever turn em on
+     if (TitanGetVar(TITAN_REGEN_ID,"ShowHPRegen") == nil and TitanGetVar(TITAN_REGEN_ID,"ShowMPRegen") == nil) then
+          TitanSetVar(TITAN_REGEN_ID,"ShowHPRegen",1);
+     end
+     TitanPanelButton_UpdateButton(TITAN_REGEN_ID);
+end
+
+-- **************************************************************************
+-- NAME : TitanRegen_ShowHPRegen()
+-- DESC : Show HP regeneration option on button
+-- **************************************************************************
+function TitanRegen_ShowHPRegen()
+     TitanToggleVar(TITAN_REGEN_ID, "ShowHPRegen");
+     TitanRegen_UpdateSettings();
+end
+
+-- **************************************************************************
+-- NAME : TitanRegen_ShowMPRegen()
+-- DESC : Show MP regeneration option on button
+-- **************************************************************************
+function TitanRegen_ShowMPRegen()
+     TitanToggleVar(TITAN_REGEN_ID, "ShowMPRegen");
+     TitanRegen_UpdateSettings();
+end
+
+-- **************************************************************************
+-- NAME : TitanRegen_ShowPercentage()
+-- DESC : Show values as percentage option on button
+-- **************************************************************************
+function TitanRegen_ShowPercentage()
+     TitanToggleVar(TITAN_REGEN_ID, "ShowPercentage");
+     TitanRegen_UpdateSettings();
+end
+
+-- **************************************************************************
+-- NAME : TitanRegen_ShowColoredText()
+-- DESC : Show colored text option on button
+-- **************************************************************************
+function TitanRegen_ShowColoredText()
+     TitanToggleVar(TITAN_REGEN_ID, "ShowColoredText");
+     TitanRegen_UpdateSettings();
+end
\ No newline at end of file
diff --git a/TitanClassicRegen/TitanRegen.toc b/TitanClassicRegen/TitanRegen.toc
new file mode 100644
index 0000000..959523d
--- /dev/null
+++ b/TitanClassicRegen/TitanRegen.toc
@@ -0,0 +1,10 @@
+## Interface: 11302
+## Title: Titan Panel Classic [|cffeda55fRegen|r] |cff00aa001.1.0.11302|r
+## Notes: Adds a regen monitor to Titan panel to show HP/MANA regen
+## Author: Titan Panel Development Team (http://www.titanpanel.org)
+## SavedVariables:
+## OptionalDeps:
+## Dependencies: TitanClassic
+## Version: 1.1.0.11302
+## X-Child-Of: TitanClassic
+TitanClassicRegen.xml
\ No newline at end of file
diff --git a/TitanClassicRegen/TitanRegen.xml b/TitanClassicRegen/TitanRegen.xml
new file mode 100644
index 0000000..779f1e0
--- /dev/null
+++ b/TitanClassicRegen/TitanRegen.xml
@@ -0,0 +1,19 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="TitanClassicRegen.lua"/>
+	<Frame parent="UIParent">
+		<Frames>
+			<Button name="TitanPanelTitanRegenButton" inherits="TitanPanelTextTemplate" frameStrata="FULLSCREEN" toplevel="true">
+				<Scripts>
+					<OnLoad>
+						TitanPanelTitanRegenButton_OnLoad(self);
+						TitanPanelButton_OnLoad(self);
+					</OnLoad>
+					<OnEvent>
+						TitanPanelTitanRegenButton_OnEvent(self, event, ...);
+					</OnEvent>
+				</Scripts>
+			</Button>
+		</Frames>
+	</Frame>
+</Ui>
\ No newline at end of file
diff --git a/TitanClassicRepair/TitanClassicRepair.lua b/TitanClassicRepair/TitanClassicRepair.lua
index ca84e01..54385b7 100644
--- a/TitanClassicRepair/TitanClassicRepair.lua
+++ b/TitanClassicRepair/TitanClassicRepair.lua
@@ -1471,51 +1471,20 @@ function TitanRepair_RepairItems()
 	-- New RepairAll function
 	local cost = GetRepairAllCost();
 	local money = GetMoney();
---[[
-	local withdrawLimit = GetGuildBankWithdrawMoney();
-	local guildBankMoney = GetGuildBankMoney();
-
-	-- Use Guild Bank funds
-	if TitanGetVar(TITAN_REPAIR_ID,"UseGuildBank") then
-		if IsInGuild() and CanGuildBankRepair() then
-			if withdrawLimit > cost then
-				RepairAllItems(true)
-				-- disable repair all icon in merchant
-				SetDesaturation(MerchantRepairAllIcon, 1);
-				MerchantRepairAllButton:Disable();
-				-- disable guild bank repair all icon in merchant
-				SetDesaturation(MerchantGuildBankRepairButtonIcon, 1);
-				MerchantGuildBankRepairButton:Disable();
-				-- report repair cost to chat (optional)
-				if TitanGetVar(TITAN_REPAIR_ID,"AutoRepairReport") then
-					DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..":".."|r"..L["TITAN_REPAIR_REPORT_COST_CHAT"]..TitanPanelRepair_GetTextGSC(cost))
-				end
-			else
-				DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..":".."|r"..L["TITAN_REPAIR_GBANK_NOMONEY"])
-			end
-		else
-			DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..":".."|r"..L["TITAN_REPAIR_GBANK_NORIGHTS"])
-		end
-	end
-]]
-
-	-- Use own funds
-	if not TitanGetVar(TITAN_REPAIR_ID,"UseGuildBank") then
-		if money > cost then
-			RepairAllItems()
-			-- disable repair all icon in merchant
-			SetDesaturation(MerchantRepairAllIcon, 1);
-			MerchantRepairAllButton:Disable();
-			-- disable guild bank repair all icon in merchant
-			SetDesaturation(MerchantGuildBankRepairButtonIcon, 1);
-			MerchantGuildBankRepairButton:Disable();
-			-- report repair cost to chat (optional)
-			if TitanGetVar(TITAN_REPAIR_ID,"AutoRepairReport") then
-				DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..": ".."|r"..L["TITAN_REPAIR_REPORT_COST_CHAT"]..TitanPanelRepair_GetTextGSC(cost))
-			end
-		else
-			DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..": ".."|r"..L["TITAN_REPAIR_CANNOT_AFFORD"])
+	if money > cost then
+		RepairAllItems()
+		-- disable repair all icon in merchant
+		SetDesaturation(MerchantRepairAllIcon, 1);
+		MerchantRepairAllButton:Disable();
+		-- disable guild bank repair all icon in merchant
+		SetDesaturation(MerchantGuildBankRepairButtonIcon, 1);
+		MerchantGuildBankRepairButton:Disable();
+		-- report repair cost to chat (optional)
+		if TitanGetVar(TITAN_REPAIR_ID,"AutoRepairReport") then
+			DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..": ".."|r"..L["TITAN_REPAIR_REPORT_COST_CHAT"]..TitanPanelRepair_GetTextGSC(cost)).."|r."
 		end
+	else
+		DEFAULT_CHAT_FRAME:AddMessage(_G["GREEN_FONT_COLOR_CODE"]..L["TITAN_REPAIR"]..": ".."|r"..L["TITAN_REPAIR_CANNOT_AFFORD"])
 	end
 end

diff --git a/TitanClassicRepair/TitanClassicRepair.toc b/TitanClassicRepair/TitanClassicRepair.toc
index ee398c8..e8e78fb 100644
--- a/TitanClassicRepair/TitanClassicRepair.toc
+++ b/TitanClassicRepair/TitanClassicRepair.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fRepair|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fRepair|r] |cff00aa001.1.0.11302|r
 ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicRepair.xml
diff --git a/TitanClassicVolume/TitanClassicVolume.toc b/TitanClassicVolume/TitanClassicVolume.toc
index b9ecfc0..f25b28b 100644
--- a/TitanClassicVolume/TitanClassicVolume.toc
+++ b/TitanClassicVolume/TitanClassicVolume.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fVolume|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fVolume|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds a volume control icon on your Titan Bar
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicVolume.xml
diff --git a/TitanClassicXP/TitanClassicXP.toc b/TitanClassicXP/TitanClassicXP.toc
index b00fbd9..4b081d3 100644
--- a/TitanClassicXP/TitanClassicXP.toc
+++ b/TitanClassicXP/TitanClassicXP.toc
@@ -1,10 +1,10 @@
 ## Interface: 11302
-## Title: Titan Panel Classic [|cffeda55fXP|r] |cff00aa001.0.7.11302|r
+## Title: Titan Panel Classic [|cffeda55fXP|r] |cff00aa001.1.0.11302|r
 ## Notes: Adds information to Titan Panel about XP earned and time to level
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: TitanClassic
-## Version: 1.0.7.11302
+## Version: 1.1.0.11302
 ## X-Child-Of: TitanClassic
 TitanClassicXP.xml