WowAce

------------------------------------------------------------------------
r56716 | paene | 2007-12-08 03:18:03 -0500 (Sat, 08 Dec 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Allow reagent restocking amounts to go as low as 0 (instead of 1)
------------------------------------------------------------------------
r56663 | paene | 2007-12-06 19:41:07 -0500 (Thu, 06 Dec 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Initial spell message coding (not functional yet)
-Fixed a bug where menus would appear when hiding or showing any button
------------------------------------------------------------------------
r56408 | paene | 2007-12-01 17:47:36 -0500 (Sat, 01 Dec 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Added the famous -Ace2- to the mod name
------------------------------------------------------------------------
r56199 | scorpion | 2007-11-28 19:06:06 -0500 (Wed, 28 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Locales/Locale-zhCN.lua

Cryolysis2:
- update zhCN localization
------------------------------------------------------------------------
r56137 | scorpion | 2007-11-27 12:20:07 -0500 (Tue, 27 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Locales/Locale-zhCN.lua
   M /trunk/Cryolysis2/Locales/Locale-zhTW.lua

Cryolysis2:
- update zhTW localization
- update zhCN localization
------------------------------------------------------------------------
r55804 | paene | 2007-11-23 16:46:36 -0500 (Fri, 23 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Locales/Locale-deDE.lua
   M /trunk/Cryolysis2/Locales/Locale-esES.lua
   M /trunk/Cryolysis2/Locales/Locale-frFR.lua
   M /trunk/Cryolysis2/Locales/Locale-koKR.lua

Cryolysis2:
-Quick localization fix
------------------------------------------------------------------------
r55802 | paene | 2007-11-23 16:43:11 -0500 (Fri, 23 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.toc
   A /trunk/Cryolysis2/Locales/Locale-deDE.lua
   M /trunk/Cryolysis2/Locales/Locale-enUS.lua
   A /trunk/Cryolysis2/Locales/Locale-esES.lua
   A /trunk/Cryolysis2/Locales/Locale-frFR.lua
   A /trunk/Cryolysis2/Locales/Locale-koKR.lua

Cryolysis2:
-Added localization files for multiple languages
-Fixed a localization issue from the Chinese locales update
-Removed some commented out code
------------------------------------------------------------------------
r55755 | scorpion | 2007-11-23 02:27:48 -0500 (Fri, 23 Nov 2007) | 3 lines
Changed paths:
   A /trunk/Cryolysis2/Locales/Locale-zhCN.lua
   A /trunk/Cryolysis2/Locales/Locale-zhTW.lua

Cryolysis2:
add zhTW translation
add zhCN translation
------------------------------------------------------------------------
r55749 | scorpion | 2007-11-23 00:03:14 -0500 (Fri, 23 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.toc
   M /trunk/Cryolysis2/Locales/Locale-enUS.lua

Cryolysis2:
add zhTW translation
add zhCN translation
------------------------------------------------------------------------
r55694 | paene | 2007-11-22 04:05:57 -0500 (Thu, 22 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Made it so reagent restocking amounts can be 0, instead of a minimum of 1
------------------------------------------------------------------------
r55524 | paene | 2007-11-20 05:26:42 -0500 (Tue, 20 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Clarified custom button usage so people stop asking the same question a million and one times.
------------------------------------------------------------------------
r55512 | paene | 2007-11-20 01:32:05 -0500 (Tue, 20 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed a graphical problem when setting the outer sphere to show nothing
-Restored the main sphere's click to use mana gem functionality
------------------------------------------------------------------------
r55507 | paene | 2007-11-20 00:41:51 -0500 (Tue, 20 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added spell timer support for cold snap
------------------------------------------------------------------------
r55470 | paene | 2007-11-19 16:41:42 -0500 (Mon, 19 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed timer bars not showing up after hiding then showing the timer frame
------------------------------------------------------------------------
r55467 | paene | 2007-11-19 16:26:47 -0500 (Mon, 19 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Implemented cooldown timers
-Fixed a bug causing the menus to show when attempting to show or hide the spell timer frame
------------------------------------------------------------------------
r55193 | paene | 2007-11-17 16:08:00 -0500 (Sat, 17 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Cleaned up the / command menu.
------------------------------------------------------------------------
r54918 | paene | 2007-11-15 18:28:54 -0500 (Thu, 15 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Adjusted the initial position of the main sphere for first time users.
------------------------------------------------------------------------
r54908 | paene | 2007-11-15 17:19:51 -0500 (Thu, 15 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed an error when changing a custom button's type.
------------------------------------------------------------------------
r54905 | paene | 2007-11-15 16:53:43 -0500 (Thu, 15 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added the ability to have the custom buttons use items, macros, or spells (instead of just spells)
------------------------------------------------------------------------
r54890 | paene | 2007-11-15 15:32:30 -0500 (Thu, 15 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed the class check
------------------------------------------------------------------------
r54804 | paene | 2007-11-15 05:05:51 -0500 (Thu, 15 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Fixed a bug that was causing the main sphere to move after login or /reloadui.
-Removed some unused code
-Added menu options for changing the buttons to macro or item buttons instead of spell buttons.
------------------------------------------------------------------------
r54768 | paene | 2007-11-15 02:48:38 -0500 (Thu, 15 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added several missing mounts to the mount list.
-Attempted to fix a bug that is preventing the main sphere's position from being saved.
------------------------------------------------------------------------
r54673 | paene | 2007-11-14 11:37:55 -0500 (Wed, 14 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Moved a line of code to attempt to get rid of a visual bug with the main sphere
------------------------------------------------------------------------
r54586 | paene | 2007-11-13 20:46:07 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   A /trunk/Cryolysis2/sounds
   A /trunk/Cryolysis2/sounds/Pig01.mp3
   A /trunk/Cryolysis2/sounds/Pig02.mp3
   A /trunk/Cryolysis2/sounds/Sheep01.mp3
   A /trunk/Cryolysis2/sounds/Sheep02.mp3

Cryolysis2:
-Import of polymorph sound files
------------------------------------------------------------------------
r54556 | paene | 2007-11-13 18:41:56 -0500 (Tue, 13 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Bindings.lua
   M /trunk/Cryolysis2/Bindings.xml
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed Ritual of Refreshment for food/water buttons
-Added a keybinding for Ritual of Refreshment
-Changed water/food icons to show the texture for the highest water/food the mage has conjured.  Highest possible if none conjured.
------------------------------------------------------------------------
r54532 | paene | 2007-11-13 15:50:52 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added Swift Warstrider to the mount list (missed this one earlier)
------------------------------------------------------------------------
r54529 | paene | 2007-11-13 15:32:32 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-It helps when mounts have textures :)
------------------------------------------------------------------------
r54528 | paene | 2007-11-13 15:29:35 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added nnew 2.3 mounts to the mount lists
------------------------------------------------------------------------
r54526 | paene | 2007-11-13 15:02:17 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Updated food/water buttons for Conjure Manna Biscuits
------------------------------------------------------------------------
r54512 | paene | 2007-11-13 12:02:25 -0500 (Tue, 13 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Updated toc for 2.3
------------------------------------------------------------------------
r54453 | paene | 2007-11-12 23:47:11 -0500 (Mon, 12 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2

Cryolysis2:
-Touch for external properties
------------------------------------------------------------------------
r54452 | paene | 2007-11-12 23:45:48 -0500 (Mon, 12 Nov 2007) | 5 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.toc
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Setup anchor frame for spell timers
-Added the option to show/hide the spell timer frame
-Added the option to lock the spell timer frame in place
-Added library support for spell timers
------------------------------------------------------------------------
r54443 | paene | 2007-11-12 21:27:53 -0500 (Mon, 12 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed food/water trading for good this time!
------------------------------------------------------------------------
r54438 | paene | 2007-11-12 20:01:00 -0500 (Mon, 12 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added X and Y offset options for all buttons with menus
------------------------------------------------------------------------
r54419 | paene | 2007-11-12 16:19:42 -0500 (Mon, 12 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Removed reference to DewdropLib that was causing errors
------------------------------------------------------------------------
r54409 | paene | 2007-11-12 14:28:47 -0500 (Mon, 12 Nov 2007) | 5 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Removed detect magic (yay patch 2.3!)
-Added support for Ritual of Refreshment
-Removed unused commented out XML code
-Attempted to fix mana gem spam (don't think it worked)
------------------------------------------------------------------------
r54404 | paene | 2007-11-12 13:26:38 -0500 (Mon, 12 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Small adjustment to mana gem usage macrotext.
------------------------------------------------------------------------
r54354 | paene | 2007-11-11 18:07:41 -0500 (Sun, 11 Nov 2007) | 5 lines
Changed paths:
   M /trunk/Cryolysis2/Bindings.lua
   M /trunk/Cryolysis2/Bindings.xml
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Re-organized the menu a bit
-Fixed a bug preventing mana gems from being conjured after leaving combat.
-Updated and fixed several tooltips
-Add bindings for the mount button
------------------------------------------------------------------------
r54349 | paene | 2007-11-11 16:11:50 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Update .toc and externals
------------------------------------------------------------------------
r54348 | paene | 2007-11-11 16:07:30 -0500 (Sun, 11 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.toc
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-New menu using Waterfall-1.0 instead of Dewdrop-2.0
-Re-added original mana gem functionality with a twist!
------------------------------------------------------------------------
r54326 | paene | 2007-11-11 03:16:25 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed up the class check a bit
------------------------------------------------------------------------
r54324 | paene | 2007-11-11 02:23:22 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Forgot to fix the .toc
------------------------------------------------------------------------
r54323 | paene | 2007-11-11 02:19:25 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   D /trunk/Cryolysis2/ClassCheck.lua
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Un-did what I did earlier!
------------------------------------------------------------------------
r54322 | paene | 2007-11-11 02:13:44 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed buff menu not updating after talenting into a spell it could potentially have.
------------------------------------------------------------------------
r54321 | paene | 2007-11-11 02:04:14 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   A /trunk/Cryolysis2/ClassCheck.lua
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Splitting some code up
------------------------------------------------------------------------
r54320 | paene | 2007-11-11 02:00:08 -0500 (Sun, 11 Nov 2007) | 2 lines
Changed paths:
   A /trunk/Cryolysis2/Bindings.lua
   A /trunk/Cryolysis2/Bindings.xml
   M /trunk/Cryolysis2/Cryolysis2.toc

Cryolysis2:
-Added intial keybindings
------------------------------------------------------------------------
r54304 | paene | 2007-11-10 20:44:08 -0500 (Sat, 10 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added the ability to make each menu grow left instead of right
------------------------------------------------------------------------
r54303 | paene | 2007-11-10 20:23:20 -0500 (Sat, 10 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Silly Horde players, you can't teleport/portal to Ironforge!
------------------------------------------------------------------------
r54299 | paene | 2007-11-10 17:58:52 -0500 (Sat, 10 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added broom mounts to the mount list
------------------------------------------------------------------------
r54296 | paene | 2007-11-10 16:32:29 -0500 (Sat, 10 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Finished tooltips! (finally)
------------------------------------------------------------------------
r54288 | paene | 2007-11-10 13:18:57 -0500 (Sat, 10 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml
   M /trunk/Cryolysis2/Developer Notes.txt

Cryolysis2:
-Added more missing tooltips
-Added Brewfest mounts to the mount list
-Updated to-do list
------------------------------------------------------------------------
r54267 | paene | 2007-11-10 02:15:47 -0500 (Sat, 10 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Removed unused Saved Variables
------------------------------------------------------------------------
r54265 | paene | 2007-11-10 01:53:15 -0500 (Sat, 10 Nov 2007) | 6 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Recoded mana gem button to use a menu since Secure Frames suck
-Fixed a graphical error with the mana gem button
-Fixed an bug preventing the buff menu's reagent text from updating
-Removed some unused code
-Improved the efficiency of some of the code
------------------------------------------------------------------------
r54238 | paene | 2007-11-09 17:46:09 -0500 (Fri, 09 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added slow fall and AI/AB reagent counts
------------------------------------------------------------------------
r54234 | paene | 2007-11-09 17:32:16 -0500 (Fri, 09 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Another graphical fix for the mana gem button
-Fixed mana gem button so that it should work properly with lower level characters now (hopefully)
------------------------------------------------------------------------
r54226 | paene | 2007-11-09 13:52:31 -0500 (Fri, 09 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Another graphical fix for the mana gem button
------------------------------------------------------------------------
r54223 | paene | 2007-11-09 13:33:53 -0500 (Fri, 09 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed Food/Water button trade functionality
-Fixed a graphical bug affecting the evocation button
-Fixed a graphical bug affecting the mana gem button
------------------------------------------------------------------------
r54192 | paene | 2007-11-09 01:35:41 -0500 (Fri, 09 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Fixed main sphere scaling bug
------------------------------------------------------------------------
r54167 | paene | 2007-11-08 17:26:40 -0500 (Thu, 08 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed several tooltips
------------------------------------------------------------------------
r54165 | paene | 2007-11-08 16:34:00 -0500 (Thu, 08 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Temporarily fixed my stupidity (Fixed portal menu bug)
------------------------------------------------------------------------
r54164 | paene | 2007-11-08 16:26:10 -0500 (Thu, 08 Nov 2007) | 4 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml
   M /trunk/Cryolysis2/Developer Notes.txt

Cryolysis2:
-Finished most tooltips
-Added some support for characters that aren't level 70
-Updated to-do list
------------------------------------------------------------------------
r54142 | paene | 2007-11-08 02:04:46 -0500 (Thu, 08 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added a class check that disables the addon if the character isn't a mage
------------------------------------------------------------------------
r54139 | paene | 2007-11-08 01:04:17 -0500 (Thu, 08 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Added an option to hide tooltips
-Began adding tooltips to buttons/sphere
------------------------------------------------------------------------
r54131 | paene | 2007-11-07 23:49:44 -0500 (Wed, 07 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Developer Notes.txt

Cryolysis2:
-Fixed a bug that prevented buttons from staying hidden when the UI was reloaded.
-Updated to-do list
------------------------------------------------------------------------
r54113 | paene | 2007-11-07 16:13:22 -0500 (Wed, 07 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added the ability to move a button's position around the sphere.
------------------------------------------------------------------------
r54112 | paene | 2007-11-07 15:35:12 -0500 (Wed, 07 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Fixed scaling issues
-Changed buttons to all scale at once, instead of individually
------------------------------------------------------------------------
r54103 | paene | 2007-11-07 13:29:34 -0500 (Wed, 07 Nov 2007) | 2 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua

Cryolysis2:
-Added the automatic reagent restocking feature
------------------------------------------------------------------------
r54077 | paene | 2007-11-07 01:11:38 -0500 (Wed, 07 Nov 2007) | 3 lines
Changed paths:
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml
   M /trunk/Cryolysis2/Developer Notes.txt

Cryolysis2:
-Recoded the main sphere to use XML instead of CreateFrame
-Updated Developer Notes.txt with a to-do list
------------------------------------------------------------------------
r54075 | paene | 2007-11-07 00:25:00 -0500 (Wed, 07 Nov 2007) | 3 lines
Changed paths:
   D /trunk/Cryolysis2/Cryolysis.xml
   M /trunk/Cryolysis2/Cryolysis2.lua
   M /trunk/Cryolysis2/Cryolysis2.xml

Cryolysis2:
-Set SV's to save by profile and not char
-Removed an extra file from the directory
------------------------------------------------------------------------