WowAce

------------------------------------------------------------------------
r2854 | pompachomp | 2010-02-06 07:36:01 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Removed the rep level variables from the database files.
------------------------------------------------------------------------
r2853 | torhal | 2010-02-06 07:28:22 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Constants.lua

Added "ALLIANCE_VANGUARD" to faction_ids and faction_strings.
------------------------------------------------------------------------
r2852 | pompachomp | 2010-02-06 07:24:17 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Sorted some of the recipes in the database.
------------------------------------------------------------------------
r2851 | torhal | 2010-02-06 07:03:15 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Enchanting.lua

Added definition for FAC in Enchanting.lua
------------------------------------------------------------------------
r2850 | torhal | 2010-02-06 06:35:00 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Datamine.lua

Added addon:DumpRecipe() - used for single recipes, by spellID.
------------------------------------------------------------------------
r2849 | pompachomp | 2010-02-06 06:32:10 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Updated the database with the new names for the reputation entries.
------------------------------------------------------------------------
r2848 | torhal | 2010-02-06 05:28:36 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Constants.lua

Added "SHATAR", "CENARION_EXPEDITION", "VIOLETEYE", "KEEPERS_OF_TIME", "SCALE_OF_SANDS", "HORDE_EXPEDITION", "SHATTEREDSUN", "FRENZYHEART", and "ORACLES" to private.faction_ids and private.faction_strings
------------------------------------------------------------------------
r2847 | torhal | 2010-02-06 04:22:15 +0000 (Sat, 06 Feb 2010) | 6 lines
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Constants.lua
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Runeforging.lua
   M /trunk/Database/Smelting.lua
   M /trunk/Database/Tailoring.lua
   M /trunk/Datamine.lua
   M /trunk/Frame.lua
   M /trunk/Player.lua

