Merge branch 'master' of git.wowinterface.com:TitanPanel-571
urnati [07-28-24 - 15:33]
Merge branch 'master' of git.wowinterface.com:TitanPanel-571
# Conflicts:
# Titan/Titan_Mainline.toc
# TitanAmmo/TitanAmmo_Classic.toc
# TitanAmmo/TitanAmmo_Vanilla.toc
# TitanAmmo/TitanAmmo_Wrath.toc
# TitanBag/TitanBag_Cata.toc
# TitanBag/TitanBag_Classic.toc
# TitanBag/TitanBag_Wrath.toc
# TitanClassic/TitanClassic_Classic.toc
# TitanClassic/TitanClassic_Vanilla.toc
# TitanClassic/TitanClassic_Wrath.toc
# TitanClock/TitanClock_Cata.toc
# TitanClock/TitanClock_Classic.toc
# TitanClock/TitanClock_Wrath.toc
# TitanGold/TitanGold_Classic.toc
# TitanGold/TitanGold_Vanilla.toc
# TitanGold/TitanGold_Wrath.toc
# TitanLocation/TitanLocation_Classic.toc
# TitanLocation/TitanLocation_Vanilla.toc
# TitanLocation/TitanLocation_Wrath.toc
# TitanLootType/TitanLootType_Classic.toc
# TitanLootType/TitanLootType_Vanilla.toc
# TitanLootType/TitanLootType_Wrath.toc
# TitanPerformance/TitanPerformance_Classic.toc
# TitanPerformance/TitanPerformance_Vanilla.toc
# TitanPerformance/TitanPerformance_Wrath.toc
# TitanRegen/TitanRegen_Cata.toc
# TitanRegen/TitanRegen_Classic.toc
# TitanRegen/TitanRegen_Wrath.toc
# TitanRepair/TitanRepair_Classic.toc
# TitanRepair/TitanRepair_Vanilla.toc
# TitanRepair/TitanRepair_Wrath.toc
# TitanVolume/TitanVolume_Classic.toc
# TitanVolume/TitanVolume_Vanilla.toc
# TitanVolume/TitanVolume_Wrath.toc
# TitanXP/TitanXP_Classic.toc
# TitanXP/TitanXP_Vanilla.toc
# TitanXP/TitanXP_Wrath.toc
diff --git a/TitanAmmo/TitanAmmo_Classic.toc b/TitanAmmo/TitanAmmo_Classic.toc
index 985a1a0..9825a98 100644
--- a/TitanAmmo/TitanAmmo_Classic.toc
+++ b/TitanAmmo/TitanAmmo_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanAmmo/TitanAmmo_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanAmmo/TitanAmmo_Cata.toc
## Notes: Adds an ammo monitor to Titan Panel - Classic versions only
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanBag/TitanBag_Classic.toc b/TitanBag/TitanBag_Classic.toc
index 13e0dec..3cafe86 100644
--- a/TitanBag/TitanBag_Classic.toc
+++ b/TitanBag/TitanBag_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanBag/TitanBag_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 11503
+## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanBag/TitanBag_Vanilla.toc
## Notes: Adds bag and free slot information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanClassic/TitanClassic_Classic.toc b/TitanClassic/TitanClassic_Classic.toc
index 7e46520..94e0354 100644
--- a/TitanClassic/TitanClassic_Classic.toc
+++ b/TitanClassic/TitanClassic_Classic.toc
@@ -1,7 +1,12 @@
+<<<<<<< HEAD:TitanClassic/TitanClassic_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.15|r
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.16|r
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanClassic/TitanClassic_Cata.toc
## Author: Titan Panel Dev Team
-## Version: 8.0.15
+## Version: 8.0.16
## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat
## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu
## Notes: Adds display bars to show and control information/launcher plugins.
diff --git a/TitanClock/TitanClock_Classic.toc b/TitanClock/TitanClock_Classic.toc
index 5d5e318..a748f95 100644
--- a/TitanClock/TitanClock_Classic.toc
+++ b/TitanClock/TitanClock_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanClock/TitanClock_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 11503
+## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanClock/TitanClock_Vanilla.toc
## Notes: Adds a clock to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanGold/TitanGold_Classic.toc b/TitanGold/TitanGold_Classic.toc
index 6d2dd0b..d28436d 100644
--- a/TitanGold/TitanGold_Classic.toc
+++ b/TitanGold/TitanGold_Classic.toc
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:TitanGold/TitanGold_Classic.toc
## Interface: 11503, 40400
+=======
+## Interface: 40400
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanGold/TitanGold_Cata.toc
## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.16|r
## Version: 8.0.16
## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis.
diff --git a/TitanLocation/TitanLocation_Classic.toc b/TitanLocation/TitanLocation_Classic.toc
index 68c4aba..f59ffad 100644
--- a/TitanLocation/TitanLocation_Classic.toc
+++ b/TitanLocation/TitanLocation_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanLocation/TitanLocation_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanLocation/TitanLocation_Cata.toc
## Notes: Adds coordinates and location information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanLootType/TitanLootType_Classic.toc b/TitanLootType/TitanLootType_Classic.toc
index 286b9fd..53c2faa 100644
--- a/TitanLootType/TitanLootType_Classic.toc
+++ b/TitanLootType/TitanLootType_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanLootType/TitanLootType_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanLootType/TitanLootType_Cata.toc
## Notes: Adds group loot and instance difficulty information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables: TitanClassicLootTypeSaved
diff --git a/TitanPerformance/TitanPerformance_Classic.toc b/TitanPerformance/TitanPerformance_Classic.toc
index b326107..1dc6fe0 100644
--- a/TitanPerformance/TitanPerformance_Classic.toc
+++ b/TitanPerformance/TitanPerformance_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanPerformance/TitanPerformance_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanPerformance/TitanPerformance_Cata.toc
## Notes: Adds FPS and Garbage collection information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanRegen/TitanRegen_Classic.toc b/TitanRegen/TitanRegen_Classic.toc
index 570577e..d5eb9b7 100644
--- a/TitanRegen/TitanRegen_Classic.toc
+++ b/TitanRegen/TitanRegen_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanRegen/TitanRegen_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 11503
+## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanRegen/TitanRegen_Vanilla.toc
## Notes: Adds a regen monitor to Titan Panel to show HP/MANA regen - Classic versions only
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanRepair/TitanRepair_Classic.toc b/TitanRepair/TitanRepair_Classic.toc
index b1ada49..f1664a8 100644
--- a/TitanRepair/TitanRepair_Classic.toc
+++ b/TitanRepair/TitanRepair_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanRepair/TitanRepair_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanRepair/TitanRepair_Cata.toc
## 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 (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanVolume/TitanVolume_Classic.toc b/TitanVolume/TitanVolume_Classic.toc
index fefd464..811cdcc 100644
--- a/TitanVolume/TitanVolume_Classic.toc
+++ b/TitanVolume/TitanVolume_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanVolume/TitanVolume_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanVolume/TitanVolume_Cata.toc
## Notes: Adds a volume control icon on your Titan Bar
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
diff --git a/TitanXP/TitanXP_Classic.toc b/TitanXP/TitanXP_Classic.toc
index 267c0bd..98a03f6 100644
--- a/TitanXP/TitanXP_Classic.toc
+++ b/TitanXP/TitanXP_Classic.toc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD:TitanXP/TitanXP_Classic.toc
## Interface: 11503, 40400
## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.15|r
## Version: 8.0.15
+=======
+## Interface: 40400
+## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.16|r
+## Version: 8.0.16
+>>>>>>> 8a735dded11e9609c0f7312294dfb072f859a21e:TitanXP/TitanXP_Cata.toc
## Notes: Adds information to Titan Panel about XP earned and time to level
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables: