Quantcast

Merge branch 'master' of git@git.wowinterface.com:TitanPanel-571

urnati [01-14-26 - 10:09]
Merge branch 'master' of git@git.wowinterface.com:TitanPanel-571

# Conflicts:
#    TitanPost/TitanPost.toc
Filename
Titan/Titan.toc
Titan/TitanMovable.lua
TitanAmmo/TitanAmmo_Vanilla.toc
TitanBag/TitanBag.toc
TitanClassic/TitanClassic.toc
TitanClock/TitanClock.toc
TitanGold/TitanGold.toc
TitanLocation/TitanLocation.toc
TitanLootType/TitanLootType.toc
TitanLootType/TitanLootType_Classic.toc
TitanPerformance/TitanPerformance.toc
TitanPost/TitanPost.toc
TitanRegen/TitanRegen_Vanilla.toc
TitanRepair/TitanRepair.toc
TitanUI/TitanUI.toc
TitanVolume/TitanVolume.toc
TitanXP/TitanXP.toc
diff --git a/Titan/Titan.toc b/Titan/Titan.toc
index 330aa2b..33b2260 100644
--- a/Titan/Titan.toc
+++ b/Titan/Titan.toc
@@ -1,7 +1,7 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa009.1.0|r
+## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa009.0.2|r
 ## Author: Titan Panel Dev Team
-## Version: 9.1.0
+## Version: 9.0.2
 ## IconTexture: Interface\Icons\Achievement_Dungeon_UlduarRaid_Titan_01
 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat
 ## Notes: Adds display bars to show and control information/launcher plugins.