In ARL.lua Removed all upvalued F_WHATEVER constants, replaced usage with private.filter_flags
Renamed private.acquire_flags to private.acquire_types
Added new table members to the private namespace: rep_levels, faction_ids, and faction_strings.
In ProfessionDump(): Recipes with no specialty will no longer print "nil". Recipes with reputation acquires will now print the faction name.
Added "local REP = private.rep_levels" and "local FAC = private.faction_ids" to all database files to accommodate the new dump output - retained the current reputation level constants until the databases are updated.
In Player:HasProperRepLevel() and Player:IsCorrectFaction(): Replaced local faction values with lookups in private.faction_ids
------------------------------------------------------------------------
r2846 | pompachomp | 2010-02-06 02:08:07 +0000 (Sat, 06 Feb 2010) | 2 lines
Changed paths:
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Fixed rarity for some recipes in the Tailoring database.
Some formatting changes.
------------------------------------------------------------------------
r2845 | pompachomp | 2010-02-06 00:07:14 +0000 (Sat, 06 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Jewelcrafting.lua

Fixed issue with some profession scans not expanding.  Still gotta work on the coloring.
------------------------------------------------------------------------
r2844 | pompachomp | 2010-02-05 22:50:05 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Frame.lua
   M /trunk/Player.lua

Fixed some errors when trying to expand all.  Still a problem with enchanting though.
------------------------------------------------------------------------
r2843 | pompachomp | 2010-02-05 20:55:47 +0000 (Fri, 05 Feb 2010) | 2 lines
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Removed the nil's for the specialties.
Fixed the replevel names instead of numbers.
------------------------------------------------------------------------
r2842 | torhal | 2010-02-05 12:13:27 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Datamine.lua

Fixed an issue with the profession dump where reputation levels after the first were not converted to a human-readable form.
------------------------------------------------------------------------
r2841 | pompachomp | 2010-02-05 12:07:43 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Convert all the recipe databases to the new format, thanks to Torhal's skillz.
------------------------------------------------------------------------
r2840 | torhal | 2010-02-05 10:45:08 +0000 (Fri, 05 Feb 2010) | 3 lines
Changed paths:
   M /trunk/Constants.lua
   M /trunk/Database/Smelting.lua
   M /trunk/Datamine.lua

Hand-updated most of the Smelting database - still things to be done.
Added support for specialties and reputation vendors to the profession dump.

------------------------------------------------------------------------
r2839 | torhal | 2010-02-05 08:46:52 +0000 (Fri, 05 Feb 2010) | 3 lines
Changed paths:
   M /trunk/AckisRecipeList.toc
   A /trunk/Constants.lua
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Runeforging.lua
   M /trunk/Database/Smelting.lua
   M /trunk/Database/Tailoring.lua
   M /trunk/Datamine.lua

New file: Constants.lua - at the moment this only contains filter and acquire flags and their strings.
Re-worked every profession file to use the new flag tables.

------------------------------------------------------------------------
r2838 | torhal | 2010-02-05 05:59:31 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Datamine.lua

In the FILTER_STRINGS table for the profession dumps, fixed indices 39 through 43.
------------------------------------------------------------------------
r2837 | pompachomp | 2010-02-05 04:26:18 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Engineering.lua

spaces!
------------------------------------------------------------------------
r2836 | torhal | 2010-02-05 04:16:27 +0000 (Fri, 05 Feb 2010) | 4 lines
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Datamine.lua

Fixed a bunch of formatting fuck-ups in the SPELL_ITEM table, then gave up on the NO_PLAYER_FLAG table. I'm not that self-destructive.
Changed a bunch of numbers in the Enchanting DB to constants.
Added a veritible fuckton of code which allows the dumping of a profession to the copy/paste buffer so that it can be pasted back into the database files in more of a human-readable format. Usage: /script ARL:DumpProfession("alchemy") (for example).
In addon:addTradeSkill(): Add the spell_id to the table for sorting purposes (profession dumps).
------------------------------------------------------------------------
r2835 | pompachomp | 2010-02-05 03:06:59 +0000 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/FirstAid.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua

Fixed some variable declarations
------------------------------------------------------------------------
r2834 | pompachomp | 2010-02-04 02:47:07 +0000 (Thu, 04 Feb 2010) | 2 lines
Changed paths:
   M /trunk/Database/Engineering.lua
   M /trunk/Datamine.lua

Added some spell ids to the NO_PLAYER_FLAG table.
Add the ammo flag to the Shatter Rounds recipe.
------------------------------------------------------------------------
r2833 | torhal | 2010-02-03 21:43:48 +0000 (Wed, 03 Feb 2010) | 1 line
Changed paths:
   M /trunk/Frame.lua

Minor logic changes and removed some unnecessary comments.
------------------------------------------------------------------------
r2832 | pompachomp | 2010-02-02 07:49:48 +0000 (Tue, 02 Feb 2010) | 3 lines
Changed paths:
   M /trunk/Database/Alchemy.lua
   M /trunk/Database/Blacksmithing.lua
   M /trunk/Database/Cooking.lua
   M /trunk/Database/Enchanting.lua
   M /trunk/Database/Engineering.lua
   M /trunk/Database/Inscription.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Leatherworking.lua
   M /trunk/Database/Tailoring.lua
   M /trunk/Datamine.lua

Add/remove some entries in the SPELL_ITEM table.
Add an entry to the DO_NOT_SCAN table.
Fix skill levels for various recipes throughout the database.
------------------------------------------------------------------------
r2831 | torhal | 2010-02-02 03:55:43 +0000 (Tue, 02 Feb 2010) | 4 lines
Changed paths:
   M /trunk/Datamine.lua

In addon:TooltipScanRecipe(): If results == nil, don't terminate - instead, don't add the empty results and print what we have.
Removed extra newlines from the datamine dump.
Re-formatted some code.
Removed dead code.
------------------------------------------------------------------------
r2830 | pompachomp | 2010-02-01 21:38:13 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/Datamine.lua

add some debug code
------------------------------------------------------------------------
r2829 | pompachomp | 2010-02-01 19:17:10 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Tailoring.lua

Fixed skill levels for Flying Carpet
------------------------------------------------------------------------
r2828 | pompachomp | 2010-02-01 18:16:49 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/Database/Vendor.lua

fixed a typo in one of the vendors coordinates
------------------------------------------------------------------------
r2827 | torhal | 2010-02-01 18:15:08 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/ARL.lua

Fixed a variable that was missed during renaming.
------------------------------------------------------------------------
r2826 | torhal | 2010-02-01 17:01:30 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Frame.lua
   M /trunk/Player.lua

Renamed and changed the usage of more table members.
------------------------------------------------------------------------
r2825 | torhal | 2010-02-01 15:27:18 +0000 (Mon, 01 Feb 2010) | 4 lines
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Datamine.lua
   M /trunk/Frame.lua
   M /trunk/Player.lua

Utilized the private AddOn "namespace" made available in 3.3 and named it "private" - now I'll have to write a proper API for AddOns which want data since direct access is now impossible.
Moved addon.WHATEVER_list to private.WHATEVER_list
Removed file-local RecipeList, CustomList, etc - now using the private lists only where absolutely needed.
Re-named and changed the usage for many more table members: vendor["SellList"] became vendor.sells acquire[index]["Type"] became acquire[index].type, etc.
------------------------------------------------------------------------
r2824 | torhal | 2010-02-01 10:31:22 +0000 (Mon, 01 Feb 2010) | 1 line
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Datamine.lua
   M /trunk/Frame.lua
   M /trunk/Player.lua

Renamed almost every member of a recipe table for clarity of purpose and changed all occurrences from recipe["Level"] to recipe.skill_level (for example). Retained original naming and usage of "Display", "Search", "Flags", and "Acquire" until I decide what to do with them.
------------------------------------------------------------------------
r2823 | torhal | 2010-02-01 03:56:36 +0000 (Mon, 01 Feb 2010) | 3 lines
Changed paths:
   M /trunk/ARL.lua

In addon:OnEnable(): Added a "Scanned" table member to the Player table, set all keys to the profession names and all values to false.
In addon:Scan(): Set the player's scanned value for the current profession to true.
In the GameTooltip hook for OnSetUnit: Check to see if the player has scanned the given profession before checking to see if the recipes are known so as to not print false positives.
------------------------------------------------------------------------
r2822 | pompachomp | 2010-01-31 21:00:17 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/Frame.lua

removed an unused variable.
------------------------------------------------------------------------
r2821 | pompachomp | 2010-01-31 17:47:50 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/.pkgmeta

more cleanup
------------------------------------------------------------------------
r2820 | pompachomp | 2010-01-31 17:46:12 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/.pkgmeta
   M /trunk/ARL.lua
   M /trunk/Config.lua
   M /trunk/Database/Jewelcrafting.lua
   M /trunk/Database/Tailoring.lua
   M /trunk/Docs/CHANGES.txt
   M /trunk/Frame.lua

Fixed some formatting stuff.
------------------------------------------------------------------------
r2819 | pompachomp | 2010-01-31 05:53:43 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/.pkgmeta

turn off changelog
------------------------------------------------------------------------
r2817 | pompachomp | 2010-01-31 05:29:06 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/.pkgmeta
   M /trunk/Docs/CHANGES.txt

Update changelog and turn it on.
------------------------------------------------------------------------
r2816 | pompachomp | 2010-01-31 04:59:34 +0000 (Sun, 31 Jan 2010) | 2 lines
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Locales/testenUS.lua

Fixed some of the names for the filter flags.
Modified the search box phrases a little.
------------------------------------------------------------------------
r2815 | pompachomp | 2010-01-31 01:48:44 +0000 (Sun, 31 Jan 2010) | 1 line
Changed paths:
   M /trunk/ARL.lua

The filter flag output in the text dump is prettier now.
------------------------------------------------------------------------
r2814 | pompachomp | 2010-01-30 02:09:09 +0000 (Sat, 30 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Jewelcrafting.lua

Fixed some incorrect skill levels
------------------------------------------------------------------------
r2813 | pompachomp | 2010-01-30 01:20:52 +0000 (Sat, 30 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Jewelcrafting.lua

Added the skill levels for the rest of the jewelcrafting recipes
------------------------------------------------------------------------
r2812 | pompachomp | 2010-01-29 19:26:22 +0000 (Fri, 29 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Database/Jewelcrafting.lua

Added skill levels for some of the jewelcrafting recipes.
Fixed the skill levels of the LK Epic Gem recipes.
------------------------------------------------------------------------
r2811 | pompachomp | 2010-01-29 07:21:23 +0000 (Fri, 29 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Datamine.lua

Added a bunch of the ICC patterns to the SPELL_ITEM table.
Added two item IDs to the DO_NOT_SCAN table.
------------------------------------------------------------------------
r2810 | Jim-Bim | 2010-01-28 20:55:03 +0000 (Thu, 28 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Frame.lua

AckisRecipeList:
- fixed emtpy search text bug (pompy included that in r2677)
------------------------------------------------------------------------
r2809 | Jim-Bim | 2010-01-28 20:42:32 +0000 (Thu, 28 Jan 2010) | 2 lines
Changed paths:
   M /trunk/ARL.lua

AckisRecipeList:
- fixed ARL.scan_button placement (yeah torhal messed it up)
------------------------------------------------------------------------
r2808 | Jim-Bim | 2010-01-27 13:16:21 +0000 (Wed, 27 Jan 2010) | 2 lines
Changed paths:
   M /trunk/Frame.lua

AckisRecipeList:
- replaced G.ARMOR_COLON (nil) with G.ARMOR .. ":"
------------------------------------------------------------------------
r2807 | pompachomp | 2010-01-26 09:48:31 +0000 (Tue, 26 Jan 2010) | 1 line
Changed paths:
   M /trunk/AckisRecipeList.toc
   M /trunk/Frame.lua

cleanup
------------------------------------------------------------------------
r2806 | pompachomp | 2010-01-24 16:17:55 +0000 (Sun, 24 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Smelting.lua

Corrected skill level for Smelt Thorium
------------------------------------------------------------------------
r2805 | pompachomp | 2010-01-21 05:11:47 +0000 (Thu, 21 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Quest.lua
   M /trunk/Locales/testenUS.lua

Removed all the phrases for the quest titles.
------------------------------------------------------------------------
r2804 | torhal | 2010-01-21 02:09:05 +0000 (Thu, 21 Jan 2010) | 4 lines
Changed paths:
   M /trunk/ARL.lua
   M /trunk/Database/Quest.lua
   M /trunk/Frame.lua

In addon:addLookupList(): Added code to grab the localized quest name from its tooltip.
In Quest.lua Added NEUTRAL, ALLIANCE, and HORDE constants.
In addon:InitQuest(): Added local function AddQuest(), which is a wrapper for addon:addLookupList(). Also removed all quest names, since those will be mined from the client. Replaced all calls to addon:addLookupList() with AddQuest().
Re-formatted a comment.
------------------------------------------------------------------------
r2803 | pompachomp | 2010-01-20 06:00:10 +0000 (Wed, 20 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Engineering.lua

Fixed skill level for Goblin Rocket Boots
------------------------------------------------------------------------
r2802 | pompachomp | 2010-01-15 16:15:59 +0000 (Fri, 15 Jan 2010) | 1 line
Changed paths:
   M /trunk/ARL.lua
   M /trunk/AckisRecipeList.toc
   M /trunk/Docs/Main.txt
   M /trunk/Docs/Wowwiki.txt

some cleanup.
------------------------------------------------------------------------
r2801 | pompachomp | 2010-01-15 03:12:04 +0000 (Fri, 15 Jan 2010) | 1 line
Changed paths:
   M /trunk/Database/Alchemy.lua

Added missing acquire data to Flask of Distilled Wisdom.
------------------------------------------------------------------------
r2800 | pompachomp | 2010-01-14 21:30:15 +0000 (Thu, 14 Jan 2010) | 1 line
Changed paths:
   M /trunk/AckisRecipeList.toc
   M /trunk/database.xml

Fixed the file paths to the database files in database.xml
------------------------------------------------------------------------
r2799 | pompachomp | 2010-01-14 21:20:53 +0000 (Thu, 14 Jan 2010) | 2 lines
Changed paths:
   A /trunk/Database (from /trunk/RecipeDB:2798)
   D /trunk/RecipeDB

Renamed the "RecipeDB" directory to "Database"
DON'T USE THIS ALPHA.
------------------------------------------------------------------------
r2798 | torhal | 2010-01-14 07:57:24 +0000 (Thu, 14 Jan 2010) | 1 line
Changed paths:
   M /trunk/Config.lua

More cosmetic changes to the config options.
------------------------------------------------------------------------
r2797 | torhal | 2010-01-14 07:23:00 +0000 (Thu, 14 Jan 2010) | 5 lines
Changed paths:
   M /trunk/Config.lua
   M /trunk/Frame.lua

Hide the MainPanel after it's created, so it isn't automatically shown when opening a TradeSkill.
Removed the "Scan" and "Text Dump" buttons from the config options since they were not actually usable from there and only served to confuse new users.
Moved the "Reset Window Position" button from the main config section to the Display options section.
Clarified the TomTom support code in the config.
Minor code cleanups.
------------------------------------------------------------------------
r2796 | torhal | 2010-01-13 11:03:56 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/Frame.lua

Added check to see if TomTom is loaded before displaying the tooltip hint for waypoint generation.
------------------------------------------------------------------------
r2795 | torhal | 2010-01-13 11:03:53 +0000 (Wed, 13 Jan 2010) | 1 line
Changed paths:
   M /trunk/local.xml

Fix pompy's "I'm going to bed now...right after I change the name of this folder and then commit to the repository" fuckup. :D
------------------------------------------------------------------------
r2794 | Ackis | 2010-01-12 18:36:38 +0000 (Tue, 12 Jan 2010) | 1 line
Changed paths:
   M /trunk/Docs/Main.txt

Nuke holiday message
------------------------------------------------------------------------
r2793 | Jim-Bim | 2010-01-11 14:55:08 +0000 (Mon, 11 Jan 2010) | 2 lines
Changed paths:
   M /trunk/RecipeDB/Engineering.lua

AckisRecipeList:
- Removed specialization from Engineering Pets
------------------------------------------------------------------------
r2792 | pompachomp | 2010-01-07 03:02:41 +0000 (Thu, 07 Jan 2010) | 1 line
Changed paths:
   M /trunk/Datamine.lua

reworded a message printed to chat.
------------------------------------------------------------------------
r2791 | pompachomp | 2010-01-02 20:37:10 +0000 (Sat, 02 Jan 2010) | 1 line
Changed paths:
   M /trunk/Colour.lua
   M /trunk/Locales/testenUS.lua

more cleanup
------------------------------------------------------------------------