Merge branch 'master' of git.wowinterface.com:TitanPanel-571
urnati [05-19-22 - 14:06]
Merge branch 'master' of git.wowinterface.com:TitanPanel-571
# Conflicts:
# Titan/Titan.toc
# TitanBag/TitanBag.toc
# TitanClock/TitanClock.toc
# TitanGold/TitanGold.toc
# TitanLocation/TitanLocation.toc
# TitanLootType/TitanLootType.toc
# TitanPerformance/TitanPerformance.toc
# TitanRepair/TitanRepair.toc
# TitanVolume/TitanVolume.toc
# TitanXP/TitanXP.toc
diff --git a/Titan/Titan.toc b/Titan/Titan.toc
index d858a56..0ff894d 100644
--- a/Titan/Titan.toc
+++ b/Titan/Titan.toc
@@ -1,7 +1,14 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel |cff00aa005.23.1.90204|r
## Author: Titan Panel Development Team
## Version: 5.23.1.90204
+=======
+## Interface: 90200
+## Title: Titan Panel |cff00aa005.23.1.90200|r
+## Author: Titan Panel Development Team
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## 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/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc
index 62ab474..0adc2aa 100644
--- a/TitanBag/TitanBag.toc
+++ b/TitanBag/TitanBag.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds bag and free slot information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanBag.xml
diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc
index 487a10a..dda24ed 100644
--- a/TitanClock/TitanClock.toc
+++ b/TitanClock/TitanClock.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds a clock to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanClock.xml
diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc
index 31870db..2fcf34b 100644
--- a/TitanGold/TitanGold.toc
+++ b/TitanGold/TitanGold.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## 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: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanGold.xml
diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc
index 4cdd578..2248903 100644
--- a/TitanLocation/TitanLocation.toc
+++ b/TitanLocation/TitanLocation.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds coordinates and location information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanLocation.xml
diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc
index cbed9c7..083b0c4 100644
--- a/TitanLootType/TitanLootType.toc
+++ b/TitanLootType/TitanLootType.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds group loot and instance difficulty information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanLootType.xml
diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc
index 489ae2b..aa78bb8 100644
--- a/TitanPerformance/TitanPerformance.toc
+++ b/TitanPerformance/TitanPerformance.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds FPS and Garbage collection information to Titan Panel
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanPerformance.xml
diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc
index 778ec37..a12e12b 100644
--- a/TitanRepair/TitanRepair.toc
+++ b/TitanRepair/TitanRepair.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## 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: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanRepair.xml
diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc
index 7715ceb..b7fca5e 100644
--- a/TitanVolume/TitanVolume.toc
+++ b/TitanVolume/TitanVolume.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## Notes: Adds a volume control icon on your Titan Bar
## Author: Titan Panel Development Team (http://www.titanpanel.org)
## SavedVariables:
## OptionalDeps:
## Dependencies: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanVolume.xml
diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc
index 9453149..f32ef60 100644
--- a/TitanXP/TitanXP.toc
+++ b/TitanXP/TitanXP.toc
@@ -1,10 +1,19 @@
+<<<<<<< HEAD
## Interface: 90204
## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.23.1.90204|r
+=======
+## Interface: 90200
+## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.23.1.90200|r
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## 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: Titan
+<<<<<<< HEAD
## Version: 5.23.1.90204
+=======
+## Version: 5.23.1.90200
+>>>>>>> 0506c066b1ba87a6d10ff3546bde6f9501926d6b
## X-Child-Of: Titan
TitanXP.xml