diff --git a/Titan/TitanMovable.lua b/Titan/TitanMovable.lua
index 39fb2c9..4af8929 100755
--- a/Titan/TitanMovable.lua
+++ b/Titan/TitanMovable.lua
@@ -682,6 +682,7 @@ local MData = {
 	[12] = {frameName = "UIWidgetTopCenterContainerFrame",
 		move = function (force) MoveFrame("UIWidgetTopCenterContainerFrame", 0, TITAN_PANEL_PLACE_TOP, force) end,
 		addonAdj = false, },
+--[[
 	[13] = {frameName = "PlayerPowerBarAlt",
 		move = function (force)
 			-- Only spend cycles if the frame is shown.
@@ -746,6 +747,7 @@ local MData = {
 			end
 			end,
 		addonAdj = false, },
+--]]
 }

 --[==[
diff --git a/TitanAmmo/TitanAmmo_Vanilla.toc b/TitanAmmo/TitanAmmo_Vanilla.toc
index 49078d6..d9694aa 100644
--- a/TitanAmmo/TitanAmmo_Vanilla.toc
+++ b/TitanAmmo/TitanAmmo_Vanilla.toc
@@ -1,6 +1,6 @@
 ## Interface: 11507
-## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## Notes: Adds an ammo monitor to Titan Panel - Classic versions only
 ## Author: Titan Panel Development Team
 ## SavedVariables:
diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc
index 8e4f166..ee25eb3 100644
--- a/TitanBag/TitanBag.toc
+++ b/TitanBag/TitanBag.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fBag|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fBag|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanBag\TitanBag
 ## Notes: Adds bag and free slot information to Titan Panel
 ## Author: Titan Panel Development Team
diff --git a/TitanClassic/TitanClassic.toc b/TitanClassic/TitanClassic.toc
index d750631..4c52a36 100644
--- a/TitanClassic/TitanClassic.toc
+++ b/TitanClassic/TitanClassic.toc
@@ -1,7 +1,7 @@
 ## Interface: 11507, 50503
-## Title: Titan Panel [|cffeda55f_Classic_|r] |cff00aa009.1.0|r
+## Title: Titan Panel [|cffeda55f_Classic_|r] |cff00aa009.0.2|r
 ## Author: Titan Panel Dev Team
-## Version: 9.1.0
+## Version: 9.0.2
 ## IconTexture: Interface\Icons\Achievement_Dungeon_UlduarRaid_Titan_01
 ## Notes: Adds display bars to show and control information/launcher plugins.
 ## Category-enUS: User Interface
diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc
index 568031e..4ec4f80 100644
--- a/TitanClock/TitanClock.toc
+++ b/TitanClock/TitanClock.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fClock|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fClock|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\Icons\Spell_Nature_TimeStop
 ## Notes: Adds a clock to Titan Panel
 ## Author: Titan Panel Development Team
diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc
index 8f9a997..131b885 100644
--- a/TitanGold/TitanGold.toc
+++ b/TitanGold/TitanGold.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fGold|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fGold|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanGold\Artwork\TitanGold
 ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis.
 ## Author: Titan Panel Development Team
diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc
index cbb9400..e2c0e17 100644
--- a/TitanLocation/TitanLocation.toc
+++ b/TitanLocation/TitanLocation.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanLocation\TitanLocation
 ## Notes: Adds coordinates and location information to Titan Panel
 ## Author: Titan Panel Development Team
diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc
index 703d7ed..00a3943 100644
--- a/TitanLootType/TitanLootType.toc
+++ b/TitanLootType/TitanLootType.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanLootType\TitanLootType
 ## Notes: Adds group loot and instance difficulty information to Titan Panel
 ## Author: Titan Panel Development Team
diff --git a/TitanLootType/TitanLootType_Classic.toc b/TitanLootType/TitanLootType_Classic.toc
index ea7c5ca..0ca6e8a 100644
--- a/TitanLootType/TitanLootType_Classic.toc
+++ b/TitanLootType/TitanLootType_Classic.toc
@@ -1,6 +1,6 @@
 ## Interface: 11507, 50503
-## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## Notes: Adds group loot and instance difficulty information to Titan Panel
 ## Author: Titan Panel Development Team
 ## SavedVariables: TitanClassicLootTypeSaved
diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc
index 443b13b..297edaf 100644
--- a/TitanPerformance/TitanPerformance.toc
+++ b/TitanPerformance/TitanPerformance.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanPerformance\TitanPerformance
 ## Notes: Adds FPS and Garbage collection information to Titan Panel
 ## Author: Titan Panel Development Team
diff --git a/TitanPost/TitanPost.toc b/TitanPost/TitanPost.toc
new file mode 100644
index 0000000..8cb5597
--- /dev/null
+++ b/TitanPost/TitanPost.toc
@@ -0,0 +1,10 @@
+## Interface: 120001, 120000, 110207, 50503, 11507
+## Title: Titan Panel [|cffeda55fPost|r] |cff00aa009.0.2|r
+## Version: 9.0.2
+## Notes: Adds mail information to Titan Panel
+## Author: Titan Panel Development Team
+## SavedVariables: TitanPostDB
+## Dependencies: Titan
+## OptionalDeps:
+TitanPost.lua
+
diff --git a/TitanRegen/TitanRegen_Vanilla.toc b/TitanRegen/TitanRegen_Vanilla.toc
index 55bf3ac..4d344c6 100644
--- a/TitanRegen/TitanRegen_Vanilla.toc
+++ b/TitanRegen/TitanRegen_Vanilla.toc
@@ -1,6 +1,6 @@
 ## Interface: 11507, 50503
-## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## Notes: Adds a regen monitor to Titan Panel to show HP/MANA regen - Classic versions only
 ## Author: Titan Panel Development Team
 ## SavedVariables:
diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc
index febb4f8..4982d41 100644
--- a/TitanRepair/TitanRepair.toc
+++ b/TitanRepair/TitanRepair.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanRepair\TitanRepair
 ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors. Adds selling of grey items.
 ## Author: Titan Panel Development Team
diff --git a/TitanUI/TitanUI.toc b/TitanUI/TitanUI.toc
index b070f43..34f949a 100755
--- a/TitanUI/TitanUI.toc
+++ b/TitanUI/TitanUI.toc
@@ -1,7 +1,7 @@
 ## Interface: 120001, 120000, 110205, 50502, 11507
-## Title: Titan Panel [|cffeda55fUI|r] |cff00aa009.1.0|r
+## Title: Titan Panel [|cffeda55fUI|r] |cff00aa009.0.2|r
 ## Author: Titan Panel Dev Team
-## Version: 9.1.0
+## Version: 9.0.2
 ## Notes: Adds Reload and select functions in a plugin
 ## Author: Titan Panel Development Team
 ## IconTexture: Interface\AddOns\TitanUI\Artwork\TitanReload
diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc
index 78d690b..4af9f88 100644
--- a/TitanVolume/TitanVolume.toc
+++ b/TitanVolume/TitanVolume.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\AddOns\TitanVolume\Artwork\TitanVolumeHigh
 ## Notes: Adds a volume control icon on your Titan Bar
 ## Author: Titan Panel Development Team
diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc
index 800221d..d4ad8ec 100644
--- a/TitanXP/TitanXP.toc
+++ b/TitanXP/TitanXP.toc
@@ -1,6 +1,6 @@
 ## Interface: 120001, 120000, 110207, 50503, 11507
-## Title: Titan Panel [|cffeda55fXP|r] |cff00aa009.1.0|r
-## Version: 9.1.0
+## Title: Titan Panel [|cffeda55fXP|r] |cff00aa009.0.2|r
+## Version: 9.0.2
 ## IconTexture: Interface\Icons\xp_icon
 ## Notes: Adds information to Titan Panel about XP earned and time to level
 ## Author: Titan Panel Development Team