diff --git a/Titan/Titan_Mainline.toc b/Titan/Titan_Mainline.toc index 8d502b1..c296106 100644 --- a/Titan/Titan_Mainline.toc +++ b/Titan/Titan_Mainline.toc @@ -1,10 +1,5 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.7|r -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.8|r ->>>>>>> origin/master ## Author: Titan Panel Dev Team ## IconTexture: Interface\Icons\Achievement_Dungeon_UlduarRaid_Titan_01 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat diff --git a/TitanAmmo/TitanAmmo_Vanilla.toc b/TitanAmmo/TitanAmmo_Vanilla.toc index fd491a3..91f002f 100644 --- a/TitanAmmo/TitanAmmo_Vanilla.toc +++ b/TitanAmmo/TitanAmmo_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Mainline.toc b/TitanBag/TitanBag_Mainline.toc index 1007000..be53bd5 100644 --- a/TitanBag/TitanBag_Mainline.toc +++ b/TitanBag/TitanBag_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanBag\TitanBag ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanBag/TitanBag_Vanilla.toc b/TitanBag/TitanBag_Vanilla.toc index e4028ce..0a42c3a 100644 --- a/TitanBag/TitanBag_Vanilla.toc +++ b/TitanBag/TitanBag_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Vanilla.toc b/TitanClassic/TitanClassic_Vanilla.toc index 3f5a495..c04d1de 100644 --- a/TitanClassic/TitanClassic_Vanilla.toc +++ b/TitanClassic/TitanClassic_Vanilla.toc @@ -1,10 +1,5 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.7|r -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.8|r ->>>>>>> origin/master ## Author: Titan Panel Dev Team ## Version: 8.0.8 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat diff --git a/TitanClock/TitanClock_Mainline.toc b/TitanClock/TitanClock_Mainline.toc index 5d96891..8c62fd5 100644 --- a/TitanClock/TitanClock_Mainline.toc +++ b/TitanClock/TitanClock_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\Icons\Spell_Nature_TimeStop ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanClock/TitanClock_Vanilla.toc b/TitanClock/TitanClock_Vanilla.toc index 44cdf94..bb28314 100644 --- a/TitanClock/TitanClock_Vanilla.toc +++ b/TitanClock/TitanClock_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanGold/TitanGold_Mainline.toc b/TitanGold/TitanGold_Mainline.toc index df02ed0..4d06cfa 100644 --- a/TitanGold/TitanGold_Mainline.toc +++ b/TitanGold/TitanGold_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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 (http://www.titanpanel.org) diff --git a/TitanGold/TitanGold_Vanilla.toc b/TitanGold/TitanGold_Vanilla.toc index c0788b6..c75ad77 100644 --- a/TitanGold/TitanGold_Vanilla.toc +++ b/TitanGold/TitanGold_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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 diff --git a/TitanLocation/TitanLocation_Mainline.toc b/TitanLocation/TitanLocation_Mainline.toc index 1c0c31c..72c4e4e 100644 --- a/TitanLocation/TitanLocation_Mainline.toc +++ b/TitanLocation/TitanLocation_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanLocation\TitanLocation ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanLocation/TitanLocation_Vanilla.toc b/TitanLocation/TitanLocation_Vanilla.toc index c56f6f3..1f2de98 100644 --- a/TitanLocation/TitanLocation_Vanilla.toc +++ b/TitanLocation/TitanLocation_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanLootType/TitanLootType_Mainline.toc b/TitanLootType/TitanLootType_Mainline.toc index c2286d4..608df41 100644 --- a/TitanLootType/TitanLootType_Mainline.toc +++ b/TitanLootType/TitanLootType_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanLootType\TitanLootType ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanLootType/TitanLootType_Vanilla.toc b/TitanLootType/TitanLootType_Vanilla.toc index e88e589..e744437 100644 --- a/TitanLootType/TitanLootType_Vanilla.toc +++ b/TitanLootType/TitanLootType_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Mainline.toc b/TitanPerformance/TitanPerformance_Mainline.toc index 476862e..c863504 100644 --- a/TitanPerformance/TitanPerformance_Mainline.toc +++ b/TitanPerformance/TitanPerformance_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanPerformance\TitanPerformance ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanPerformance/TitanPerformance_Vanilla.toc b/TitanPerformance/TitanPerformance_Vanilla.toc index f81836f..49ec86e 100644 --- a/TitanPerformance/TitanPerformance_Vanilla.toc +++ b/TitanPerformance/TitanPerformance_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Vanilla.toc b/TitanRegen/TitanRegen_Vanilla.toc index 9e0564f..57582df 100644 --- a/TitanRegen/TitanRegen_Vanilla.toc +++ b/TitanRegen/TitanRegen_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Mainline.toc b/TitanRepair/TitanRepair_Mainline.toc index 79bc51c..a951193 100644 --- a/TitanRepair/TitanRepair_Mainline.toc +++ b/TitanRepair/TitanRepair_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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 (http://www.titanpanel.org) diff --git a/TitanRepair/TitanRepair_Vanilla.toc b/TitanRepair/TitanRepair_Vanilla.toc index eddbf40..e83a4bd 100644 --- a/TitanRepair/TitanRepair_Vanilla.toc +++ b/TitanRepair/TitanRepair_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Mainline.toc b/TitanVolume/TitanVolume_Mainline.toc index 51f8a96..7df9972 100644 --- a/TitanVolume/TitanVolume_Mainline.toc +++ b/TitanVolume/TitanVolume_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanVolume\Artwork\TitanVolumeHigh ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanVolume/TitanVolume_Vanilla.toc b/TitanVolume/TitanVolume_Vanilla.toc index aab7ea4..d56f0d2 100644 --- a/TitanVolume/TitanVolume_Vanilla.toc +++ b/TitanVolume/TitanVolume_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## 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_Mainline.toc b/TitanXP/TitanXP_Mainline.toc index b4f208f..0bf8764 100644 --- a/TitanXP/TitanXP_Mainline.toc +++ b/TitanXP/TitanXP_Mainline.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 100206 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 100205 ## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## IconTexture: Interface\Icons\xp_icon ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanXP/TitanXP_Vanilla.toc b/TitanXP/TitanXP_Vanilla.toc index 89f25d4..87ac571 100644 --- a/TitanXP/TitanXP_Vanilla.toc +++ b/TitanXP/TitanXP_Vanilla.toc @@ -1,12 +1,6 @@ -<<<<<<< HEAD ## Interface: 11501 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.7|r -## Version: 8.0.7 -======= -## Interface: 11500 ## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.8|r ## Version: 8.0.8 ->>>>>>> origin/master ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: