r78
Details
-
FilenameLibPeriodicTable-3.1-r78.zip
-
Uploaded by
-
UploadedNov 29, 2008
-
Size375.19 KB
-
Downloads60
-
MD530f34dc672fec01e5493c38602b86196
Supported WoW Retail Versions
- 3.0.3
Changelog
------------------------------------------------------------------------
r78 | Azethoth | 2008-11-29 12:02:14 +0000 (Sat, 29 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Some more quest items
------------------------------------------------------------------------
r77 | Azethoth | 2008-11-29 07:06:39 +0000 (Sat, 29 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Instant Poison IX 43231
------------------------------------------------------------------------
r76 | Azethoth | 2008-11-29 05:22:52 +0000 (Sat, 29 Nov 2008) | 5 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
-- CowFishMan fishing pole
-- 2 Dalaran teleport rings added to Hearth
-- Some new pots
-- Consumable.Buff.Haste
------------------------------------------------------------------------
r75 | elkano | 2008-11-27 11:54:16 +0000 (Thu, 27 Nov 2008) | 2 lines
Changed paths:
M /trunk/data.lua
M /trunk/dataminer.lua
[dataminer][data] added more CurrencyItems stuff
[dataminer] fixed count parsing for CurrencyItem handler
------------------------------------------------------------------------
r74 | elkano | 2008-11-27 10:32:03 +0000 (Thu, 27 Nov 2008) | 6 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/LibPeriodicTable-3.1-TradeskillResultMats/LibPeriodicTable-3.1-TradeskillResultMats.lua
M /trunk/data.lua
M /trunk/dataminer.lua
[dataminer] added url to mine "Gnomish Army Knife" into Tradeskill.Tools.Mining
[dataminer] added general support for spells in tradeskills
[dataminer] Enchanting is now parsed like all tradeskills
[dataminer] started with code for CurrencyItem sets
[CurrencyItems] added support to dataminer, no useable file, yet
[TradeSkill] Enchanting items now represented by itemid instead of spellid
------------------------------------------------------------------------
r73 | Azethoth | 2008-11-26 22:51:48 +0000 (Wed, 26 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
-- More quest items
------------------------------------------------------------------------
r72 | Azethoth | 2008-11-26 22:51:30 +0000 (Wed, 26 Nov 2008) | 1 line
Changed paths:
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r71 | Azethoth | 2008-11-25 18:43:43 +0000 (Tue, 25 Nov 2008) | 3 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
-- More quest items
-- Final Cooking Daily item
-- Tradeskill.Mat.ByType.Parchment added to output file
------------------------------------------------------------------------
r70 | elkano | 2008-11-25 10:07:09 +0000 (Tue, 25 Nov 2008) | 1 line
Changed paths:
M /trunk/dataminer.lua
[dataminer] removed a debug print I forgot
------------------------------------------------------------------------
r69 | elkano | 2008-11-25 09:59:35 +0000 (Tue, 25 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-GearSet/LibPeriodicTable-3.1-GearSet.lua
M /trunk/data.lua
M /trunk/dataminer.lua
[dataminer] fixed basic_listview_get_first_id() for negative ids (eg T7.25 sets)
[GearSet] added T7.10 and T7.25 sets
------------------------------------------------------------------------
r68 | mikk | 2008-11-24 15:15:25 +0000 (Mon, 24 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
More Usable.Quest ...
------------------------------------------------------------------------
r67 | mikk | 2008-11-24 13:21:25 +0000 (Mon, 24 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
More Usable.Quest ...
------------------------------------------------------------------------
r66 | Azethoth | 2008-11-24 04:36:50 +0000 (Mon, 24 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Add deadly poison IX yet again
------------------------------------------------------------------------
r65 | Azethoth | 2008-11-24 03:14:48 +0000 (Mon, 24 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r64 | Azethoth | 2008-11-23 20:02:00 +0000 (Sun, 23 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Endless Mana & Health
-- Some runic power potion
------------------------------------------------------------------------
r63 | mikk | 2008-11-23 08:56:52 +0000 (Sun, 23 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Usable.Replenished Raelorasz's Spear
------------------------------------------------------------------------
r62 | Azethoth | 2008-11-22 01:48:09 +0000 (Sat, 22 Nov 2008) | 3 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
M /trunk/dataminer.lua
-- More quest items
-- Fix starts quest (hit > 200 limit)
-- mare mat changes from forum
------------------------------------------------------------------------
r61 | mikk | 2008-11-21 12:02:49 +0000 (Fri, 21 Nov 2008) | 4 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Usable.Quest
- Feknut's Firecrackers
- Steelring's Foolproof Dynamite
------------------------------------------------------------------------
r60 | mikk | 2008-11-21 10:21:05 +0000 (Fri, 21 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Usable.Quest Malister's Frost Wand
------------------------------------------------------------------------
r57 | Azethoth | 2008-11-21 06:00:40 +0000 (Fri, 21 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r56 | Azethoth | 2008-11-20 18:59:58 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r55 | mikk | 2008-11-20 18:36:03 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Misc.Usable.Quest Liquid Fire of Elune
------------------------------------------------------------------------
r54 | mikk | 2008-11-20 17:12:06 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Move westguard keep daily bomb quest item to .replenished
------------------------------------------------------------------------
r53 | Azethoth | 2008-11-20 16:00:41 +0000 (Thu, 20 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Gear/LibPeriodicTable-3.1-Gear.lua
M /trunk/data.lua
M /trunk/dataminer.lua
-- Update trinket mining that was cutting off blue results
-- Add %. to set specific mining runs to distinguish Gear and GearSet for example
------------------------------------------------------------------------
r52 | mikk | 2008-11-20 15:57:00 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Add westguard keep daily bomb quest item
------------------------------------------------------------------------
r51 | elkano | 2008-11-20 13:30:18 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/LibPeriodicTable-3.1-TradeskillResultMats/LibPeriodicTable-3.1-TradeskillResultMats.lua
M /trunk/data.lua
M /trunk/dataminer.lua
raised max tradeskill from 375 to 450
------------------------------------------------------------------------
r50 | elkano | 2008-11-20 10:13:40 +0000 (Thu, 20 Nov 2008) | 4 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-ClassSpell/LibPeriodicTable-3.1-ClassSpell.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
M /trunk/dataminer.lua
added:
- Death Knight class spells
- leatherworking bags
- Death Knight & WoTLK class reagents
------------------------------------------------------------------------
r49 | Azethoth | 2008-11-20 00:58:58 +0000 (Thu, 20 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
-- More quests
-- Saltorio's tradeskill changes
------------------------------------------------------------------------
r48 | Azethoth | 2008-11-20 00:39:06 +0000 (Thu, 20 Nov 2008) | 1 line
Changed paths:
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r47 | mikk | 2008-11-19 18:38:58 +0000 (Wed, 19 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Add a few wrath quest items, run compresssplit
------------------------------------------------------------------------
r46 | Azethoth | 2008-11-19 07:36:49 +0000 (Wed, 19 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Mana Sapphire 33312
------------------------------------------------------------------------
r45 | Azethoth | 2008-11-19 04:06:04 +0000 (Wed, 19 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r44 | Azethoth | 2008-11-18 20:50:00 +0000 (Tue, 18 Nov 2008) | 3 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-ClassSpell/LibPeriodicTable-3.1-ClassSpell.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Gear/LibPeriodicTable-3.1-Gear.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/data.lua
M /trunk/dataminer.lua
--added sorting of result set to dataminer
--unintended consequence: sorting the already sorted set could have bubblesort performance
--sorting the result set is not required anymore though
------------------------------------------------------------------------
r43 | Azethoth | 2008-11-18 18:37:04 +0000 (Tue, 18 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-ClassSpell/LibPeriodicTable-3.1-ClassSpell.lua
M /trunk/data.lua
-- Full dataminer run. Apparently only affects ClassSpell.
------------------------------------------------------------------------
r42 | Azethoth | 2008-11-18 05:41:25 +0000 (Tue, 18 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- More quest items
------------------------------------------------------------------------
r41 | Azethoth | 2008-11-18 03:53:19 +0000 (Tue, 18 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Wrath Elixir
-- More quest items
------------------------------------------------------------------------
r40 | Azethoth | 2008-11-17 14:53:31 +0000 (Mon, 17 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Added 5 new rogue poisons
-- Crippling and mind numbing reduced to just one poison
------------------------------------------------------------------------
r39 | Azethoth | 2008-11-17 03:41:38 +0000 (Mon, 17 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Runic pots
------------------------------------------------------------------------
r38 | Azethoth | 2008-11-17 03:22:40 +0000 (Mon, 17 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Runic mana + injectors
-- More quest items
------------------------------------------------------------------------
r37 | Azethoth | 2008-11-16 14:22:21 +0000 (Sun, 16 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Some wotlk quest item consumables
------------------------------------------------------------------------
r35 | Azethoth | 2008-11-16 04:11:26 +0000 (Sun, 16 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
more warlock stones
------------------------------------------------------------------------
r34 | Azethoth | 2008-11-16 03:51:47 +0000 (Sun, 16 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
Quest items + warlock stones
------------------------------------------------------------------------
r33 | Azethoth | 2008-11-15 01:01:30 +0000 (Sat, 15 Nov 2008) | 2 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- more Quest items
-- New basic bandages
------------------------------------------------------------------------
r32 | Azethoth | 2008-11-14 16:44:36 +0000 (Fri, 14 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Gear/LibPeriodicTable-3.1-Gear.lua
M /trunk/LibPeriodicTable-3.1-GearSet/LibPeriodicTable-3.1-GearSet.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/LibPeriodicTable-3.1-Tradeskill/LibPeriodicTable-3.1-Tradeskill.lua
M /trunk/LibPeriodicTable-3.1-TradeskillResultMats/LibPeriodicTable-3.1-TradeskillResultMats.lua
M /trunk/data.lua
-- Dataminer ran on Gear, Misc, Consumable, Tradeskill.
------------------------------------------------------------------------
r31 | Azethoth | 2008-11-14 13:18:14 +0000 (Fri, 14 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Some wotlk quest items
------------------------------------------------------------------------
r30 | Azethoth | 2008-11-02 10:20:13 +0000 (Sun, 02 Nov 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/data.lua
-- Update new buff scrolls
------------------------------------------------------------------------
r29 | Azethoth | 2008-10-29 22:00:52 +0000 (Wed, 29 Oct 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-Consumable/LibPeriodicTable-3.1-Consumable.lua
M /trunk/LibPeriodicTable-3.1-Gear/LibPeriodicTable-3.1-Gear.lua
M /trunk/data.lua
-- Added Warp Burger to the edible meat set.
------------------------------------------------------------------------
r28 | Azethoth | 2008-10-29 21:17:08 +0000 (Wed, 29 Oct 2008) | 1 line
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Water Bucket 32971
------------------------------------------------------------------------
r27 | Azethoth | 2008-10-28 22:06:11 +0000 (Tue, 28 Oct 2008) | 6 lines
Changed paths:
M /trunk/LibPeriodicTable-3.1-AutoBar/LibPeriodicTable-3.1-AutoBar.lua
M /trunk/LibPeriodicTable-3.1-Gear/LibPeriodicTable-3.1-Gear.lua
M /trunk/LibPeriodicTable-3.1-Misc/LibPeriodicTable-3.1-Misc.lua
M /trunk/data.lua
-- Ran dataminer.
-- Picked up new trinkets and pet.
-- Issues:
--- ClassSpell is not mining talent based spells like Ice Barrier.
--- Rogue poison tradeskill set needs obsoleting
------------------------------------------------------------------------