From 8cadb37797c465c22a0bcbb166097112d3d0596c Mon Sep 17 00:00:00 2001
From: Robert Beekman <spoinky.nl@gmail.com>
Date: Mon, 6 Nov 2017 11:34:11 +0100
Subject: [PATCH] Added WoW addon management code

Updated Nuget packages
---
 Artemis/Artemis/Artemis.csproj                |   43 +-
 .../Games/Overwatch/OverwatchView.xaml        |    2 +-
 .../{Addon => Addon source}/Artemis.toc       |   18 +-
 .../{Addon => Addon source}/Core.lua          |  794 +++++-----
 .../Libs/AceAddon-3.0/AceAddon-3.0.lua        | 1348 ++++++++---------
 .../Libs/AceAddon-3.0/AceAddon-3.0.xml        |    6 +-
 .../Libs/AceComm-3.0/AceComm-3.0.lua          |  602 ++++----
 .../Libs/AceComm-3.0/AceComm-3.0.xml          |    8 +-
 .../Libs/AceComm-3.0/ChatThrottleLib.lua      | 1048 ++++++-------
 .../Libs/AceConsole-3.0/AceConsole-3.0.lua    |  500 +++---
 .../Libs/AceConsole-3.0/AceConsole-3.0.xml    |    6 +-
 .../Libs/AceEvent-3.0/AceEvent-3.0.lua        |  252 +--
 .../Libs/AceEvent-3.0/AceEvent-3.0.xml        |    6 +-
 .../Libs/AceTimer-3.0/AceTimer-3.0.lua        |  552 +++----
 .../Libs/AceTimer-3.0/AceTimer-3.0.xml        |    6 +-
 .../Libs/LibStub/LibStub.lua                  |   60 +-
 .../{Addon => Addon source}/Libs/json.lua     |  762 +++++-----
 .../{Addon => Addon source}/embeds.xml        |   16 +-
 .../Modules/Games/WoW/Resources/wow-addon.zip |  Bin 0 -> 33708 bytes
 Artemis/Artemis/Modules/Games/WoW/WoWModel.cs |   82 +-
 .../Artemis/Modules/Games/WoW/WoWSettings.cs  |    1 +
 .../Artemis/Modules/Games/WoW/WoWView.xaml    |   14 +-
 .../Artemis/Modules/Games/WoW/WoWViewModel.cs |   23 +-
 .../Artemis/Properties/Resources.Designer.cs  |   13 +-
 Artemis/Artemis/Properties/Resources.resx     |    3 +
 Artemis/Artemis/packages.config               |    6 +-
 26 files changed, 3147 insertions(+), 3024 deletions(-)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Artemis.toc (94%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Core.lua (96%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceAddon-3.0/AceAddon-3.0.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceAddon-3.0/AceAddon-3.0.xml (98%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceComm-3.0/AceComm-3.0.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceComm-3.0/AceComm-3.0.xml (98%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceComm-3.0/ChatThrottleLib.lua (96%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceConsole-3.0/AceConsole-3.0.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceConsole-3.0/AceConsole-3.0.xml (98%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceEvent-3.0/AceEvent-3.0.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceEvent-3.0/AceEvent-3.0.xml (98%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceTimer-3.0/AceTimer-3.0.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/AceTimer-3.0/AceTimer-3.0.xml (98%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/LibStub/LibStub.lua (97%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/Libs/json.lua (95%)
 rename Artemis/Artemis/Modules/Games/WoW/Resources/{Addon => Addon source}/embeds.xml (98%)
 create mode 100644 Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip

diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 9d63b14bb..0329417bb 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -152,8 +152,8 @@
       <HintPath>..\packages\Colore.5.1.0\lib\net35\Corale.Colore.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="CSCore, Version=1.2.1.1, Culture=neutral, PublicKeyToken=5a08f2b6f4415dea, processorArchitecture=MSIL">
-      <HintPath>..\packages\CSCore.1.2.1.1\lib\net35-client\CSCore.dll</HintPath>
+    <Reference Include="CSCore, Version=1.2.1.2, Culture=neutral, PublicKeyToken=5a08f2b6f4415dea, processorArchitecture=MSIL">
+      <HintPath>..\packages\CSCore.1.2.1.2\lib\net35-client\CSCore.dll</HintPath>
     </Reference>
     <Reference Include="CUE.NET, Version=1.1.3.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\CUE.NET.1.1.3.1\lib\net45\CUE.NET.dll</HintPath>
@@ -170,8 +170,8 @@
       <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DynamicExpresso.Core, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicExpresso.Core.1.3.3.6\lib\net40\DynamicExpresso.Core.dll</HintPath>
+    <Reference Include="DynamicExpresso.Core, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DynamicExpresso.Core.1.3.4.7\lib\net40\DynamicExpresso.Core.dll</HintPath>
     </Reference>
     <Reference Include="Gma.System.MouseKeyHook, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MouseKeyHook.5.4.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
@@ -267,7 +267,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="SpotifyAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpotifyAPI-NET.2.16.0\lib\SpotifyAPI.dll</HintPath>
+      <HintPath>..\packages\SpotifyAPI-NET.2.16.1\lib\SpotifyAPI.dll</HintPath>
     </Reference>
     <Reference Include="Squirrel, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll</HintPath>
@@ -799,16 +799,17 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <None Include="Modules\Games\WoW\Resources\Addon\Artemis.toc" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Core.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceAddon-3.0\AceAddon-3.0.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceComm-3.0\AceComm-3.0.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceComm-3.0\ChatThrottleLib.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceConsole-3.0\AceConsole-3.0.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceEvent-3.0\AceEvent-3.0.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\AceTimer-3.0\AceTimer-3.0.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\json.lua" />
-    <None Include="Modules\Games\WoW\Resources\Addon\Libs\LibStub\LibStub.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Artemis.toc" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Core.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceAddon-3.0\AceAddon-3.0.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceComm-3.0\AceComm-3.0.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceComm-3.0\ChatThrottleLib.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceConsole-3.0\AceConsole-3.0.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceEvent-3.0\AceEvent-3.0.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceTimer-3.0\AceTimer-3.0.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\json.lua" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\LibStub\LibStub.lua" />
+    <None Include="Modules\Games\WoW\Resources\wow-addon.zip" />
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -1087,12 +1088,12 @@
     <None Include="Modules\Games\EurotruckSimulator2\Resources\Win64\ets2-telemetry-server.dll" />
     <None Include="Resources\audio.png" />
     <None Include="Resources\ambilight.png" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\embeds.xml" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\Libs\AceAddon-3.0\AceAddon-3.0.xml" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\Libs\AceComm-3.0\AceComm-3.0.xml" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\Libs\AceConsole-3.0\AceConsole-3.0.xml" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\Libs\AceEvent-3.0\AceEvent-3.0.xml" />
-    <Resource Include="Modules\Games\WoW\Resources\Addon\Libs\AceTimer-3.0\AceTimer-3.0.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\embeds.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceAddon-3.0\AceAddon-3.0.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceComm-3.0\AceComm-3.0.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceConsole-3.0\AceConsole-3.0.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceEvent-3.0\AceEvent-3.0.xml" />
+    <None Include="Modules\Games\WoW\Resources\Addon source\Libs\AceTimer-3.0\AceTimer-3.0.xml" />
     <Content Include="Resources\CounterStrike\csgoGamestateConfiguration.txt" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml b/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
index 7fa2840a1..60369248f 100644
--- a/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
+++ b/Artemis/Artemis/Modules/Games/Overwatch/OverwatchView.xaml
@@ -41,7 +41,7 @@
 
         <!-- Game directory -->
         <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
-            <Label FontSize="20" HorizontalAlignment="Left" Content="Overwatch Directory" />
+            <Label FontSize="20" HorizontalAlignment="Left" Content="Overwatch directory" />
             <Grid>
                 <TextBox x:Name="GameDirectory" Height="23" TextWrapping="Wrap" Margin="0,0,30,0" Text="{Binding Path=Settings.GameDirectory, Mode=TwoWay}" cal:Message.Attach="[Event LostFocus] = [Action PlaceDll]" />
                 <Button x:Name="BrowseDirectory" Content="..." RenderTransformOrigin="-0.039,-0.944" HorizontalAlignment="Right" Width="25" Style="{DynamicResource SquareButtonStyle}" Height="26" />
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Artemis.toc b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Artemis.toc
similarity index 94%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Artemis.toc
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Artemis.toc
index 145946e76..824da3279 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Artemis.toc
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Artemis.toc	
@@ -1,9 +1,9 @@
-## Interface: 70300
-## Title: Artemis
-## Notes: Transmits ingame data to Artemis
-## Author: SpoinkyNL
-## Version: 1.0.0
-
-embeds.xml
-
-Core.lua
+## Interface: 70300
+## Title: Artemis
+## Notes: Transmits ingame data to Artemis
+## Author: SpoinkyNL
+## Version: 1.0.0
+
+embeds.xml
+
+Core.lua
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Core.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua
similarity index 96%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Core.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua
index 4a04339d8..52a6287e9 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Core.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua	
@@ -1,398 +1,398 @@
-Artemis = LibStub("AceAddon-3.0"):NewAddon("Artemis", "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0")
-json = LibStub("json")
-
--- Hook onto logout because it seems PLAYER_LOGOUT fires on reload as well
-local _Logout = Logout
-
-local debugging = false
-local lastLine = {}
-local channeling = {}
-local unitUpdates = {}
-local lastTransmitMessage
-local lastTransmitTime
-local lastBuffs = "";
-local lastDebuffs = "";
-local prefixCounts = {}
-
-channeling["player"] = false
-channeling["target"] = false
-
-function Artemis:OnEnable()
-    -- Register all the various events that Artemis will want to know about
-    Artemis:RegisterEvent("PLAYER_ENTERING_WORLD")
-    Artemis:RegisterEvent("PLAYER_LEVEL_UP")
-    Artemis:RegisterEvent("PLAYER_FLAGS_CHANGED")
-    Artemis:RegisterEvent("ACHIEVEMENT_EARNED")
-    Artemis:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
-    Artemis:RegisterEvent("UNIT_TARGET")
-    Artemis:RegisterEvent("UNIT_HEALTH")
-    Artemis:RegisterEvent("UNIT_POWER")
-    Artemis:RegisterEvent("UNIT_AURA")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_START")    
-    Artemis:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_FAILED")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_DELAYED")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
-    Artemis:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
-    Artemis:RegisterEvent("ZONE_CHANGED")
-    Artemis:RegisterEvent("ZONE_CHANGED_NEW_AREA")
-
-    -- Register the chat command /artemis <something>
-    Artemis:RegisterChatCommand("artemis", "HandleChatCommand")
-
-    -- Create a loop that'll periodically send character data in case of an Artemis restart/late start
-    Artemis:ScheduleRepeatingTimer("PeriodicUpdate", 30)
-end
-
-function Artemis:HandleChatCommand(input)
-    if input == "debug" then
-        debugging = not (debugging)
-        if debugging then
-            Artemis:Print("Debugging enabled.")
-        else
-            Artemis:Print("Debugging disabled.")
-        end
-    end
-    if input == "rc" then
-        prefixCounts = {}
-        Artemis:Print("Reset the send counters.")
-    end
-    if input == nill or input == "" or input == "help" then
-        Artemis:Print("Available chat commands:")
-        Artemis:Printf("|cffb7b7b7/artemis debug|r: Toggle debugging")
-        Artemis:Printf("|cffb7b7b7/artemis rc|r: Reset the debug counters")
-    end
-end
-
-function Artemis:Transmit(prefix, data, prio)    
-    local msg = "artemis(".. prefix .. "|" .. json.encode(data) ..")"
-    -- If the message is the same as the previous, make sure it wasn't sent less than 250ms ago
-    if msg == lastTransmitMessage then 
-        if not (lastTransmitTime == nil) then           
-            local diff = GetTime() - lastTransmitTime;            
-            if (diff < 0.25) then
-                return
-            end
-        end
-    end
-    
-    lastTransmitTime = GetTime()
-
-    if debugging == true then
-        if prefixCounts[prefix] == nill then
-            prefixCounts[prefix] = 0
-        end
-        prefixCounts[prefix] = prefixCounts[prefix] + 1
-    end
-    
-    if debugging == true then
-        Artemis:Printf("Transmitting with prefix |cfffdff71" .. prefix .. "|r (" .. prefixCounts[prefix] .. ").")
-        Artemis:Print(msg)
-    end
-    Artemis:SendCommMessage("(artemis)", msg, "WHISPER", UnitName("player"), prio)
-end
-
-function Artemis:TransmitUnitState(unit, ignoreThrottle)
-    if not ignoreThrottle then
-        if not (unitUpdates[unit] == nil) then           
-            local diff = GetTime() - unitUpdates[unit]            
-            if (diff < 0.5) then
-                return
-            end
-        end
-    end
-
-    local table = {
-        h = UnitHealth(unit), 
-        mh = UnitHealthMax(unit), 
-        p = UnitPower(unit),
-        mp = UnitPowerMax(unit), 
-        t = UnitPowerType(unit)        
-    };
-
-    unitUpdates[unit] = GetTime()
-    Artemis:Transmit(unit .. "State", table)
-end
-
-function Artemis:GetUnitDetails(unit)
-   return {
-       n = UnitName(unit), 
-       c = UnitClass(unit), 
-       l = UnitLevel(unit),
-       r = UnitRace(unit),
-       g = UnitSex(unit),
-       f = UnitFactionGroup(unit)
-   };
-end
-
-function Artemis:GetPlayerDetails()
-    local details = Artemis:GetUnitDetails("player")
-    local id, name, _, _, role = GetSpecializationInfo(GetSpecialization())
-    
-    details.realm = GetRealmName()
-    details.achievementPoints = GetTotalAchievementPoints(false)
-    details.s = {id = id, n = name, r = role}    
-    
-    return details
-end
-
-function Artemis:GetUnitAuras(unit, filter)
-    local auras = {};
-    for index = 1, 40 do
-         local name, _, _, count, _, duration, expires, caster, _, _, spellID = UnitAura(unit, index, filter);
-         if not (name == nil) then
-            local buffTable = {n = name, id = spellID}
-            -- Leave these values out if they are 0 to save some space
-            if count > 0 then
-                buffTable["c"] = count
-            end
-            if duration > 0 then
-                buffTable["d"] = duration
-            end
-            if expires > 0 then
-                buffTable["e"] = expires
-            end
-            table.insert(auras, buffTable)
-         end
-    end
-    return auras
-end
-
-function Artemis:PeriodicUpdate()
-    -- Don't do this in combat, enough data going out at that time already
-    if InCombatLockdown() then
-        return
-    end
-    Artemis:Transmit("player", Artemis:GetPlayerDetails())
-    Artemis:TransmitUnitState("player", true);
-end
-
-function Artemis:PLAYER_ENTERING_WORLD(...)    
-    Artemis:Transmit("player", Artemis:GetPlayerDetails())
-    Artemis:TransmitUnitState("player", true);
-end
-
-function Logout()
-    Artemis:Transmit("gameState", "loggedOut")
-    return _Logout()
-end
-
-function Artemis:PLAYER_LEVEL_UP(...)
-    Artemis:Transmit("player", Artemis:GetPlayerDetails())
-end
-
-function Artemis:PLAYER_FLAGS_CHANGED(...)
-    local _, unitID = ...
-    if unitID == "player" then
-        -- AFK overwrites DND
-        if UnitIsAFK("player") then
-            Artemis:Transmit("gameState", "afk")
-            return
-        end
-        if UnitIsDND("player") then
-            Artemis:Transmit("gameState", "dnd")
-            return
-        end
-        Artemis:Transmit("gameState", "ingame")
-    end
-end
-
-function Artemis:ACHIEVEMENT_EARNED(...)
-    Artemis:Transmit("player", Artemis:GetPlayerDetails())
-end
-
-function Artemis:ACTIVE_TALENT_GROUP_CHANGED(...)
-    Artemis:Transmit("player", Artemis:GetPlayerDetails())
-end
-
-function Artemis:UNIT_TARGET(...)
-    local _, source = ...
-    if not (source == "player") then
-        return
-    end
-
-    local details = Artemis:GetUnitDetails("target")
-    channeling["target"] = false
-
-    Artemis:Transmit("target", details)
-    Artemis:TransmitUnitState("target", true);
-end
-
-function Artemis:UNIT_HEALTH(...)
-    local _, source = ...
-    if not (source == "player") and not (source == "target") then
-        return
-    end
-        
-    Artemis:TransmitUnitState(source, false);
-end
-
-function Artemis:UNIT_POWER(...)
-    local _, source = ...
-    if not (source == "player") and not (source == "target") then
-        return
-    end
-        
-    Artemis:TransmitUnitState(source, false);
-end
-
-function Artemis:UNIT_AURA(...)
-    local _, source = ...
-    if not (source == "player") then
-        return
-    end
-    
-    local buffs = Artemis:GetUnitAuras(source, "PLAYER|HELPFUL")
-    local debuffs = Artemis:GetUnitAuras(source, "PLAYER|HARMFUL")    
-    
-    local newBuffs = json.encode(buffs)
-    local newDebuffs = json.encode(debuffs)
-    
-    if not (lastBuffs == newBuffs) then
-        Artemis:Transmit("buffs", buffs)    
-    end
-    if not (lastDebuffs == newDebuffs) then
-        Artemis:Transmit("debuffs", debuffs)    
-    end
-
-    lastBuffs = newBuffs
-    lastDebuffs = newDebuffs
-end
-
--- Detect non-instant spell casts
-function Artemis:UNIT_SPELLCAST_START(...)
-    local _, unitID, spell, rank, lineID, spellID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-    
-    local name, _, _, _, startTime, endTime, _, _, notInterruptible = UnitCastingInfo(unitID)
-    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
-    lastLine[unitID] = lineID
-
-    Artemis:Transmit("spellCast", table, "ALERT")
-end
-
--- Detect instant spell casts
-function Artemis:UNIT_SPELLCAST_SUCCEEDED (...)       
-    local _, unitID, spell, rank, lineID, spellID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end    
-    if channeling[unitID] == true then
-        return
-    end
-    -- Many spells are irrelevant system spells, don't transmit these
-    if unitID == "player" and not (IsPlayerSpell(spellID)) then
-        return
-    end
-
-    local name, subText, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible = UnitCastingInfo(unitID)    
-    -- Don't trigger on the success of a non instant cast
-    if not (lastLine[unitID] == nil) and lastLine[unitID] == lineID then        
-        return
-    end
-    
-    -- Set back the last line to what is currently being cast (Fireblast during Fireball per example)
-    if not (name == nil) then        
-        lastLine[unitID] = castID
-    else
-        lastLine[unitID] = nil
-    end
-    
-    local table = {uid = unitID, n = spell, sid = spellID}
-
-    Artemis:Transmit("instantSpellCast", table, "ALERT")    
-end
-
--- Detect falure of non instant casts
-function Artemis:UNIT_SPELLCAST_FAILED (...)
-    local source, unitID, _, _, lineID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end        
-    if lastLine[unitID] == nil or not (lastLine[unitID] == lineID) then
-        return
-    end
-
-    lastLine[unitID] = nil
-
-    Artemis:Transmit("spellCastFailed", unitID, "ALERT")     
-end
-
--- Detect falure of non instant casts
-function Artemis:UNIT_SPELLCAST_DELAYED (...)
-    local _, unitID, spell, rank, lineID, spellID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-    local name, _, _, _, startTime, endTime, _, _, notInterruptible = UnitCastingInfo(unitID)
-    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
-
-     Artemis:Transmit("spellCast", table, "ALERT")
-end
-
--- Detect cancellation of non instant casts
-function Artemis:UNIT_SPELLCAST_INTERRUPTED (...)
-    local source, unitID, _, _, lineID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-    if lastLine[unitID] == nil or not (lastLine[unitID] == lineID) then
-        return
-    end
-
-    lastLine[unitID] = nil
-
-    Artemis:Transmit("spellCastInterrupted", unitID, "ALERT")             
-end
-
--- Detect spell channels
-function Artemis:UNIT_SPELLCAST_CHANNEL_START(...)
-    local _, unitID, spell, rank, lineID, spellID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-    channeling[unitID] = true
-    
-    local name, _, _, _, startTime, endTime, _, notInterruptible = UnitChannelInfo(unitID)
-    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
-
-    Artemis:Transmit("spellChannel", table, "ALERT")
-end
-
-function Artemis:UNIT_SPELLCAST_CHANNEL_UPDATE (...)
-    local _, unitID, spell, rank, lineID, spellID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-    local name, _, _, _, startTime, endTime, _, notInterruptible = UnitChannelInfo(unitID)
-    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
-
-     Artemis:Transmit("spellChannel", table, "ALERT")
-end
-
--- Detect cancellation of channels
-function Artemis:UNIT_SPELLCAST_CHANNEL_STOP (...)
-    local source, unitID, _, _, lineID = ...
-    if not (unitID == "player") and not (unitID == "target") then
-        return
-    end
-
-    channeling[unitID] = false
-    
-    Artemis:Transmit("spellChannelInterrupted", unitID, "ALERT")             
-end
-
-function Artemis:ZONE_CHANGED_NEW_AREA (...)
-    local pvpType, isSubZonePVP, factionName = GetZonePVPInfo()
-
-    Artemis:Transmit("zone", {z = GetRealZoneText(), s = GetSubZoneText(), t = pvpType, p = isSubZonePVP, f = factionName})
-end
-function Artemis:ZONE_CHANGED (...)
-    local pvpType, isSubZonePVP, factionName = GetZonePVPInfo()
-    
-    Artemis:Transmit("zone", {z = GetRealZoneText(), s = GetSubZoneText(), t = pvpType, p = isSubZonePVP, f = factionName})
+Artemis = LibStub("AceAddon-3.0"):NewAddon("Artemis", "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0")
+json = LibStub("json")
+
+-- Hook onto logout because it seems PLAYER_LOGOUT fires on reload as well
+local _Logout = Logout
+
+local debugging = false
+local lastLine = {}
+local channeling = {}
+local unitUpdates = {}
+local lastTransmitMessage
+local lastTransmitTime
+local lastBuffs = "";
+local lastDebuffs = "";
+local prefixCounts = {}
+
+channeling["player"] = false
+channeling["target"] = false
+
+function Artemis:OnEnable()
+    -- Register all the various events that Artemis will want to know about
+    Artemis:RegisterEvent("PLAYER_ENTERING_WORLD")
+    Artemis:RegisterEvent("PLAYER_LEVEL_UP")
+    Artemis:RegisterEvent("PLAYER_FLAGS_CHANGED")
+    Artemis:RegisterEvent("ACHIEVEMENT_EARNED")
+    Artemis:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
+    Artemis:RegisterEvent("UNIT_TARGET")
+    Artemis:RegisterEvent("UNIT_HEALTH")
+    Artemis:RegisterEvent("UNIT_POWER")
+    Artemis:RegisterEvent("UNIT_AURA")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_START")    
+    Artemis:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_FAILED")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_DELAYED")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_START")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_STOP")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_CHANNEL_UPDATE")
+    Artemis:RegisterEvent("UNIT_SPELLCAST_INTERRUPTED")
+    Artemis:RegisterEvent("ZONE_CHANGED")
+    Artemis:RegisterEvent("ZONE_CHANGED_NEW_AREA")
+
+    -- Register the chat command /artemis <something>
+    Artemis:RegisterChatCommand("artemis", "HandleChatCommand")
+
+    -- Create a loop that'll periodically send character data in case of an Artemis restart/late start
+    Artemis:ScheduleRepeatingTimer("PeriodicUpdate", 30)
+end
+
+function Artemis:HandleChatCommand(input)
+    if input == "debug" then
+        debugging = not (debugging)
+        if debugging then
+            Artemis:Print("Debugging enabled.")
+        else
+            Artemis:Print("Debugging disabled.")
+        end
+    end
+    if input == "rc" then
+        prefixCounts = {}
+        Artemis:Print("Reset the send counters.")
+    end
+    if input == nill or input == "" or input == "help" then
+        Artemis:Print("Available chat commands:")
+        Artemis:Printf("|cffb7b7b7/artemis debug|r: Toggle debugging")
+        Artemis:Printf("|cffb7b7b7/artemis rc|r: Reset the debug counters")
+    end
+end
+
+function Artemis:Transmit(prefix, data, prio)    
+    local msg = "artemis(".. prefix .. "|" .. json.encode(data) ..")"
+    -- If the message is the same as the previous, make sure it wasn't sent less than 250ms ago
+    if msg == lastTransmitMessage then 
+        if not (lastTransmitTime == nil) then           
+            local diff = GetTime() - lastTransmitTime;            
+            if (diff < 0.25) then
+                return
+            end
+        end
+    end
+    
+    lastTransmitTime = GetTime()
+
+    if debugging == true then
+        if prefixCounts[prefix] == nill then
+            prefixCounts[prefix] = 0
+        end
+        prefixCounts[prefix] = prefixCounts[prefix] + 1
+    end
+    
+    if debugging == true then
+        Artemis:Printf("Transmitting with prefix |cfffdff71" .. prefix .. "|r (" .. prefixCounts[prefix] .. ").")
+        Artemis:Print(msg)
+    end
+    Artemis:SendCommMessage("(artemis)", msg, "WHISPER", UnitName("player"), prio)
+end
+
+function Artemis:TransmitUnitState(unit, ignoreThrottle)
+    if not ignoreThrottle then
+        if not (unitUpdates[unit] == nil) then           
+            local diff = GetTime() - unitUpdates[unit]            
+            if (diff < 0.5) then
+                return
+            end
+        end
+    end
+
+    local table = {
+        h = UnitHealth(unit), 
+        mh = UnitHealthMax(unit), 
+        p = UnitPower(unit),
+        mp = UnitPowerMax(unit), 
+        t = UnitPowerType(unit)        
+    };
+
+    unitUpdates[unit] = GetTime()
+    Artemis:Transmit(unit .. "State", table)
+end
+
+function Artemis:GetUnitDetails(unit)
+   return {
+       n = UnitName(unit), 
+       c = UnitClass(unit), 
+       l = UnitLevel(unit),
+       r = UnitRace(unit),
+       g = UnitSex(unit),
+       f = UnitFactionGroup(unit)
+   };
+end
+
+function Artemis:GetPlayerDetails()
+    local details = Artemis:GetUnitDetails("player")
+    local id, name, _, _, role = GetSpecializationInfo(GetSpecialization())
+    
+    details.realm = GetRealmName()
+    details.achievementPoints = GetTotalAchievementPoints(false)
+    details.s = {id = id, n = name, r = role}    
+    
+    return details
+end
+
+function Artemis:GetUnitAuras(unit, filter)
+    local auras = {};
+    for index = 1, 40 do
+         local name, _, _, count, _, duration, expires, caster, _, _, spellID = UnitAura(unit, index, filter);
+         if not (name == nil) then
+            local buffTable = {n = name, id = spellID}
+            -- Leave these values out if they are 0 to save some space
+            if count > 0 then
+                buffTable["c"] = count
+            end
+            if duration > 0 then
+                buffTable["d"] = duration
+            end
+            if expires > 0 then
+                buffTable["e"] = expires
+            end
+            table.insert(auras, buffTable)
+         end
+    end
+    return auras
+end
+
+function Artemis:PeriodicUpdate()
+    -- Don't do this in combat, enough data going out at that time already
+    if InCombatLockdown() then
+        return
+    end
+    Artemis:Transmit("player", Artemis:GetPlayerDetails())
+    Artemis:TransmitUnitState("player", true);
+end
+
+function Artemis:PLAYER_ENTERING_WORLD(...)    
+    Artemis:Transmit("player", Artemis:GetPlayerDetails())
+    Artemis:TransmitUnitState("player", true);
+end
+
+function Logout()
+    Artemis:Transmit("gameState", "loggedOut")
+    return _Logout()
+end
+
+function Artemis:PLAYER_LEVEL_UP(...)
+    Artemis:Transmit("player", Artemis:GetPlayerDetails())
+end
+
+function Artemis:PLAYER_FLAGS_CHANGED(...)
+    local _, unitID = ...
+    if unitID == "player" then
+        -- AFK overwrites DND
+        if UnitIsAFK("player") then
+            Artemis:Transmit("gameState", "afk")
+            return
+        end
+        if UnitIsDND("player") then
+            Artemis:Transmit("gameState", "dnd")
+            return
+        end
+        Artemis:Transmit("gameState", "ingame")
+    end
+end
+
+function Artemis:ACHIEVEMENT_EARNED(...)
+    Artemis:Transmit("player", Artemis:GetPlayerDetails())
+end
+
+function Artemis:ACTIVE_TALENT_GROUP_CHANGED(...)
+    Artemis:Transmit("player", Artemis:GetPlayerDetails())
+end
+
+function Artemis:UNIT_TARGET(...)
+    local _, source = ...
+    if not (source == "player") then
+        return
+    end
+
+    local details = Artemis:GetUnitDetails("target")
+    channeling["target"] = false
+
+    Artemis:Transmit("target", details)
+    Artemis:TransmitUnitState("target", true);
+end
+
+function Artemis:UNIT_HEALTH(...)
+    local _, source = ...
+    if not (source == "player") and not (source == "target") then
+        return
+    end
+        
+    Artemis:TransmitUnitState(source, false);
+end
+
+function Artemis:UNIT_POWER(...)
+    local _, source = ...
+    if not (source == "player") and not (source == "target") then
+        return
+    end
+        
+    Artemis:TransmitUnitState(source, false);
+end
+
+function Artemis:UNIT_AURA(...)
+    local _, source = ...
+    if not (source == "player") then
+        return
+    end
+    
+    local buffs = Artemis:GetUnitAuras(source, "PLAYER|HELPFUL")
+    local debuffs = Artemis:GetUnitAuras(source, "PLAYER|HARMFUL")    
+    
+    local newBuffs = json.encode(buffs)
+    local newDebuffs = json.encode(debuffs)
+    
+    if not (lastBuffs == newBuffs) then
+        Artemis:Transmit("buffs", buffs)    
+    end
+    if not (lastDebuffs == newDebuffs) then
+        Artemis:Transmit("debuffs", debuffs)    
+    end
+
+    lastBuffs = newBuffs
+    lastDebuffs = newDebuffs
+end
+
+-- Detect non-instant spell casts
+function Artemis:UNIT_SPELLCAST_START(...)
+    local _, unitID, spell, rank, lineID, spellID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+    
+    local name, _, _, _, startTime, endTime, _, _, notInterruptible = UnitCastingInfo(unitID)
+    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
+    lastLine[unitID] = lineID
+
+    Artemis:Transmit("spellCast", table, "ALERT")
+end
+
+-- Detect instant spell casts
+function Artemis:UNIT_SPELLCAST_SUCCEEDED (...)       
+    local _, unitID, spell, rank, lineID, spellID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end    
+    if channeling[unitID] == true then
+        return
+    end
+    -- Many spells are irrelevant system spells, don't transmit these
+    if unitID == "player" and not (IsPlayerSpell(spellID)) then
+        return
+    end
+
+    local name, subText, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible = UnitCastingInfo(unitID)    
+    -- Don't trigger on the success of a non instant cast
+    if not (lastLine[unitID] == nil) and lastLine[unitID] == lineID then        
+        return
+    end
+    
+    -- Set back the last line to what is currently being cast (Fireblast during Fireball per example)
+    if not (name == nil) then        
+        lastLine[unitID] = castID
+    else
+        lastLine[unitID] = nil
+    end
+    
+    local table = {uid = unitID, n = spell, sid = spellID}
+
+    Artemis:Transmit("instantSpellCast", table, "ALERT")    
+end
+
+-- Detect falure of non instant casts
+function Artemis:UNIT_SPELLCAST_FAILED (...)
+    local source, unitID, _, _, lineID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end        
+    if lastLine[unitID] == nil or not (lastLine[unitID] == lineID) then
+        return
+    end
+
+    lastLine[unitID] = nil
+
+    Artemis:Transmit("spellCastFailed", unitID, "ALERT")     
+end
+
+-- Detect falure of non instant casts
+function Artemis:UNIT_SPELLCAST_DELAYED (...)
+    local _, unitID, spell, rank, lineID, spellID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+    local name, _, _, _, startTime, endTime, _, _, notInterruptible = UnitCastingInfo(unitID)
+    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
+
+     Artemis:Transmit("spellCast", table, "ALERT")
+end
+
+-- Detect cancellation of non instant casts
+function Artemis:UNIT_SPELLCAST_INTERRUPTED (...)
+    local source, unitID, _, _, lineID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+    if lastLine[unitID] == nil or not (lastLine[unitID] == lineID) then
+        return
+    end
+
+    lastLine[unitID] = nil
+
+    Artemis:Transmit("spellCastInterrupted", unitID, "ALERT")             
+end
+
+-- Detect spell channels
+function Artemis:UNIT_SPELLCAST_CHANNEL_START(...)
+    local _, unitID, spell, rank, lineID, spellID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+    channeling[unitID] = true
+    
+    local name, _, _, _, startTime, endTime, _, notInterruptible = UnitChannelInfo(unitID)
+    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
+
+    Artemis:Transmit("spellChannel", table, "ALERT")
+end
+
+function Artemis:UNIT_SPELLCAST_CHANNEL_UPDATE (...)
+    local _, unitID, spell, rank, lineID, spellID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+    local name, _, _, _, startTime, endTime, _, notInterruptible = UnitChannelInfo(unitID)
+    local table = {uid = unitID, n = name, sid = spellID, s = startTime, e = endTime, ni = notInterruptible}
+
+     Artemis:Transmit("spellChannel", table, "ALERT")
+end
+
+-- Detect cancellation of channels
+function Artemis:UNIT_SPELLCAST_CHANNEL_STOP (...)
+    local source, unitID, _, _, lineID = ...
+    if not (unitID == "player") and not (unitID == "target") then
+        return
+    end
+
+    channeling[unitID] = false
+    
+    Artemis:Transmit("spellChannelInterrupted", unitID, "ALERT")             
+end
+
+function Artemis:ZONE_CHANGED_NEW_AREA (...)
+    local pvpType, isSubZonePVP, factionName = GetZonePVPInfo()
+
+    Artemis:Transmit("zone", {z = GetRealZoneText(), s = GetSubZoneText(), t = pvpType, p = isSubZonePVP, f = factionName})
+end
+function Artemis:ZONE_CHANGED (...)
+    local pvpType, isSubZonePVP, factionName = GetZonePVPInfo()
+    
+    Artemis:Transmit("zone", {z = GetRealZoneText(), s = GetSubZoneText(), t = pvpType, p = isSubZonePVP, f = factionName})
 end
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.lua
index b338695fa..a7f7279cc 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.lua	
@@ -1,674 +1,674 @@
---- **AceAddon-3.0** provides a template for creating addon objects.
--- It'll provide you with a set of callback functions that allow you to simplify the loading
--- process of your addon.\\
--- Callbacks provided are:\\
--- * **OnInitialize**, which is called directly after the addon is fully loaded.
--- * **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present.
--- * **OnDisable**, which is only called when your addon is manually being disabled.
--- @usage
--- -- A small (but complete) addon, that doesn't do anything, 
--- -- but shows usage of the callbacks.
--- local MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- 
--- function MyAddon:OnInitialize()
---   -- do init tasks here, like loading the Saved Variables, 
---   -- or setting up slash commands.
--- end
--- 
--- function MyAddon:OnEnable()
---   -- Do more initialization here, that really enables the use of your addon.
---   -- Register Events, Hook functions, Create Frames, Get information from 
---   -- the game that wasn't available in OnInitialize
--- end
---
--- function MyAddon:OnDisable()
---   -- Unhook, Unregister Events, Hide frames that you created.
---   -- You would probably only use an OnDisable if you want to 
---   -- build a "standby" mode, or be able to toggle modules on/off.
--- end
--- @class file
--- @name AceAddon-3.0.lua
--- @release $Id: AceAddon-3.0.lua 1084 2013-04-27 20:14:11Z nevcairiel $
-
-local MAJOR, MINOR = "AceAddon-3.0", 12
-local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceAddon then return end -- No Upgrade needed.
-
-AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame
-AceAddon.addons = AceAddon.addons or {} -- addons in general
-AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon.
-AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized
-AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled
-AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon
-
--- Lua APIs
-local tinsert, tconcat, tremove = table.insert, table.concat, table.remove
-local fmt, tostring = string.format, tostring
-local select, pairs, next, type, unpack = select, pairs, next, type, unpack
-local loadstring, assert, error = loadstring, assert, error
-local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, IsLoggedIn, geterrorhandler
-
---[[
-	 xpcall safecall implementation
-]]
-local xpcall = xpcall
-
-local function errorhandler(err)
-	return geterrorhandler()(err)
-end
-
-local function CreateDispatcher(argCount)
-	local code = [[
-		local xpcall, eh = ...
-		local method, ARGS
-		local function call() return method(ARGS) end
-	
-		local function dispatch(func, ...)
-			 method = func
-			 if not method then return end
-			 ARGS = ...
-			 return xpcall(call, eh)
-		end
-	
-		return dispatch
-	]]
-	
-	local ARGS = {}
-	for i = 1, argCount do ARGS[i] = "arg"..i end
-	code = code:gsub("ARGS", tconcat(ARGS, ", "))
-	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-end
-
-local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-	local dispatcher = CreateDispatcher(argCount)
-	rawset(self, argCount, dispatcher)
-	return dispatcher
-end})
-Dispatchers[0] = function(func)
-	return xpcall(func, errorhandler)
-end
-
-local function safecall(func, ...)
-	-- we check to see if the func is passed is actually a function here and don't error when it isn't
-	-- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not
-	-- present execution should continue without hinderance
-	if type(func) == "function" then
-		return Dispatchers[select('#', ...)](func, ...)
-	end
-end
-
--- local functions that will be implemented further down
-local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype
-
--- used in the addon metatable
-local function addontostring( self ) return self.name end 
-
--- Check if the addon is queued for initialization
-local function queuedForInitialization(addon)
-	for i = 1, #AceAddon.initializequeue do
-		if AceAddon.initializequeue[i] == addon then
-			return true
-		end
-	end
-	return false
-end
-
---- Create a new AceAddon-3.0 addon.
--- Any libraries you specified will be embeded, and the addon will be scheduled for 
--- its OnInitialize and OnEnable callbacks.
--- The final addon object, with all libraries embeded, will be returned.
--- @paramsig [object ,]name[, lib, ...]
--- @param object Table to use as a base for the addon (optional)
--- @param name Name of the addon object to create
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create a simple addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceEvent-3.0")
---
--- -- Create a Addon object based on the table of a frame
--- local MyFrame = CreateFrame("Frame")
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0")
-function AceAddon:NewAddon(objectorname, ...)
-	local object,name
-	local i=1
-	if type(objectorname)=="table" then
-		object=objectorname
-		name=...
-		i=2
-	else
-		name=objectorname
-	end
-	if type(name)~="string" then
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2)
-	end
-	if self.addons[name] then 
-		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2)
-	end
-	
-	object = object or {}
-	object.name = name
-
-	local addonmeta = {}
-	local oldmeta = getmetatable(object)
-	if oldmeta then
-		for k, v in pairs(oldmeta) do addonmeta[k] = v end
-	end
-	addonmeta.__tostring = addontostring
-	
-	setmetatable( object, addonmeta )
-	self.addons[name] = object
-	object.modules = {}
-	object.orderedModules = {}
-	object.defaultModuleLibraries = {}
-	Embed( object ) -- embed NewModule, GetModule methods
-	self:EmbedLibraries(object, select(i,...))
-	
-	-- add to queue of addons to be initialized upon ADDON_LOADED
-	tinsert(self.initializequeue, object)
-	return object
-end
-
-
---- Get the addon object by its name from the internal AceAddon registry.
--- Throws an error if the addon object cannot be found (except if silent is set).
--- @param name unique name of the addon object
--- @param silent if true, the addon is optional, silently return nil if its not found
--- @usage 
--- -- Get the Addon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
-function AceAddon:GetAddon(name, silent)
-	if not silent and not self.addons[name] then
-		error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2)
-	end
-	return self.addons[name]
-end
-
--- - Embed a list of libraries into the specified addon.
--- This function will try to embed all of the listed libraries into the addon
--- and error if a single one fails.
---
--- **Note:** This function is for internal use by :NewAddon/:NewModule
--- @paramsig addon, [lib, ...]
--- @param addon addon object to embed the libs in
--- @param lib List of libraries to embed into the addon
-function AceAddon:EmbedLibraries(addon, ...)
-	for i=1,select("#", ... ) do
-		local libname = select(i, ...)
-		self:EmbedLibrary(addon, libname, false, 4)
-	end
-end
-
--- - Embed a library into the addon object.
--- This function will check if the specified library is registered with LibStub
--- and if it has a :Embed function to call. It'll error if any of those conditions
--- fails.
---
--- **Note:** This function is for internal use by :EmbedLibraries
--- @paramsig addon, libname[, silent[, offset]]
--- @param addon addon object to embed the library in
--- @param libname name of the library to embed
--- @param silent marks an embed to fail silently if the library doesn't exist (optional)
--- @param offset will push the error messages back to said offset, defaults to 2 (optional)
-function AceAddon:EmbedLibrary(addon, libname, silent, offset)
-	local lib = LibStub:GetLibrary(libname, true)
-	if not lib and not silent then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2)
-	elseif lib and type(lib.Embed) == "function" then
-		lib:Embed(addon)
-		tinsert(self.embeds[addon], libname)
-		return true
-	elseif lib then
-		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2)
-	end
-end
-
---- Return the specified module from an addon object.
--- Throws an error if the addon object cannot be found (except if silent is set)
--- @name //addon//:GetModule
--- @paramsig name[, silent]
--- @param name unique name of the module
--- @param silent if true, the module is optional, silently return nil if its not found (optional)
--- @usage 
--- -- Get the Addon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- -- Get the Module
--- MyModule = MyAddon:GetModule("MyModule")
-function GetModule(self, name, silent)
-	if not self.modules[name] and not silent then
-		error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2)
-	end
-	return self.modules[name]
-end
-
-local function IsModuleTrue(self) return true end
-
---- Create a new module for the addon.
--- The new module can have its own embeded libraries and/or use a module prototype to be mixed into the module.\\
--- A module has the same functionality as a real addon, it can have modules of its own, and has the same API as
--- an addon object.
--- @name //addon//:NewModule
--- @paramsig name[, prototype|lib[, lib, ...]]
--- @param name unique name of the module
--- @param prototype object to derive this module from, methods and values from this table will be mixed into the module (optional)
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create a module with some embeded libraries
--- MyModule = MyAddon:NewModule("MyModule", "AceEvent-3.0", "AceHook-3.0")
--- 
--- -- Create a module with a prototype
--- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
--- MyModule = MyAddon:NewModule("MyModule", prototype, "AceEvent-3.0", "AceHook-3.0")
-function NewModule(self, name, prototype, ...)
-	if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end
-	if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end
-	
-	if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end
-	
-	-- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well.
-	-- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is.
-	local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name))
-	
-	module.IsModule = IsModuleTrue
-	module:SetEnabledState(self.defaultModuleState)
-	module.moduleName = name
-
-	if type(prototype) == "string" then
-		AceAddon:EmbedLibraries(module, prototype, ...)
-	else
-		AceAddon:EmbedLibraries(module, ...)
-	end
-	AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries))
-
-	if not prototype or type(prototype) == "string" then
-		prototype = self.defaultModulePrototype or nil
-	end
-	
-	if type(prototype) == "table" then
-		local mt = getmetatable(module)
-		mt.__index = prototype
-		setmetatable(module, mt)  -- More of a Base class type feel.
-	end
-	
-	safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy.
-	self.modules[name] = module
-	tinsert(self.orderedModules, module)
-	
-	return module
-end
-
---- Returns the real name of the addon or module, without any prefix.
--- @name //addon//:GetName
--- @paramsig 
--- @usage 
--- print(MyAddon:GetName())
--- -- prints "MyAddon"
-function GetName(self)
-	return self.moduleName or self.name
-end
-
---- Enables the Addon, if possible, return true or false depending on success.
--- This internally calls AceAddon:EnableAddon(), thus dispatching a OnEnable callback
--- and enabling all modules of the addon (unless explicitly disabled).\\
--- :Enable() also sets the internal `enableState` variable to true
--- @name //addon//:Enable
--- @paramsig 
--- @usage 
--- -- Enable MyModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Enable()
-function Enable(self)
-	self:SetEnabledState(true)
-
-	-- nevcairiel 2013-04-27: don't enable an addon/module if its queued for init still
-	-- it'll be enabled after the init process
-	if not queuedForInitialization(self) then
-		return AceAddon:EnableAddon(self)
-	end
-end
-
---- Disables the Addon, if possible, return true or false depending on success.
--- This internally calls AceAddon:DisableAddon(), thus dispatching a OnDisable callback
--- and disabling all modules of the addon.\\
--- :Disable() also sets the internal `enableState` variable to false
--- @name //addon//:Disable
--- @paramsig 
--- @usage 
--- -- Disable MyAddon
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:Disable()
-function Disable(self)
-	self:SetEnabledState(false)
-	return AceAddon:DisableAddon(self)
-end
-
---- Enables the Module, if possible, return true or false depending on success.
--- Short-hand function that retrieves the module via `:GetModule` and calls `:Enable` on the module object.
--- @name //addon//:EnableModule
--- @paramsig name
--- @usage 
--- -- Enable MyModule using :GetModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Enable()
---
--- -- Enable MyModule using the short-hand
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:EnableModule("MyModule")
-function EnableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Enable()
-end
-
---- Disables the Module, if possible, return true or false depending on success.
--- Short-hand function that retrieves the module via `:GetModule` and calls `:Disable` on the module object.
--- @name //addon//:DisableModule
--- @paramsig name
--- @usage 
--- -- Disable MyModule using :GetModule
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyModule = MyAddon:GetModule("MyModule")
--- MyModule:Disable()
---
--- -- Disable MyModule using the short-hand
--- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
--- MyAddon:DisableModule("MyModule")
-function DisableModule(self, name)
-	local module = self:GetModule( name )
-	return module:Disable()
-end
-
---- Set the default libraries to be mixed into all modules created by this object.
--- Note that you can only change the default module libraries before any module is created.
--- @name //addon//:SetDefaultModuleLibraries
--- @paramsig lib[, lib, ...]
--- @param lib List of libraries to embed into the addon
--- @usage 
--- -- Create the addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- -- Configure default libraries for modules (all modules need AceEvent-3.0)
--- MyAddon:SetDefaultModuleLibraries("AceEvent-3.0")
--- -- Create a module
--- MyModule = MyAddon:NewModule("MyModule")
-function SetDefaultModuleLibraries(self, ...)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleLibraries = {...}
-end
-
---- Set the default state in which new modules are being created.
--- Note that you can only change the default state before any module is created.
--- @name //addon//:SetDefaultModuleState
--- @paramsig state
--- @param state Default state for new modules, true for enabled, false for disabled
--- @usage 
--- -- Create the addon object
--- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
--- -- Set the default state to "disabled"
--- MyAddon:SetDefaultModuleState(false)
--- -- Create a module and explicilty enable it
--- MyModule = MyAddon:NewModule("MyModule")
--- MyModule:Enable()
-function SetDefaultModuleState(self, state)
-	if next(self.modules) then
-		error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2)
-	end
-	self.defaultModuleState = state
-end
-
---- Set the default prototype to use for new modules on creation.
--- Note that you can only change the default prototype before any module is created.
--- @name //addon//:SetDefaultModulePrototype
--- @paramsig prototype
--- @param prototype Default prototype for the new modules (table)
--- @usage 
--- -- Define a prototype
--- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
--- -- Set the default prototype
--- MyAddon:SetDefaultModulePrototype(prototype)
--- -- Create a module and explicitly Enable it
--- MyModule = MyAddon:NewModule("MyModule")
--- MyModule:Enable()
--- -- should print "OnEnable called!" now
--- @see NewModule
-function SetDefaultModulePrototype(self, prototype)
-	if next(self.modules) then
-		error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2)
-	end
-	if type(prototype) ~= "table" then
-		error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2)
-	end
-	self.defaultModulePrototype = prototype
-end
-
---- Set the state of an addon or module
--- This should only be called before any enabling actually happend, e.g. in/before OnInitialize.
--- @name //addon//:SetEnabledState
--- @paramsig state
--- @param state the state of an addon or module  (enabled=true, disabled=false)
-function SetEnabledState(self, state)
-	self.enabledState = state
-end
-
-
---- Return an iterator of all modules associated to the addon.
--- @name //addon//:IterateModules
--- @paramsig 
--- @usage 
--- -- Enable all modules
--- for name, module in MyAddon:IterateModules() do
---    module:Enable()
--- end
-local function IterateModules(self) return pairs(self.modules) end
-
--- Returns an iterator of all embeds in the addon
--- @name //addon//:IterateEmbeds
--- @paramsig 
-local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end
-
---- Query the enabledState of an addon.
--- @name //addon//:IsEnabled
--- @paramsig 
--- @usage 
--- if MyAddon:IsEnabled() then
---     MyAddon:Disable()
--- end
-local function IsEnabled(self) return self.enabledState end
-local mixins = {
-	NewModule = NewModule,
-	GetModule = GetModule,
-	Enable = Enable,
-	Disable = Disable,
-	EnableModule = EnableModule,
-	DisableModule = DisableModule,
-	IsEnabled = IsEnabled,
-	SetDefaultModuleLibraries = SetDefaultModuleLibraries,
-	SetDefaultModuleState = SetDefaultModuleState,
-	SetDefaultModulePrototype = SetDefaultModulePrototype,
-	SetEnabledState = SetEnabledState,
-	IterateModules = IterateModules,
-	IterateEmbeds = IterateEmbeds,
-	GetName = GetName,
-}
-local function IsModule(self) return false end
-local pmixins = {
-	defaultModuleState = true,
-	enabledState = true,
-	IsModule = IsModule,
-}
--- Embed( target )
--- target (object) - target object to embed aceaddon in
---
--- this is a local function specifically since it's meant to be only called internally
-function Embed(target, skipPMixins)
-	for k, v in pairs(mixins) do
-		target[k] = v
-	end
-	if not skipPMixins then
-		for k, v in pairs(pmixins) do
-			target[k] = target[k] or v
-		end
-	end
-end
-
-
--- - Initialize the addon after creation.
--- This function is only used internally during the ADDON_LOADED event
--- It will call the **OnInitialize** function on the addon object (if present), 
--- and the **OnEmbedInitialize** function on all embeded libraries.
--- 
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
--- @param addon addon object to intialize
-function AceAddon:InitializeAddon(addon)
-	safecall(addon.OnInitialize, addon)
-	
-	local embeds = self.embeds[addon]
-	for i = 1, #embeds do
-		local lib = LibStub:GetLibrary(embeds[i], true)
-		if lib then safecall(lib.OnEmbedInitialize, lib, addon) end
-	end
-	
-	-- we don't call InitializeAddon on modules specifically, this is handled
-	-- from the event handler and only done _once_
-end
-
--- - Enable the addon after creation.
--- Note: This function is only used internally during the PLAYER_LOGIN event, or during ADDON_LOADED,
--- if IsLoggedIn() already returns true at that point, e.g. for LoD Addons.
--- It will call the **OnEnable** function on the addon object (if present), 
--- and the **OnEmbedEnable** function on all embeded libraries.\\
--- This function does not toggle the enable state of the addon itself, and will return early if the addon is disabled.
---
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
--- Use :Enable on the addon itself instead.
--- @param addon addon object to enable
-function AceAddon:EnableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if self.statuses[addon.name] or not addon.enabledState then return false end
-	
-	-- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable.
-	self.statuses[addon.name] = true
-	
-	safecall(addon.OnEnable, addon)
-	
-	-- make sure we're still enabled before continueing
-	if self.statuses[addon.name] then
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedEnable, lib, addon) end
-		end
-	
-		-- enable possible modules.
-		local modules = addon.orderedModules
-		for i = 1, #modules do
-			self:EnableAddon(modules[i])
-		end
-	end
-	return self.statuses[addon.name] -- return true if we're disabled
-end
-
--- - Disable the addon
--- Note: This function is only used internally.
--- It will call the **OnDisable** function on the addon object (if present), 
--- and the **OnEmbedDisable** function on all embeded libraries.\\
--- This function does not toggle the enable state of the addon itself, and will return early if the addon is still enabled.
---
--- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. 
--- Use :Disable on the addon itself instead.
--- @param addon addon object to enable
-function AceAddon:DisableAddon(addon)
-	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
-	if not self.statuses[addon.name] then return false end
-	
-	-- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable.
-	self.statuses[addon.name] = false
-	
-	safecall( addon.OnDisable, addon )
-	
-	-- make sure we're still disabling...
-	if not self.statuses[addon.name] then 
-		local embeds = self.embeds[addon]
-		for i = 1, #embeds do
-			local lib = LibStub:GetLibrary(embeds[i], true)
-			if lib then safecall(lib.OnEmbedDisable, lib, addon) end
-		end
-		-- disable possible modules.
-		local modules = addon.orderedModules
-		for i = 1, #modules do
-			self:DisableAddon(modules[i])
-		end
-	end
-	
-	return not self.statuses[addon.name] -- return true if we're disabled
-end
-
---- Get an iterator over all registered addons.
--- @usage 
--- -- Print a list of all installed AceAddon's
--- for name, addon in AceAddon:IterateAddons() do
---   print("Addon: " .. name)
--- end
-function AceAddon:IterateAddons() return pairs(self.addons) end
-
---- Get an iterator over the internal status registry.
--- @usage 
--- -- Print a list of all enabled addons
--- for name, status in AceAddon:IterateAddonStatus() do
---   if status then
---     print("EnabledAddon: " .. name)
---   end
--- end
-function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
-
--- Following Iterators are deprecated, and their addon specific versions should be used
--- e.g. addon:IterateEmbeds() instead of :IterateEmbedsOnAddon(addon)
-function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
-function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
-
--- Event Handling
-local function onEvent(this, event, arg1)
-	-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
-	if (event == "ADDON_LOADED"  and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
-		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
-		while(#AceAddon.initializequeue > 0) do
-			local addon = tremove(AceAddon.initializequeue, 1)
-			-- this might be an issue with recursion - TODO: validate
-			if event == "ADDON_LOADED" then addon.baseName = arg1 end
-			AceAddon:InitializeAddon(addon)
-			tinsert(AceAddon.enablequeue, addon)
-		end
-		
-		if IsLoggedIn() then
-			while(#AceAddon.enablequeue > 0) do
-				local addon = tremove(AceAddon.enablequeue, 1)
-				AceAddon:EnableAddon(addon)
-			end
-		end
-	end
-end
-
-AceAddon.frame:RegisterEvent("ADDON_LOADED")
-AceAddon.frame:RegisterEvent("PLAYER_LOGIN")
-AceAddon.frame:SetScript("OnEvent", onEvent)
-
--- upgrade embeded
-for name, addon in pairs(AceAddon.addons) do
-	Embed(addon, true)
-end
-
--- 2010-10-27 nevcairiel - add new "orderedModules" table
-if oldminor and oldminor < 10 then
-	for name, addon in pairs(AceAddon.addons) do
-		addon.orderedModules = {}
-		for module_name, module in pairs(addon.modules) do
-			tinsert(addon.orderedModules, module)
-		end
-	end
-end
+--- **AceAddon-3.0** provides a template for creating addon objects.
+-- It'll provide you with a set of callback functions that allow you to simplify the loading
+-- process of your addon.\\
+-- Callbacks provided are:\\
+-- * **OnInitialize**, which is called directly after the addon is fully loaded.
+-- * **OnEnable** which gets called during the PLAYER_LOGIN event, when most of the data provided by the game is already present.
+-- * **OnDisable**, which is only called when your addon is manually being disabled.
+-- @usage
+-- -- A small (but complete) addon, that doesn't do anything, 
+-- -- but shows usage of the callbacks.
+-- local MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
+-- 
+-- function MyAddon:OnInitialize()
+--   -- do init tasks here, like loading the Saved Variables, 
+--   -- or setting up slash commands.
+-- end
+-- 
+-- function MyAddon:OnEnable()
+--   -- Do more initialization here, that really enables the use of your addon.
+--   -- Register Events, Hook functions, Create Frames, Get information from 
+--   -- the game that wasn't available in OnInitialize
+-- end
+--
+-- function MyAddon:OnDisable()
+--   -- Unhook, Unregister Events, Hide frames that you created.
+--   -- You would probably only use an OnDisable if you want to 
+--   -- build a "standby" mode, or be able to toggle modules on/off.
+-- end
+-- @class file
+-- @name AceAddon-3.0.lua
+-- @release $Id: AceAddon-3.0.lua 1084 2013-04-27 20:14:11Z nevcairiel $
+
+local MAJOR, MINOR = "AceAddon-3.0", 12
+local AceAddon, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceAddon then return end -- No Upgrade needed.
+
+AceAddon.frame = AceAddon.frame or CreateFrame("Frame", "AceAddon30Frame") -- Our very own frame
+AceAddon.addons = AceAddon.addons or {} -- addons in general
+AceAddon.statuses = AceAddon.statuses or {} -- statuses of addon.
+AceAddon.initializequeue = AceAddon.initializequeue or {} -- addons that are new and not initialized
+AceAddon.enablequeue = AceAddon.enablequeue or {} -- addons that are initialized and waiting to be enabled
+AceAddon.embeds = AceAddon.embeds or setmetatable({}, {__index = function(tbl, key) tbl[key] = {} return tbl[key] end }) -- contains a list of libraries embedded in an addon
+
+-- Lua APIs
+local tinsert, tconcat, tremove = table.insert, table.concat, table.remove
+local fmt, tostring = string.format, tostring
+local select, pairs, next, type, unpack = select, pairs, next, type, unpack
+local loadstring, assert, error = loadstring, assert, error
+local setmetatable, getmetatable, rawset, rawget = setmetatable, getmetatable, rawset, rawget
+
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, IsLoggedIn, geterrorhandler
+
+--[[
+	 xpcall safecall implementation
+]]
+local xpcall = xpcall
+
+local function errorhandler(err)
+	return geterrorhandler()(err)
+end
+
+local function CreateDispatcher(argCount)
+	local code = [[
+		local xpcall, eh = ...
+		local method, ARGS
+		local function call() return method(ARGS) end
+	
+		local function dispatch(func, ...)
+			 method = func
+			 if not method then return end
+			 ARGS = ...
+			 return xpcall(call, eh)
+		end
+	
+		return dispatch
+	]]
+	
+	local ARGS = {}
+	for i = 1, argCount do ARGS[i] = "arg"..i end
+	code = code:gsub("ARGS", tconcat(ARGS, ", "))
+	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
+end
+
+local Dispatchers = setmetatable({}, {__index=function(self, argCount)
+	local dispatcher = CreateDispatcher(argCount)
+	rawset(self, argCount, dispatcher)
+	return dispatcher
+end})
+Dispatchers[0] = function(func)
+	return xpcall(func, errorhandler)
+end
+
+local function safecall(func, ...)
+	-- we check to see if the func is passed is actually a function here and don't error when it isn't
+	-- this safecall is used for optional functions like OnInitialize OnEnable etc. When they are not
+	-- present execution should continue without hinderance
+	if type(func) == "function" then
+		return Dispatchers[select('#', ...)](func, ...)
+	end
+end
+
+-- local functions that will be implemented further down
+local Enable, Disable, EnableModule, DisableModule, Embed, NewModule, GetModule, GetName, SetDefaultModuleState, SetDefaultModuleLibraries, SetEnabledState, SetDefaultModulePrototype
+
+-- used in the addon metatable
+local function addontostring( self ) return self.name end 
+
+-- Check if the addon is queued for initialization
+local function queuedForInitialization(addon)
+	for i = 1, #AceAddon.initializequeue do
+		if AceAddon.initializequeue[i] == addon then
+			return true
+		end
+	end
+	return false
+end
+
+--- Create a new AceAddon-3.0 addon.
+-- Any libraries you specified will be embeded, and the addon will be scheduled for 
+-- its OnInitialize and OnEnable callbacks.
+-- The final addon object, with all libraries embeded, will be returned.
+-- @paramsig [object ,]name[, lib, ...]
+-- @param object Table to use as a base for the addon (optional)
+-- @param name Name of the addon object to create
+-- @param lib List of libraries to embed into the addon
+-- @usage 
+-- -- Create a simple addon object
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon", "AceEvent-3.0")
+--
+-- -- Create a Addon object based on the table of a frame
+-- local MyFrame = CreateFrame("Frame")
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon(MyFrame, "MyAddon", "AceEvent-3.0")
+function AceAddon:NewAddon(objectorname, ...)
+	local object,name
+	local i=1
+	if type(objectorname)=="table" then
+		object=objectorname
+		name=...
+		i=2
+	else
+		name=objectorname
+	end
+	if type(name)~="string" then
+		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2)
+	end
+	if self.addons[name] then 
+		error(("Usage: NewAddon([object,] name, [lib, lib, lib, ...]): 'name' - Addon '%s' already exists."):format(name), 2)
+	end
+	
+	object = object or {}
+	object.name = name
+
+	local addonmeta = {}
+	local oldmeta = getmetatable(object)
+	if oldmeta then
+		for k, v in pairs(oldmeta) do addonmeta[k] = v end
+	end
+	addonmeta.__tostring = addontostring
+	
+	setmetatable( object, addonmeta )
+	self.addons[name] = object
+	object.modules = {}
+	object.orderedModules = {}
+	object.defaultModuleLibraries = {}
+	Embed( object ) -- embed NewModule, GetModule methods
+	self:EmbedLibraries(object, select(i,...))
+	
+	-- add to queue of addons to be initialized upon ADDON_LOADED
+	tinsert(self.initializequeue, object)
+	return object
+end
+
+
+--- Get the addon object by its name from the internal AceAddon registry.
+-- Throws an error if the addon object cannot be found (except if silent is set).
+-- @param name unique name of the addon object
+-- @param silent if true, the addon is optional, silently return nil if its not found
+-- @usage 
+-- -- Get the Addon
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+function AceAddon:GetAddon(name, silent)
+	if not silent and not self.addons[name] then
+		error(("Usage: GetAddon(name): 'name' - Cannot find an AceAddon '%s'."):format(tostring(name)), 2)
+	end
+	return self.addons[name]
+end
+
+-- - Embed a list of libraries into the specified addon.
+-- This function will try to embed all of the listed libraries into the addon
+-- and error if a single one fails.
+--
+-- **Note:** This function is for internal use by :NewAddon/:NewModule
+-- @paramsig addon, [lib, ...]
+-- @param addon addon object to embed the libs in
+-- @param lib List of libraries to embed into the addon
+function AceAddon:EmbedLibraries(addon, ...)
+	for i=1,select("#", ... ) do
+		local libname = select(i, ...)
+		self:EmbedLibrary(addon, libname, false, 4)
+	end
+end
+
+-- - Embed a library into the addon object.
+-- This function will check if the specified library is registered with LibStub
+-- and if it has a :Embed function to call. It'll error if any of those conditions
+-- fails.
+--
+-- **Note:** This function is for internal use by :EmbedLibraries
+-- @paramsig addon, libname[, silent[, offset]]
+-- @param addon addon object to embed the library in
+-- @param libname name of the library to embed
+-- @param silent marks an embed to fail silently if the library doesn't exist (optional)
+-- @param offset will push the error messages back to said offset, defaults to 2 (optional)
+function AceAddon:EmbedLibrary(addon, libname, silent, offset)
+	local lib = LibStub:GetLibrary(libname, true)
+	if not lib and not silent then
+		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Cannot find a library instance of %q."):format(tostring(libname)), offset or 2)
+	elseif lib and type(lib.Embed) == "function" then
+		lib:Embed(addon)
+		tinsert(self.embeds[addon], libname)
+		return true
+	elseif lib then
+		error(("Usage: EmbedLibrary(addon, libname, silent, offset): 'libname' - Library '%s' is not Embed capable"):format(libname), offset or 2)
+	end
+end
+
+--- Return the specified module from an addon object.
+-- Throws an error if the addon object cannot be found (except if silent is set)
+-- @name //addon//:GetModule
+-- @paramsig name[, silent]
+-- @param name unique name of the module
+-- @param silent if true, the module is optional, silently return nil if its not found (optional)
+-- @usage 
+-- -- Get the Addon
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- -- Get the Module
+-- MyModule = MyAddon:GetModule("MyModule")
+function GetModule(self, name, silent)
+	if not self.modules[name] and not silent then
+		error(("Usage: GetModule(name, silent): 'name' - Cannot find module '%s'."):format(tostring(name)), 2)
+	end
+	return self.modules[name]
+end
+
+local function IsModuleTrue(self) return true end
+
+--- Create a new module for the addon.
+-- The new module can have its own embeded libraries and/or use a module prototype to be mixed into the module.\\
+-- A module has the same functionality as a real addon, it can have modules of its own, and has the same API as
+-- an addon object.
+-- @name //addon//:NewModule
+-- @paramsig name[, prototype|lib[, lib, ...]]
+-- @param name unique name of the module
+-- @param prototype object to derive this module from, methods and values from this table will be mixed into the module (optional)
+-- @param lib List of libraries to embed into the addon
+-- @usage 
+-- -- Create a module with some embeded libraries
+-- MyModule = MyAddon:NewModule("MyModule", "AceEvent-3.0", "AceHook-3.0")
+-- 
+-- -- Create a module with a prototype
+-- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
+-- MyModule = MyAddon:NewModule("MyModule", prototype, "AceEvent-3.0", "AceHook-3.0")
+function NewModule(self, name, prototype, ...)
+	if type(name) ~= "string" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - string expected got '%s'."):format(type(name)), 2) end
+	if type(prototype) ~= "string" and type(prototype) ~= "table" and type(prototype) ~= "nil" then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'prototype' - table (prototype), string (lib) or nil expected got '%s'."):format(type(prototype)), 2) end
+	
+	if self.modules[name] then error(("Usage: NewModule(name, [prototype, [lib, lib, lib, ...]): 'name' - Module '%s' already exists."):format(name), 2) end
+	
+	-- modules are basically addons. We treat them as such. They will be added to the initializequeue properly as well.
+	-- NewModule can only be called after the parent addon is present thus the modules will be initialized after their parent is.
+	local module = AceAddon:NewAddon(fmt("%s_%s", self.name or tostring(self), name))
+	
+	module.IsModule = IsModuleTrue
+	module:SetEnabledState(self.defaultModuleState)
+	module.moduleName = name
+
+	if type(prototype) == "string" then
+		AceAddon:EmbedLibraries(module, prototype, ...)
+	else
+		AceAddon:EmbedLibraries(module, ...)
+	end
+	AceAddon:EmbedLibraries(module, unpack(self.defaultModuleLibraries))
+
+	if not prototype or type(prototype) == "string" then
+		prototype = self.defaultModulePrototype or nil
+	end
+	
+	if type(prototype) == "table" then
+		local mt = getmetatable(module)
+		mt.__index = prototype
+		setmetatable(module, mt)  -- More of a Base class type feel.
+	end
+	
+	safecall(self.OnModuleCreated, self, module) -- Was in Ace2 and I think it could be a cool thing to have handy.
+	self.modules[name] = module
+	tinsert(self.orderedModules, module)
+	
+	return module
+end
+
+--- Returns the real name of the addon or module, without any prefix.
+-- @name //addon//:GetName
+-- @paramsig 
+-- @usage 
+-- print(MyAddon:GetName())
+-- -- prints "MyAddon"
+function GetName(self)
+	return self.moduleName or self.name
+end
+
+--- Enables the Addon, if possible, return true or false depending on success.
+-- This internally calls AceAddon:EnableAddon(), thus dispatching a OnEnable callback
+-- and enabling all modules of the addon (unless explicitly disabled).\\
+-- :Enable() also sets the internal `enableState` variable to true
+-- @name //addon//:Enable
+-- @paramsig 
+-- @usage 
+-- -- Enable MyModule
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyModule = MyAddon:GetModule("MyModule")
+-- MyModule:Enable()
+function Enable(self)
+	self:SetEnabledState(true)
+
+	-- nevcairiel 2013-04-27: don't enable an addon/module if its queued for init still
+	-- it'll be enabled after the init process
+	if not queuedForInitialization(self) then
+		return AceAddon:EnableAddon(self)
+	end
+end
+
+--- Disables the Addon, if possible, return true or false depending on success.
+-- This internally calls AceAddon:DisableAddon(), thus dispatching a OnDisable callback
+-- and disabling all modules of the addon.\\
+-- :Disable() also sets the internal `enableState` variable to false
+-- @name //addon//:Disable
+-- @paramsig 
+-- @usage 
+-- -- Disable MyAddon
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyAddon:Disable()
+function Disable(self)
+	self:SetEnabledState(false)
+	return AceAddon:DisableAddon(self)
+end
+
+--- Enables the Module, if possible, return true or false depending on success.
+-- Short-hand function that retrieves the module via `:GetModule` and calls `:Enable` on the module object.
+-- @name //addon//:EnableModule
+-- @paramsig name
+-- @usage 
+-- -- Enable MyModule using :GetModule
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyModule = MyAddon:GetModule("MyModule")
+-- MyModule:Enable()
+--
+-- -- Enable MyModule using the short-hand
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyAddon:EnableModule("MyModule")
+function EnableModule(self, name)
+	local module = self:GetModule( name )
+	return module:Enable()
+end
+
+--- Disables the Module, if possible, return true or false depending on success.
+-- Short-hand function that retrieves the module via `:GetModule` and calls `:Disable` on the module object.
+-- @name //addon//:DisableModule
+-- @paramsig name
+-- @usage 
+-- -- Disable MyModule using :GetModule
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyModule = MyAddon:GetModule("MyModule")
+-- MyModule:Disable()
+--
+-- -- Disable MyModule using the short-hand
+-- MyAddon = LibStub("AceAddon-3.0"):GetAddon("MyAddon")
+-- MyAddon:DisableModule("MyModule")
+function DisableModule(self, name)
+	local module = self:GetModule( name )
+	return module:Disable()
+end
+
+--- Set the default libraries to be mixed into all modules created by this object.
+-- Note that you can only change the default module libraries before any module is created.
+-- @name //addon//:SetDefaultModuleLibraries
+-- @paramsig lib[, lib, ...]
+-- @param lib List of libraries to embed into the addon
+-- @usage 
+-- -- Create the addon object
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
+-- -- Configure default libraries for modules (all modules need AceEvent-3.0)
+-- MyAddon:SetDefaultModuleLibraries("AceEvent-3.0")
+-- -- Create a module
+-- MyModule = MyAddon:NewModule("MyModule")
+function SetDefaultModuleLibraries(self, ...)
+	if next(self.modules) then
+		error("Usage: SetDefaultModuleLibraries(...): cannot change the module defaults after a module has been registered.", 2)
+	end
+	self.defaultModuleLibraries = {...}
+end
+
+--- Set the default state in which new modules are being created.
+-- Note that you can only change the default state before any module is created.
+-- @name //addon//:SetDefaultModuleState
+-- @paramsig state
+-- @param state Default state for new modules, true for enabled, false for disabled
+-- @usage 
+-- -- Create the addon object
+-- MyAddon = LibStub("AceAddon-3.0"):NewAddon("MyAddon")
+-- -- Set the default state to "disabled"
+-- MyAddon:SetDefaultModuleState(false)
+-- -- Create a module and explicilty enable it
+-- MyModule = MyAddon:NewModule("MyModule")
+-- MyModule:Enable()
+function SetDefaultModuleState(self, state)
+	if next(self.modules) then
+		error("Usage: SetDefaultModuleState(state): cannot change the module defaults after a module has been registered.", 2)
+	end
+	self.defaultModuleState = state
+end
+
+--- Set the default prototype to use for new modules on creation.
+-- Note that you can only change the default prototype before any module is created.
+-- @name //addon//:SetDefaultModulePrototype
+-- @paramsig prototype
+-- @param prototype Default prototype for the new modules (table)
+-- @usage 
+-- -- Define a prototype
+-- local prototype = { OnEnable = function(self) print("OnEnable called!") end }
+-- -- Set the default prototype
+-- MyAddon:SetDefaultModulePrototype(prototype)
+-- -- Create a module and explicitly Enable it
+-- MyModule = MyAddon:NewModule("MyModule")
+-- MyModule:Enable()
+-- -- should print "OnEnable called!" now
+-- @see NewModule
+function SetDefaultModulePrototype(self, prototype)
+	if next(self.modules) then
+		error("Usage: SetDefaultModulePrototype(prototype): cannot change the module defaults after a module has been registered.", 2)
+	end
+	if type(prototype) ~= "table" then
+		error(("Usage: SetDefaultModulePrototype(prototype): 'prototype' - table expected got '%s'."):format(type(prototype)), 2)
+	end
+	self.defaultModulePrototype = prototype
+end
+
+--- Set the state of an addon or module
+-- This should only be called before any enabling actually happend, e.g. in/before OnInitialize.
+-- @name //addon//:SetEnabledState
+-- @paramsig state
+-- @param state the state of an addon or module  (enabled=true, disabled=false)
+function SetEnabledState(self, state)
+	self.enabledState = state
+end
+
+
+--- Return an iterator of all modules associated to the addon.
+-- @name //addon//:IterateModules
+-- @paramsig 
+-- @usage 
+-- -- Enable all modules
+-- for name, module in MyAddon:IterateModules() do
+--    module:Enable()
+-- end
+local function IterateModules(self) return pairs(self.modules) end
+
+-- Returns an iterator of all embeds in the addon
+-- @name //addon//:IterateEmbeds
+-- @paramsig 
+local function IterateEmbeds(self) return pairs(AceAddon.embeds[self]) end
+
+--- Query the enabledState of an addon.
+-- @name //addon//:IsEnabled
+-- @paramsig 
+-- @usage 
+-- if MyAddon:IsEnabled() then
+--     MyAddon:Disable()
+-- end
+local function IsEnabled(self) return self.enabledState end
+local mixins = {
+	NewModule = NewModule,
+	GetModule = GetModule,
+	Enable = Enable,
+	Disable = Disable,
+	EnableModule = EnableModule,
+	DisableModule = DisableModule,
+	IsEnabled = IsEnabled,
+	SetDefaultModuleLibraries = SetDefaultModuleLibraries,
+	SetDefaultModuleState = SetDefaultModuleState,
+	SetDefaultModulePrototype = SetDefaultModulePrototype,
+	SetEnabledState = SetEnabledState,
+	IterateModules = IterateModules,
+	IterateEmbeds = IterateEmbeds,
+	GetName = GetName,
+}
+local function IsModule(self) return false end
+local pmixins = {
+	defaultModuleState = true,
+	enabledState = true,
+	IsModule = IsModule,
+}
+-- Embed( target )
+-- target (object) - target object to embed aceaddon in
+--
+-- this is a local function specifically since it's meant to be only called internally
+function Embed(target, skipPMixins)
+	for k, v in pairs(mixins) do
+		target[k] = v
+	end
+	if not skipPMixins then
+		for k, v in pairs(pmixins) do
+			target[k] = target[k] or v
+		end
+	end
+end
+
+
+-- - Initialize the addon after creation.
+-- This function is only used internally during the ADDON_LOADED event
+-- It will call the **OnInitialize** function on the addon object (if present), 
+-- and the **OnEmbedInitialize** function on all embeded libraries.
+-- 
+-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
+-- @param addon addon object to intialize
+function AceAddon:InitializeAddon(addon)
+	safecall(addon.OnInitialize, addon)
+	
+	local embeds = self.embeds[addon]
+	for i = 1, #embeds do
+		local lib = LibStub:GetLibrary(embeds[i], true)
+		if lib then safecall(lib.OnEmbedInitialize, lib, addon) end
+	end
+	
+	-- we don't call InitializeAddon on modules specifically, this is handled
+	-- from the event handler and only done _once_
+end
+
+-- - Enable the addon after creation.
+-- Note: This function is only used internally during the PLAYER_LOGIN event, or during ADDON_LOADED,
+-- if IsLoggedIn() already returns true at that point, e.g. for LoD Addons.
+-- It will call the **OnEnable** function on the addon object (if present), 
+-- and the **OnEmbedEnable** function on all embeded libraries.\\
+-- This function does not toggle the enable state of the addon itself, and will return early if the addon is disabled.
+--
+-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing.
+-- Use :Enable on the addon itself instead.
+-- @param addon addon object to enable
+function AceAddon:EnableAddon(addon)
+	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
+	if self.statuses[addon.name] or not addon.enabledState then return false end
+	
+	-- set the statuses first, before calling the OnEnable. this allows for Disabling of the addon in OnEnable.
+	self.statuses[addon.name] = true
+	
+	safecall(addon.OnEnable, addon)
+	
+	-- make sure we're still enabled before continueing
+	if self.statuses[addon.name] then
+		local embeds = self.embeds[addon]
+		for i = 1, #embeds do
+			local lib = LibStub:GetLibrary(embeds[i], true)
+			if lib then safecall(lib.OnEmbedEnable, lib, addon) end
+		end
+	
+		-- enable possible modules.
+		local modules = addon.orderedModules
+		for i = 1, #modules do
+			self:EnableAddon(modules[i])
+		end
+	end
+	return self.statuses[addon.name] -- return true if we're disabled
+end
+
+-- - Disable the addon
+-- Note: This function is only used internally.
+-- It will call the **OnDisable** function on the addon object (if present), 
+-- and the **OnEmbedDisable** function on all embeded libraries.\\
+-- This function does not toggle the enable state of the addon itself, and will return early if the addon is still enabled.
+--
+-- **Note:** Do not call this function manually, unless you're absolutely sure that you know what you are doing. 
+-- Use :Disable on the addon itself instead.
+-- @param addon addon object to enable
+function AceAddon:DisableAddon(addon)
+	if type(addon) == "string" then addon = AceAddon:GetAddon(addon) end
+	if not self.statuses[addon.name] then return false end
+	
+	-- set statuses first before calling OnDisable, this allows for aborting the disable in OnDisable.
+	self.statuses[addon.name] = false
+	
+	safecall( addon.OnDisable, addon )
+	
+	-- make sure we're still disabling...
+	if not self.statuses[addon.name] then 
+		local embeds = self.embeds[addon]
+		for i = 1, #embeds do
+			local lib = LibStub:GetLibrary(embeds[i], true)
+			if lib then safecall(lib.OnEmbedDisable, lib, addon) end
+		end
+		-- disable possible modules.
+		local modules = addon.orderedModules
+		for i = 1, #modules do
+			self:DisableAddon(modules[i])
+		end
+	end
+	
+	return not self.statuses[addon.name] -- return true if we're disabled
+end
+
+--- Get an iterator over all registered addons.
+-- @usage 
+-- -- Print a list of all installed AceAddon's
+-- for name, addon in AceAddon:IterateAddons() do
+--   print("Addon: " .. name)
+-- end
+function AceAddon:IterateAddons() return pairs(self.addons) end
+
+--- Get an iterator over the internal status registry.
+-- @usage 
+-- -- Print a list of all enabled addons
+-- for name, status in AceAddon:IterateAddonStatus() do
+--   if status then
+--     print("EnabledAddon: " .. name)
+--   end
+-- end
+function AceAddon:IterateAddonStatus() return pairs(self.statuses) end
+
+-- Following Iterators are deprecated, and their addon specific versions should be used
+-- e.g. addon:IterateEmbeds() instead of :IterateEmbedsOnAddon(addon)
+function AceAddon:IterateEmbedsOnAddon(addon) return pairs(self.embeds[addon]) end
+function AceAddon:IterateModulesOfAddon(addon) return pairs(addon.modules) end
+
+-- Event Handling
+local function onEvent(this, event, arg1)
+	-- 2011-08-17 nevcairiel - ignore the load event of Blizzard_DebugTools, so a potential startup error isn't swallowed up
+	if (event == "ADDON_LOADED"  and arg1 ~= "Blizzard_DebugTools") or event == "PLAYER_LOGIN" then
+		-- if a addon loads another addon, recursion could happen here, so we need to validate the table on every iteration
+		while(#AceAddon.initializequeue > 0) do
+			local addon = tremove(AceAddon.initializequeue, 1)
+			-- this might be an issue with recursion - TODO: validate
+			if event == "ADDON_LOADED" then addon.baseName = arg1 end
+			AceAddon:InitializeAddon(addon)
+			tinsert(AceAddon.enablequeue, addon)
+		end
+		
+		if IsLoggedIn() then
+			while(#AceAddon.enablequeue > 0) do
+				local addon = tremove(AceAddon.enablequeue, 1)
+				AceAddon:EnableAddon(addon)
+			end
+		end
+	end
+end
+
+AceAddon.frame:RegisterEvent("ADDON_LOADED")
+AceAddon.frame:RegisterEvent("PLAYER_LOGIN")
+AceAddon.frame:SetScript("OnEvent", onEvent)
+
+-- upgrade embeded
+for name, addon in pairs(AceAddon.addons) do
+	Embed(addon, true)
+end
+
+-- 2010-10-27 nevcairiel - add new "orderedModules" table
+if oldminor and oldminor < 10 then
+	for name, addon in pairs(AceAddon.addons) do
+		addon.orderedModules = {}
+		for module_name, module in pairs(addon.modules) do
+			tinsert(addon.orderedModules, module)
+		end
+	end
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.xml
index 559e04ebc..e24640c36 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceAddon-3.0/AceAddon-3.0.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceAddon-3.0/AceAddon-3.0.xml	
@@ -1,4 +1,4 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-  <Script file="AceAddon-3.0.lua" />
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+  <Script file="AceAddon-3.0.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.lua
index 54dadfa38..5815530cc 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.lua	
@@ -1,301 +1,301 @@
---- **AceComm-3.0** allows you to send messages of unlimited length over the addon comm channels.
--- It'll automatically split the messages into multiple parts and rebuild them on the receiving end.\\
--- **ChatThrottleLib** is of course being used to avoid being disconnected by the server.
---
--- **AceComm-3.0** can be embeded into your addon, either explicitly by calling AceComm:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceComm itself.\\
--- It is recommended to embed AceComm, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceComm.
--- @class file
--- @name AceComm-3.0
--- @release $Id: AceComm-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
-
---[[ AceComm-3.0
-
-TODO: Time out old data rotting around from dead senders? Not a HUGE deal since the number of possible sender names is somewhat limited.
-
-]]
-
-local CallbackHandler = LibStub("CallbackHandler-1.0")
-local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
-
-local MAJOR, MINOR = "AceComm-3.0", 10
-local AceComm,oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceComm then return end
-
--- Lua APIs
-local type, next, pairs, tostring = type, next, pairs, tostring
-local strsub, strfind = string.sub, string.find
-local match = string.match
-local tinsert, tconcat = table.insert, table.concat
-local error, assert = error, assert
-
--- WoW APIs
-local Ambiguate = Ambiguate
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: LibStub, DEFAULT_CHAT_FRAME, geterrorhandler, RegisterAddonMessagePrefix
-
-AceComm.embeds = AceComm.embeds or {}
-
--- for my sanity and yours, let's give the message type bytes some names
-local MSG_MULTI_FIRST = "\001"
-local MSG_MULTI_NEXT  = "\002"
-local MSG_MULTI_LAST  = "\003"
-local MSG_ESCAPE = "\004"
-
--- remove old structures (pre WoW 4.0)
-AceComm.multipart_origprefixes = nil
-AceComm.multipart_reassemblers = nil
-
--- the multipart message spool: indexed by a combination of sender+distribution+
-AceComm.multipart_spool = AceComm.multipart_spool or {} 
-
---- Register for Addon Traffic on a specified prefix
--- @param prefix A printable character (\032-\255) classification of the message (typically AddonName or AddonNameEvent), max 16 characters
--- @param method Callback to call on message reception: Function reference, or method name (string) to call on self. Defaults to "OnCommReceived"
-function AceComm:RegisterComm(prefix, method)
-	if method == nil then
-		method = "OnCommReceived"
-	end
-
-	if #prefix > 16 then -- TODO: 15?
-		error("AceComm:RegisterComm(prefix,method): prefix length is limited to 16 characters")
-	end
-	RegisterAddonMessagePrefix(prefix)
-
-	return AceComm._RegisterComm(self, prefix, method)	-- created by CallbackHandler
-end
-
-local warnedPrefix=false
-
---- Send a message over the Addon Channel
--- @param prefix A printable character (\032-\255) classification of the message (typically AddonName or AddonNameEvent)
--- @param text Data to send, nils (\000) not allowed. Any length.
--- @param distribution Addon channel, e.g. "RAID", "GUILD", etc; see SendAddonMessage API
--- @param target Destination for some distributions; see SendAddonMessage API
--- @param prio OPTIONAL: ChatThrottleLib priority, "BULK", "NORMAL" or "ALERT". Defaults to "NORMAL".
--- @param callbackFn OPTIONAL: callback function to be called as each chunk is sent. receives 3 args: the user supplied arg (see next), the number of bytes sent so far, and the number of bytes total to send.
--- @param callbackArg: OPTIONAL: first arg to the callback function. nil will be passed if not specified.
-function AceComm:SendCommMessage(prefix, text, distribution, target, prio, callbackFn, callbackArg)
-	prio = prio or "NORMAL"	-- pasta's reference implementation had different prio for singlepart and multipart, but that's a very bad idea since that can easily lead to out-of-sequence delivery!
-	if not( type(prefix)=="string" and
-			type(text)=="string" and
-			type(distribution)=="string" and
-			(target==nil or type(target)=="string") and
-			(prio=="BULK" or prio=="NORMAL" or prio=="ALERT") 
-		) then
-		error('Usage: SendCommMessage(addon, "prefix", "text", "distribution"[, "target"[, "prio"[, callbackFn, callbackarg]]])', 2)
-	end
-
-	local textlen = #text
-	local maxtextlen = 255  -- Yes, the max is 255 even if the dev post said 256. I tested. Char 256+ get silently truncated. /Mikk, 20110327
-	local queueName = prefix..distribution..(target or "")
-
-	local ctlCallback = nil
-	if callbackFn then
-		ctlCallback = function(sent)
-			return callbackFn(callbackArg, sent, textlen)
-		end
-	end
-	
-	local forceMultipart
-	if match(text, "^[\001-\009]") then -- 4.1+: see if the first character is a control character
-		-- we need to escape the first character with a \004
-		if textlen+1 > maxtextlen then	-- would we go over the size limit?
-			forceMultipart = true	-- just make it multipart, no escape problems then
-		else
-			text = "\004" .. text
-		end
-	end
-
-	if not forceMultipart and textlen <= maxtextlen then
-		-- fits all in one message
-		CTL:SendAddonMessage(prio, prefix, text, distribution, target, queueName, ctlCallback, textlen)
-	else
-		maxtextlen = maxtextlen - 1	-- 1 extra byte for part indicator in prefix(4.0)/start of message(4.1)
-
-		-- first part
-		local chunk = strsub(text, 1, maxtextlen)
-		CTL:SendAddonMessage(prio, prefix, MSG_MULTI_FIRST..chunk, distribution, target, queueName, ctlCallback, maxtextlen)
-
-		-- continuation
-		local pos = 1+maxtextlen
-
-		while pos+maxtextlen <= textlen do
-			chunk = strsub(text, pos, pos+maxtextlen-1)
-			CTL:SendAddonMessage(prio, prefix, MSG_MULTI_NEXT..chunk, distribution, target, queueName, ctlCallback, pos+maxtextlen-1)
-			pos = pos + maxtextlen
-		end
-
-		-- final part
-		chunk = strsub(text, pos)
-		CTL:SendAddonMessage(prio, prefix, MSG_MULTI_LAST..chunk, distribution, target, queueName, ctlCallback, textlen)
-	end
-end
-
-
-----------------------------------------
--- Message receiving
-----------------------------------------
-
-do
-	local compost = setmetatable({}, {__mode = "k"})
-	local function new()
-		local t = next(compost)
-		if t then 
-			compost[t]=nil
-			for i=#t,3,-1 do	-- faster than pairs loop. don't even nil out 1/2 since they'll be overwritten
-				t[i]=nil
-			end
-			return t
-		end
-		
-		return {}
-	end
-	
-	local function lostdatawarning(prefix,sender,where)
-		DEFAULT_CHAT_FRAME:AddMessage(MAJOR..": Warning: lost network data regarding '"..tostring(prefix).."' from '"..tostring(sender).."' (in "..where..")")
-	end
-
-	function AceComm:OnReceiveMultipartFirst(prefix, message, distribution, sender)
-		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
-		local spool = AceComm.multipart_spool
-		
-		--[[
-		if spool[key] then 
-			lostdatawarning(prefix,sender,"First")
-			-- continue and overwrite
-		end
-		--]]
-		
-		spool[key] = message  -- plain string for now
-	end
-
-	function AceComm:OnReceiveMultipartNext(prefix, message, distribution, sender)
-		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
-		local spool = AceComm.multipart_spool
-		local olddata = spool[key]
-		
-		if not olddata then
-			--lostdatawarning(prefix,sender,"Next")
-			return
-		end
-
-		if type(olddata)~="table" then
-			-- ... but what we have is not a table. So make it one. (Pull a composted one if available)
-			local t = new()
-			t[1] = olddata    -- add old data as first string
-			t[2] = message    -- and new message as second string
-			spool[key] = t    -- and put the table in the spool instead of the old string
-		else
-			tinsert(olddata, message)
-		end
-	end
-
-	function AceComm:OnReceiveMultipartLast(prefix, message, distribution, sender)
-		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
-		local spool = AceComm.multipart_spool
-		local olddata = spool[key]
-		
-		if not olddata then
-			--lostdatawarning(prefix,sender,"End")
-			return
-		end
-
-		spool[key] = nil
-		
-		if type(olddata) == "table" then
-			-- if we've received a "next", the spooled data will be a table for rapid & garbage-free tconcat
-			tinsert(olddata, message)
-			AceComm.callbacks:Fire(prefix, tconcat(olddata, ""), distribution, sender)
-			compost[olddata] = true
-		else
-			-- if we've only received a "first", the spooled data will still only be a string
-			AceComm.callbacks:Fire(prefix, olddata..message, distribution, sender)
-		end
-	end
-end
-
-
-
-
-
-
-----------------------------------------
--- Embed CallbackHandler
-----------------------------------------
-
-if not AceComm.callbacks then
-	AceComm.callbacks = CallbackHandler:New(AceComm,
-						"_RegisterComm",
-						"UnregisterComm",
-						"UnregisterAllComm")
-end
-
-AceComm.callbacks.OnUsed = nil
-AceComm.callbacks.OnUnused = nil
-
-local function OnEvent(self, event, prefix, message, distribution, sender)
-	if event == "CHAT_MSG_ADDON" then
-		sender = Ambiguate(sender, "none")
-		local control, rest = match(message, "^([\001-\009])(.*)")
-		if control then
-			if control==MSG_MULTI_FIRST then
-				AceComm:OnReceiveMultipartFirst(prefix, rest, distribution, sender)
-			elseif control==MSG_MULTI_NEXT then
-				AceComm:OnReceiveMultipartNext(prefix, rest, distribution, sender)
-			elseif control==MSG_MULTI_LAST then
-				AceComm:OnReceiveMultipartLast(prefix, rest, distribution, sender)
-			elseif control==MSG_ESCAPE then
-				AceComm.callbacks:Fire(prefix, rest, distribution, sender)
-			else
-				-- unknown control character, ignore SILENTLY (dont warn unnecessarily about future extensions!)
-			end
-		else
-			-- single part: fire it off immediately and let CallbackHandler decide if it's registered or not
-			AceComm.callbacks:Fire(prefix, message, distribution, sender)
-		end
-	else
-		assert(false, "Received "..tostring(event).." event?!")
-	end
-end
-
-AceComm.frame = AceComm.frame or CreateFrame("Frame", "AceComm30Frame")
-AceComm.frame:SetScript("OnEvent", OnEvent)
-AceComm.frame:UnregisterAllEvents()
-AceComm.frame:RegisterEvent("CHAT_MSG_ADDON")
-
-
-----------------------------------------
--- Base library stuff
-----------------------------------------
-
-local mixins = {
-	"RegisterComm",
-	"UnregisterComm",
-	"UnregisterAllComm",
-	"SendCommMessage",
-}
-
--- Embeds AceComm-3.0 into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceComm-3.0 in
-function AceComm:Embed(target)
-	for k, v in pairs(mixins) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
-function AceComm:OnEmbedDisable(target)
-	target:UnregisterAllComm()
-end
-
--- Update embeds
-for target, v in pairs(AceComm.embeds) do
-	AceComm:Embed(target)
-end
+--- **AceComm-3.0** allows you to send messages of unlimited length over the addon comm channels.
+-- It'll automatically split the messages into multiple parts and rebuild them on the receiving end.\\
+-- **ChatThrottleLib** is of course being used to avoid being disconnected by the server.
+--
+-- **AceComm-3.0** can be embeded into your addon, either explicitly by calling AceComm:Embed(MyAddon) or by 
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceComm itself.\\
+-- It is recommended to embed AceComm, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceComm.
+-- @class file
+-- @name AceComm-3.0
+-- @release $Id: AceComm-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+
+--[[ AceComm-3.0
+
+TODO: Time out old data rotting around from dead senders? Not a HUGE deal since the number of possible sender names is somewhat limited.
+
+]]
+
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+local CTL = assert(ChatThrottleLib, "AceComm-3.0 requires ChatThrottleLib")
+
+local MAJOR, MINOR = "AceComm-3.0", 10
+local AceComm,oldminor = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceComm then return end
+
+-- Lua APIs
+local type, next, pairs, tostring = type, next, pairs, tostring
+local strsub, strfind = string.sub, string.find
+local match = string.match
+local tinsert, tconcat = table.insert, table.concat
+local error, assert = error, assert
+
+-- WoW APIs
+local Ambiguate = Ambiguate
+
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, DEFAULT_CHAT_FRAME, geterrorhandler, RegisterAddonMessagePrefix
+
+AceComm.embeds = AceComm.embeds or {}
+
+-- for my sanity and yours, let's give the message type bytes some names
+local MSG_MULTI_FIRST = "\001"
+local MSG_MULTI_NEXT  = "\002"
+local MSG_MULTI_LAST  = "\003"
+local MSG_ESCAPE = "\004"
+
+-- remove old structures (pre WoW 4.0)
+AceComm.multipart_origprefixes = nil
+AceComm.multipart_reassemblers = nil
+
+-- the multipart message spool: indexed by a combination of sender+distribution+
+AceComm.multipart_spool = AceComm.multipart_spool or {} 
+
+--- Register for Addon Traffic on a specified prefix
+-- @param prefix A printable character (\032-\255) classification of the message (typically AddonName or AddonNameEvent), max 16 characters
+-- @param method Callback to call on message reception: Function reference, or method name (string) to call on self. Defaults to "OnCommReceived"
+function AceComm:RegisterComm(prefix, method)
+	if method == nil then
+		method = "OnCommReceived"
+	end
+
+	if #prefix > 16 then -- TODO: 15?
+		error("AceComm:RegisterComm(prefix,method): prefix length is limited to 16 characters")
+	end
+	RegisterAddonMessagePrefix(prefix)
+
+	return AceComm._RegisterComm(self, prefix, method)	-- created by CallbackHandler
+end
+
+local warnedPrefix=false
+
+--- Send a message over the Addon Channel
+-- @param prefix A printable character (\032-\255) classification of the message (typically AddonName or AddonNameEvent)
+-- @param text Data to send, nils (\000) not allowed. Any length.
+-- @param distribution Addon channel, e.g. "RAID", "GUILD", etc; see SendAddonMessage API
+-- @param target Destination for some distributions; see SendAddonMessage API
+-- @param prio OPTIONAL: ChatThrottleLib priority, "BULK", "NORMAL" or "ALERT". Defaults to "NORMAL".
+-- @param callbackFn OPTIONAL: callback function to be called as each chunk is sent. receives 3 args: the user supplied arg (see next), the number of bytes sent so far, and the number of bytes total to send.
+-- @param callbackArg: OPTIONAL: first arg to the callback function. nil will be passed if not specified.
+function AceComm:SendCommMessage(prefix, text, distribution, target, prio, callbackFn, callbackArg)
+	prio = prio or "NORMAL"	-- pasta's reference implementation had different prio for singlepart and multipart, but that's a very bad idea since that can easily lead to out-of-sequence delivery!
+	if not( type(prefix)=="string" and
+			type(text)=="string" and
+			type(distribution)=="string" and
+			(target==nil or type(target)=="string") and
+			(prio=="BULK" or prio=="NORMAL" or prio=="ALERT") 
+		) then
+		error('Usage: SendCommMessage(addon, "prefix", "text", "distribution"[, "target"[, "prio"[, callbackFn, callbackarg]]])', 2)
+	end
+
+	local textlen = #text
+	local maxtextlen = 255  -- Yes, the max is 255 even if the dev post said 256. I tested. Char 256+ get silently truncated. /Mikk, 20110327
+	local queueName = prefix..distribution..(target or "")
+
+	local ctlCallback = nil
+	if callbackFn then
+		ctlCallback = function(sent)
+			return callbackFn(callbackArg, sent, textlen)
+		end
+	end
+	
+	local forceMultipart
+	if match(text, "^[\001-\009]") then -- 4.1+: see if the first character is a control character
+		-- we need to escape the first character with a \004
+		if textlen+1 > maxtextlen then	-- would we go over the size limit?
+			forceMultipart = true	-- just make it multipart, no escape problems then
+		else
+			text = "\004" .. text
+		end
+	end
+
+	if not forceMultipart and textlen <= maxtextlen then
+		-- fits all in one message
+		CTL:SendAddonMessage(prio, prefix, text, distribution, target, queueName, ctlCallback, textlen)
+	else
+		maxtextlen = maxtextlen - 1	-- 1 extra byte for part indicator in prefix(4.0)/start of message(4.1)
+
+		-- first part
+		local chunk = strsub(text, 1, maxtextlen)
+		CTL:SendAddonMessage(prio, prefix, MSG_MULTI_FIRST..chunk, distribution, target, queueName, ctlCallback, maxtextlen)
+
+		-- continuation
+		local pos = 1+maxtextlen
+
+		while pos+maxtextlen <= textlen do
+			chunk = strsub(text, pos, pos+maxtextlen-1)
+			CTL:SendAddonMessage(prio, prefix, MSG_MULTI_NEXT..chunk, distribution, target, queueName, ctlCallback, pos+maxtextlen-1)
+			pos = pos + maxtextlen
+		end
+
+		-- final part
+		chunk = strsub(text, pos)
+		CTL:SendAddonMessage(prio, prefix, MSG_MULTI_LAST..chunk, distribution, target, queueName, ctlCallback, textlen)
+	end
+end
+
+
+----------------------------------------
+-- Message receiving
+----------------------------------------
+
+do
+	local compost = setmetatable({}, {__mode = "k"})
+	local function new()
+		local t = next(compost)
+		if t then 
+			compost[t]=nil
+			for i=#t,3,-1 do	-- faster than pairs loop. don't even nil out 1/2 since they'll be overwritten
+				t[i]=nil
+			end
+			return t
+		end
+		
+		return {}
+	end
+	
+	local function lostdatawarning(prefix,sender,where)
+		DEFAULT_CHAT_FRAME:AddMessage(MAJOR..": Warning: lost network data regarding '"..tostring(prefix).."' from '"..tostring(sender).."' (in "..where..")")
+	end
+
+	function AceComm:OnReceiveMultipartFirst(prefix, message, distribution, sender)
+		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
+		local spool = AceComm.multipart_spool
+		
+		--[[
+		if spool[key] then 
+			lostdatawarning(prefix,sender,"First")
+			-- continue and overwrite
+		end
+		--]]
+		
+		spool[key] = message  -- plain string for now
+	end
+
+	function AceComm:OnReceiveMultipartNext(prefix, message, distribution, sender)
+		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
+		local spool = AceComm.multipart_spool
+		local olddata = spool[key]
+		
+		if not olddata then
+			--lostdatawarning(prefix,sender,"Next")
+			return
+		end
+
+		if type(olddata)~="table" then
+			-- ... but what we have is not a table. So make it one. (Pull a composted one if available)
+			local t = new()
+			t[1] = olddata    -- add old data as first string
+			t[2] = message    -- and new message as second string
+			spool[key] = t    -- and put the table in the spool instead of the old string
+		else
+			tinsert(olddata, message)
+		end
+	end
+
+	function AceComm:OnReceiveMultipartLast(prefix, message, distribution, sender)
+		local key = prefix.."\t"..distribution.."\t"..sender	-- a unique stream is defined by the prefix + distribution + sender
+		local spool = AceComm.multipart_spool
+		local olddata = spool[key]
+		
+		if not olddata then
+			--lostdatawarning(prefix,sender,"End")
+			return
+		end
+
+		spool[key] = nil
+		
+		if type(olddata) == "table" then
+			-- if we've received a "next", the spooled data will be a table for rapid & garbage-free tconcat
+			tinsert(olddata, message)
+			AceComm.callbacks:Fire(prefix, tconcat(olddata, ""), distribution, sender)
+			compost[olddata] = true
+		else
+			-- if we've only received a "first", the spooled data will still only be a string
+			AceComm.callbacks:Fire(prefix, olddata..message, distribution, sender)
+		end
+	end
+end
+
+
+
+
+
+
+----------------------------------------
+-- Embed CallbackHandler
+----------------------------------------
+
+if not AceComm.callbacks then
+	AceComm.callbacks = CallbackHandler:New(AceComm,
+						"_RegisterComm",
+						"UnregisterComm",
+						"UnregisterAllComm")
+end
+
+AceComm.callbacks.OnUsed = nil
+AceComm.callbacks.OnUnused = nil
+
+local function OnEvent(self, event, prefix, message, distribution, sender)
+	if event == "CHAT_MSG_ADDON" then
+		sender = Ambiguate(sender, "none")
+		local control, rest = match(message, "^([\001-\009])(.*)")
+		if control then
+			if control==MSG_MULTI_FIRST then
+				AceComm:OnReceiveMultipartFirst(prefix, rest, distribution, sender)
+			elseif control==MSG_MULTI_NEXT then
+				AceComm:OnReceiveMultipartNext(prefix, rest, distribution, sender)
+			elseif control==MSG_MULTI_LAST then
+				AceComm:OnReceiveMultipartLast(prefix, rest, distribution, sender)
+			elseif control==MSG_ESCAPE then
+				AceComm.callbacks:Fire(prefix, rest, distribution, sender)
+			else
+				-- unknown control character, ignore SILENTLY (dont warn unnecessarily about future extensions!)
+			end
+		else
+			-- single part: fire it off immediately and let CallbackHandler decide if it's registered or not
+			AceComm.callbacks:Fire(prefix, message, distribution, sender)
+		end
+	else
+		assert(false, "Received "..tostring(event).." event?!")
+	end
+end
+
+AceComm.frame = AceComm.frame or CreateFrame("Frame", "AceComm30Frame")
+AceComm.frame:SetScript("OnEvent", OnEvent)
+AceComm.frame:UnregisterAllEvents()
+AceComm.frame:RegisterEvent("CHAT_MSG_ADDON")
+
+
+----------------------------------------
+-- Base library stuff
+----------------------------------------
+
+local mixins = {
+	"RegisterComm",
+	"UnregisterComm",
+	"UnregisterAllComm",
+	"SendCommMessage",
+}
+
+-- Embeds AceComm-3.0 into the target object making the functions from the mixins list available on target:..
+-- @param target target object to embed AceComm-3.0 in
+function AceComm:Embed(target)
+	for k, v in pairs(mixins) do
+		target[v] = self[v]
+	end
+	self.embeds[target] = true
+	return target
+end
+
+function AceComm:OnEmbedDisable(target)
+	target:UnregisterAllComm()
+end
+
+-- Update embeds
+for target, v in pairs(AceComm.embeds) do
+	AceComm:Embed(target)
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.xml
index e7b85f8e2..2829688e0 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/AceComm-3.0.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/AceComm-3.0.xml	
@@ -1,5 +1,5 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-  <Script file="ChatThrottleLib.lua" />
-  <Script file="AceComm-3.0.lua" />
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+  <Script file="ChatThrottleLib.lua" />
+  <Script file="AceComm-3.0.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/ChatThrottleLib.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/ChatThrottleLib.lua
similarity index 96%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/ChatThrottleLib.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/ChatThrottleLib.lua
index 3ddeef819..05a0363d9 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceComm-3.0/ChatThrottleLib.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceComm-3.0/ChatThrottleLib.lua	
@@ -1,524 +1,524 @@
---
--- ChatThrottleLib by Mikk
---
--- Manages AddOn chat output to keep player from getting kicked off.
---
--- ChatThrottleLib:SendChatMessage/:SendAddonMessage functions that accept 
--- a Priority ("BULK", "NORMAL", "ALERT") as well as prefix for SendChatMessage.
---
--- Priorities get an equal share of available bandwidth when fully loaded.
--- Communication channels are separated on extension+chattype+destination and
--- get round-robinned. (Destination only matters for whispers and channels,
--- obviously)
---
--- Will install hooks for SendChatMessage and SendAddonMessage to measure
--- bandwidth bypassing the library and use less bandwidth itself.
---
---
--- Fully embeddable library. Just copy this file into your addon directory,
--- add it to the .toc, and it's done.
---
--- Can run as a standalone addon also, but, really, just embed it! :-)
---
--- LICENSE: ChatThrottleLib is released into the Public Domain
---
-
-local CTL_VERSION = 23
-
-local _G = _G
-
-if _G.ChatThrottleLib then
-	if _G.ChatThrottleLib.version >= CTL_VERSION then
-		-- There's already a newer (or same) version loaded. Buh-bye.
-		return
-	elseif not _G.ChatThrottleLib.securelyHooked then
-		print("ChatThrottleLib: Warning: There's an ANCIENT ChatThrottleLib.lua (pre-wow 2.0, <v16) in an addon somewhere. Get the addon updated or copy in a newer ChatThrottleLib.lua (>=v16) in it!")
-		-- ATTEMPT to unhook; this'll behave badly if someone else has hooked...
-		-- ... and if someone has securehooked, they can kiss that goodbye too... >.<
-		_G.SendChatMessage = _G.ChatThrottleLib.ORIG_SendChatMessage
-		if _G.ChatThrottleLib.ORIG_SendAddonMessage then
-			_G.SendAddonMessage = _G.ChatThrottleLib.ORIG_SendAddonMessage
-		end
-	end
-	_G.ChatThrottleLib.ORIG_SendChatMessage = nil
-	_G.ChatThrottleLib.ORIG_SendAddonMessage = nil
-end
-
-if not _G.ChatThrottleLib then
-	_G.ChatThrottleLib = {}
-end
-
-ChatThrottleLib = _G.ChatThrottleLib  -- in case some addon does "local ChatThrottleLib" above us and we're copypasted (AceComm-2, sigh)
-local ChatThrottleLib = _G.ChatThrottleLib
-
-ChatThrottleLib.version = CTL_VERSION
-
-
-
------------------- TWEAKABLES -----------------
-
-ChatThrottleLib.MAX_CPS = 800			  -- 2000 seems to be safe if NOTHING ELSE is happening. let's call it 800.
-ChatThrottleLib.MSG_OVERHEAD = 40		-- Guesstimate overhead for sending a message; source+dest+chattype+protocolstuff
-
-ChatThrottleLib.BURST = 4000				-- WoW's server buffer seems to be about 32KB. 8KB should be safe, but seen disconnects on _some_ servers. Using 4KB now.
-
-ChatThrottleLib.MIN_FPS = 20				-- Reduce output CPS to half (and don't burst) if FPS drops below this value
-
-
-local setmetatable = setmetatable
-local table_remove = table.remove
-local tostring = tostring
-local GetTime = GetTime
-local math_min = math.min
-local math_max = math.max
-local next = next
-local strlen = string.len
-local GetFramerate = GetFramerate
-local strlower = string.lower
-local unpack,type,pairs,wipe = unpack,type,pairs,wipe
-local UnitInRaid,UnitInParty = UnitInRaid,UnitInParty
-
-
------------------------------------------------------------------------
--- Double-linked ring implementation
-
-local Ring = {}
-local RingMeta = { __index = Ring }
-
-function Ring:New()
-	local ret = {}
-	setmetatable(ret, RingMeta)
-	return ret
-end
-
-function Ring:Add(obj)	-- Append at the "far end" of the ring (aka just before the current position)
-	if self.pos then
-		obj.prev = self.pos.prev
-		obj.prev.next = obj
-		obj.next = self.pos
-		obj.next.prev = obj
-	else
-		obj.next = obj
-		obj.prev = obj
-		self.pos = obj
-	end
-end
-
-function Ring:Remove(obj)
-	obj.next.prev = obj.prev
-	obj.prev.next = obj.next
-	if self.pos == obj then
-		self.pos = obj.next
-		if self.pos == obj then
-			self.pos = nil
-		end
-	end
-end
-
-
-
------------------------------------------------------------------------
--- Recycling bin for pipes 
--- A pipe is a plain integer-indexed queue of messages
--- Pipes normally live in Rings of pipes  (3 rings total, one per priority)
-
-ChatThrottleLib.PipeBin = nil -- pre-v19, drastically different
-local PipeBin = setmetatable({}, {__mode="k"})
-
-local function DelPipe(pipe)
-	PipeBin[pipe] = true
-end
-
-local function NewPipe()
-	local pipe = next(PipeBin)
-	if pipe then
-		wipe(pipe)
-		PipeBin[pipe] = nil
-		return pipe
-	end
-	return {}
-end
-
-
-
-
------------------------------------------------------------------------
--- Recycling bin for messages
-
-ChatThrottleLib.MsgBin = nil -- pre-v19, drastically different
-local MsgBin = setmetatable({}, {__mode="k"})
-
-local function DelMsg(msg)
-	msg[1] = nil
-	-- there's more parameters, but they're very repetetive so the string pool doesn't suffer really, and it's faster to just not delete them.
-	MsgBin[msg] = true
-end
-
-local function NewMsg()
-	local msg = next(MsgBin)
-	if msg then
-		MsgBin[msg] = nil
-		return msg
-	end
-	return {}
-end
-
-
------------------------------------------------------------------------
--- ChatThrottleLib:Init
--- Initialize queues, set up frame for OnUpdate, etc
-
-
-function ChatThrottleLib:Init()	
-
-	-- Set up queues
-	if not self.Prio then
-		self.Prio = {}
-		self.Prio["ALERT"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
-		self.Prio["NORMAL"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
-		self.Prio["BULK"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
-	end
-
-	-- v4: total send counters per priority
-	for _, Prio in pairs(self.Prio) do
-		Prio.nTotalSent = Prio.nTotalSent or 0
-	end
-
-	if not self.avail then
-		self.avail = 0 -- v5
-	end
-	if not self.nTotalSent then
-		self.nTotalSent = 0 -- v5
-	end
-
-
-	-- Set up a frame to get OnUpdate events
-	if not self.Frame then
-		self.Frame = CreateFrame("Frame")
-		self.Frame:Hide()
-	end
-	self.Frame:SetScript("OnUpdate", self.OnUpdate)
-	self.Frame:SetScript("OnEvent", self.OnEvent)	-- v11: Monitor P_E_W so we can throttle hard for a few seconds
-	self.Frame:RegisterEvent("PLAYER_ENTERING_WORLD")
-	self.OnUpdateDelay = 0
-	self.LastAvailUpdate = GetTime()
-	self.HardThrottlingBeginTime = GetTime()	-- v11: Throttle hard for a few seconds after startup
-
-	-- Hook SendChatMessage and SendAddonMessage so we can measure unpiped traffic and avoid overloads (v7)
-	if not self.securelyHooked then
-		-- Use secure hooks as of v16. Old regular hook support yanked out in v21.
-		self.securelyHooked = true
-		--SendChatMessage
-		hooksecurefunc("SendChatMessage", function(...)
-			return ChatThrottleLib.Hook_SendChatMessage(...)
-		end)
-		--SendAddonMessage
-		hooksecurefunc("SendAddonMessage", function(...)
-			return ChatThrottleLib.Hook_SendAddonMessage(...)
-		end)
-	end
-	self.nBypass = 0
-end
-
-
------------------------------------------------------------------------
--- ChatThrottleLib.Hook_SendChatMessage / .Hook_SendAddonMessage
-
-local bMyTraffic = false
-
-function ChatThrottleLib.Hook_SendChatMessage(text, chattype, language, destination, ...)
-	if bMyTraffic then
-		return
-	end
-	local self = ChatThrottleLib
-	local size = strlen(tostring(text or "")) + strlen(tostring(destination or "")) + self.MSG_OVERHEAD
-	self.avail = self.avail - size
-	self.nBypass = self.nBypass + size	-- just a statistic
-end
-function ChatThrottleLib.Hook_SendAddonMessage(prefix, text, chattype, destination, ...)
-	if bMyTraffic then
-		return
-	end
-	local self = ChatThrottleLib
-	local size = tostring(text or ""):len() + tostring(prefix or ""):len();
-	size = size + tostring(destination or ""):len() + self.MSG_OVERHEAD
-	self.avail = self.avail - size
-	self.nBypass = self.nBypass + size	-- just a statistic
-end
-
-
-
------------------------------------------------------------------------
--- ChatThrottleLib:UpdateAvail
--- Update self.avail with how much bandwidth is currently available
-
-function ChatThrottleLib:UpdateAvail()
-	local now = GetTime()
-	local MAX_CPS = self.MAX_CPS;
-	local newavail = MAX_CPS * (now - self.LastAvailUpdate)
-	local avail = self.avail
-
-	if now - self.HardThrottlingBeginTime < 5 then
-		-- First 5 seconds after startup/zoning: VERY hard clamping to avoid irritating the server rate limiter, it seems very cranky then
-		avail = math_min(avail + (newavail*0.1), MAX_CPS*0.5)
-		self.bChoking = true
-	elseif GetFramerate() < self.MIN_FPS then		-- GetFrameRate call takes ~0.002 secs
-		avail = math_min(MAX_CPS, avail + newavail*0.5)
-		self.bChoking = true		-- just a statistic
-	else
-		avail = math_min(self.BURST, avail + newavail)
-		self.bChoking = false
-	end
-
-	avail = math_max(avail, 0-(MAX_CPS*2))	-- Can go negative when someone is eating bandwidth past the lib. but we refuse to stay silent for more than 2 seconds; if they can do it, we can.
-
-	self.avail = avail
-	self.LastAvailUpdate = now
-
-	return avail
-end
-
-
------------------------------------------------------------------------
--- Despooling logic
--- Reminder:
--- - We have 3 Priorities, each containing a "Ring" construct ...
--- - ... made up of N "Pipe"s (1 for each destination/pipename)
--- - and each pipe contains messages
-
-function ChatThrottleLib:Despool(Prio)
-	local ring = Prio.Ring
-	while ring.pos and Prio.avail > ring.pos[1].nSize do
-		local msg = table_remove(ring.pos, 1)
-		if not ring.pos[1] then  -- did we remove last msg in this pipe?
-			local pipe = Prio.Ring.pos
-			Prio.Ring:Remove(pipe)
-			Prio.ByName[pipe.name] = nil
-			DelPipe(pipe)
-		else
-			Prio.Ring.pos = Prio.Ring.pos.next
-		end
-		local didSend=false
-		local lowerDest = strlower(msg[3] or "")
-		if lowerDest == "raid" and not UnitInRaid("player") then
-			-- do nothing
-		elseif lowerDest == "party" and not UnitInParty("player") then
-			-- do nothing
-		else
-			Prio.avail = Prio.avail - msg.nSize
-			bMyTraffic = true
-			msg.f(unpack(msg, 1, msg.n))
-			bMyTraffic = false
-			Prio.nTotalSent = Prio.nTotalSent + msg.nSize
-			DelMsg(msg)
-			didSend = true
-		end
-		-- notify caller of delivery (even if we didn't send it)
-		if msg.callbackFn then
-			msg.callbackFn (msg.callbackArg, didSend)
-		end
-		-- USER CALLBACK MAY ERROR
-	end
-end
-
-
-function ChatThrottleLib.OnEvent(this,event)
-	-- v11: We know that the rate limiter is touchy after login. Assume that it's touchy after zoning, too.
-	local self = ChatThrottleLib
-	if event == "PLAYER_ENTERING_WORLD" then
-		self.HardThrottlingBeginTime = GetTime()	-- Throttle hard for a few seconds after zoning
-		self.avail = 0
-	end
-end
-
-
-function ChatThrottleLib.OnUpdate(this,delay)
-	local self = ChatThrottleLib
-
-	self.OnUpdateDelay = self.OnUpdateDelay + delay
-	if self.OnUpdateDelay < 0.08 then
-		return
-	end
-	self.OnUpdateDelay = 0
-
-	self:UpdateAvail()
-
-	if self.avail < 0  then
-		return -- argh. some bastard is spewing stuff past the lib. just bail early to save cpu.
-	end
-
-	-- See how many of our priorities have queued messages (we only have 3, don't worry about the loop)
-	local n = 0
-	for prioname,Prio in pairs(self.Prio) do
-		if Prio.Ring.pos or Prio.avail < 0 then 
-			n = n + 1 
-		end
-	end
-
-	-- Anything queued still?
-	if n<1 then
-		-- Nope. Move spillover bandwidth to global availability gauge and clear self.bQueueing
-		for prioname, Prio in pairs(self.Prio) do
-			self.avail = self.avail + Prio.avail
-			Prio.avail = 0
-		end
-		self.bQueueing = false
-		self.Frame:Hide()
-		return
-	end
-
-	-- There's stuff queued. Hand out available bandwidth to priorities as needed and despool their queues
-	local avail = self.avail/n
-	self.avail = 0
-
-	for prioname, Prio in pairs(self.Prio) do
-		if Prio.Ring.pos or Prio.avail < 0 then
-			Prio.avail = Prio.avail + avail
-			if Prio.Ring.pos and Prio.avail > Prio.Ring.pos[1].nSize then
-				self:Despool(Prio)
-				-- Note: We might not get here if the user-supplied callback function errors out! Take care!
-			end
-		end
-	end
-
-end
-
-
-
-
------------------------------------------------------------------------
--- Spooling logic
-
-function ChatThrottleLib:Enqueue(prioname, pipename, msg)
-	local Prio = self.Prio[prioname]
-	local pipe = Prio.ByName[pipename]
-	if not pipe then
-		self.Frame:Show()
-		pipe = NewPipe()
-		pipe.name = pipename
-		Prio.ByName[pipename] = pipe
-		Prio.Ring:Add(pipe)
-	end
-
-	pipe[#pipe + 1] = msg
-
-	self.bQueueing = true
-end
-
-function ChatThrottleLib:SendChatMessage(prio, prefix,   text, chattype, language, destination, queueName, callbackFn, callbackArg)
-	if not self or not prio or not prefix or not text or not self.Prio[prio] then
-		error('Usage: ChatThrottleLib:SendChatMessage("{BULK||NORMAL||ALERT}", "prefix", "text"[, "chattype"[, "language"[, "destination"]]]', 2)
-	end
-	if callbackFn and type(callbackFn)~="function" then
-		error('ChatThrottleLib:ChatMessage(): callbackFn: expected function, got '..type(callbackFn), 2)
-	end
-
-	local nSize = text:len()
-
-	if nSize>255 then
-		error("ChatThrottleLib:SendChatMessage(): message length cannot exceed 255 bytes", 2)
-	end
-
-	nSize = nSize + self.MSG_OVERHEAD
-
-	-- Check if there's room in the global available bandwidth gauge to send directly
-	if not self.bQueueing and nSize < self:UpdateAvail() then
-		self.avail = self.avail - nSize
-		bMyTraffic = true
-		_G.SendChatMessage(text, chattype, language, destination)
-		bMyTraffic = false
-		self.Prio[prio].nTotalSent = self.Prio[prio].nTotalSent + nSize
-		if callbackFn then
-			callbackFn (callbackArg, true)
-		end
-		-- USER CALLBACK MAY ERROR
-		return
-	end
-
-	-- Message needs to be queued
-	local msg = NewMsg()
-	msg.f = _G.SendChatMessage
-	msg[1] = text
-	msg[2] = chattype or "SAY"
-	msg[3] = language
-	msg[4] = destination
-	msg.n = 4
-	msg.nSize = nSize
-	msg.callbackFn = callbackFn
-	msg.callbackArg = callbackArg
-
-	self:Enqueue(prio, queueName or (prefix..(chattype or "SAY")..(destination or "")), msg)
-end
-
-
-function ChatThrottleLib:SendAddonMessage(prio, prefix, text, chattype, target, queueName, callbackFn, callbackArg)
-	if not self or not prio or not prefix or not text or not chattype or not self.Prio[prio] then
-		error('Usage: ChatThrottleLib:SendAddonMessage("{BULK||NORMAL||ALERT}", "prefix", "text", "chattype"[, "target"])', 2)
-	end
-	if callbackFn and type(callbackFn)~="function" then
-		error('ChatThrottleLib:SendAddonMessage(): callbackFn: expected function, got '..type(callbackFn), 2)
-	end
-
-	local nSize = text:len();
-
-	if RegisterAddonMessagePrefix then
-		if nSize>255 then
-			error("ChatThrottleLib:SendAddonMessage(): message length cannot exceed 255 bytes", 2)
-		end
-	else
-		nSize = nSize + prefix:len() + 1
-		if nSize>255 then
-			error("ChatThrottleLib:SendAddonMessage(): prefix + message length cannot exceed 254 bytes", 2)
-		end
-	end
-
-	nSize = nSize + self.MSG_OVERHEAD;
-
-	-- Check if there's room in the global available bandwidth gauge to send directly
-	if not self.bQueueing and nSize < self:UpdateAvail() then
-		self.avail = self.avail - nSize
-		bMyTraffic = true
-		_G.SendAddonMessage(prefix, text, chattype, target)
-		bMyTraffic = false
-		self.Prio[prio].nTotalSent = self.Prio[prio].nTotalSent + nSize
-		if callbackFn then
-			callbackFn (callbackArg, true)
-		end
-		-- USER CALLBACK MAY ERROR
-		return
-	end
-
-	-- Message needs to be queued
-	local msg = NewMsg()
-	msg.f = _G.SendAddonMessage
-	msg[1] = prefix
-	msg[2] = text
-	msg[3] = chattype
-	msg[4] = target
-	msg.n = (target~=nil) and 4 or 3;
-	msg.nSize = nSize
-	msg.callbackFn = callbackFn
-	msg.callbackArg = callbackArg
-
-	self:Enqueue(prio, queueName or (prefix..chattype..(target or "")), msg)
-end
-
-
-
-
------------------------------------------------------------------------
--- Get the ball rolling!
-
-ChatThrottleLib:Init()
-
---[[ WoWBench debugging snippet
-if(WOWB_VER) then
-	local function SayTimer()
-		print("SAY: "..GetTime().." "..arg1)
-	end
-	ChatThrottleLib.Frame:SetScript("OnEvent", SayTimer)
-	ChatThrottleLib.Frame:RegisterEvent("CHAT_MSG_SAY")
-end
-]]
-
-
+--
+-- ChatThrottleLib by Mikk
+--
+-- Manages AddOn chat output to keep player from getting kicked off.
+--
+-- ChatThrottleLib:SendChatMessage/:SendAddonMessage functions that accept 
+-- a Priority ("BULK", "NORMAL", "ALERT") as well as prefix for SendChatMessage.
+--
+-- Priorities get an equal share of available bandwidth when fully loaded.
+-- Communication channels are separated on extension+chattype+destination and
+-- get round-robinned. (Destination only matters for whispers and channels,
+-- obviously)
+--
+-- Will install hooks for SendChatMessage and SendAddonMessage to measure
+-- bandwidth bypassing the library and use less bandwidth itself.
+--
+--
+-- Fully embeddable library. Just copy this file into your addon directory,
+-- add it to the .toc, and it's done.
+--
+-- Can run as a standalone addon also, but, really, just embed it! :-)
+--
+-- LICENSE: ChatThrottleLib is released into the Public Domain
+--
+
+local CTL_VERSION = 23
+
+local _G = _G
+
+if _G.ChatThrottleLib then
+	if _G.ChatThrottleLib.version >= CTL_VERSION then
+		-- There's already a newer (or same) version loaded. Buh-bye.
+		return
+	elseif not _G.ChatThrottleLib.securelyHooked then
+		print("ChatThrottleLib: Warning: There's an ANCIENT ChatThrottleLib.lua (pre-wow 2.0, <v16) in an addon somewhere. Get the addon updated or copy in a newer ChatThrottleLib.lua (>=v16) in it!")
+		-- ATTEMPT to unhook; this'll behave badly if someone else has hooked...
+		-- ... and if someone has securehooked, they can kiss that goodbye too... >.<
+		_G.SendChatMessage = _G.ChatThrottleLib.ORIG_SendChatMessage
+		if _G.ChatThrottleLib.ORIG_SendAddonMessage then
+			_G.SendAddonMessage = _G.ChatThrottleLib.ORIG_SendAddonMessage
+		end
+	end
+	_G.ChatThrottleLib.ORIG_SendChatMessage = nil
+	_G.ChatThrottleLib.ORIG_SendAddonMessage = nil
+end
+
+if not _G.ChatThrottleLib then
+	_G.ChatThrottleLib = {}
+end
+
+ChatThrottleLib = _G.ChatThrottleLib  -- in case some addon does "local ChatThrottleLib" above us and we're copypasted (AceComm-2, sigh)
+local ChatThrottleLib = _G.ChatThrottleLib
+
+ChatThrottleLib.version = CTL_VERSION
+
+
+
+------------------ TWEAKABLES -----------------
+
+ChatThrottleLib.MAX_CPS = 800			  -- 2000 seems to be safe if NOTHING ELSE is happening. let's call it 800.
+ChatThrottleLib.MSG_OVERHEAD = 40		-- Guesstimate overhead for sending a message; source+dest+chattype+protocolstuff
+
+ChatThrottleLib.BURST = 4000				-- WoW's server buffer seems to be about 32KB. 8KB should be safe, but seen disconnects on _some_ servers. Using 4KB now.
+
+ChatThrottleLib.MIN_FPS = 20				-- Reduce output CPS to half (and don't burst) if FPS drops below this value
+
+
+local setmetatable = setmetatable
+local table_remove = table.remove
+local tostring = tostring
+local GetTime = GetTime
+local math_min = math.min
+local math_max = math.max
+local next = next
+local strlen = string.len
+local GetFramerate = GetFramerate
+local strlower = string.lower
+local unpack,type,pairs,wipe = unpack,type,pairs,wipe
+local UnitInRaid,UnitInParty = UnitInRaid,UnitInParty
+
+
+-----------------------------------------------------------------------
+-- Double-linked ring implementation
+
+local Ring = {}
+local RingMeta = { __index = Ring }
+
+function Ring:New()
+	local ret = {}
+	setmetatable(ret, RingMeta)
+	return ret
+end
+
+function Ring:Add(obj)	-- Append at the "far end" of the ring (aka just before the current position)
+	if self.pos then
+		obj.prev = self.pos.prev
+		obj.prev.next = obj
+		obj.next = self.pos
+		obj.next.prev = obj
+	else
+		obj.next = obj
+		obj.prev = obj
+		self.pos = obj
+	end
+end
+
+function Ring:Remove(obj)
+	obj.next.prev = obj.prev
+	obj.prev.next = obj.next
+	if self.pos == obj then
+		self.pos = obj.next
+		if self.pos == obj then
+			self.pos = nil
+		end
+	end
+end
+
+
+
+-----------------------------------------------------------------------
+-- Recycling bin for pipes 
+-- A pipe is a plain integer-indexed queue of messages
+-- Pipes normally live in Rings of pipes  (3 rings total, one per priority)
+
+ChatThrottleLib.PipeBin = nil -- pre-v19, drastically different
+local PipeBin = setmetatable({}, {__mode="k"})
+
+local function DelPipe(pipe)
+	PipeBin[pipe] = true
+end
+
+local function NewPipe()
+	local pipe = next(PipeBin)
+	if pipe then
+		wipe(pipe)
+		PipeBin[pipe] = nil
+		return pipe
+	end
+	return {}
+end
+
+
+
+
+-----------------------------------------------------------------------
+-- Recycling bin for messages
+
+ChatThrottleLib.MsgBin = nil -- pre-v19, drastically different
+local MsgBin = setmetatable({}, {__mode="k"})
+
+local function DelMsg(msg)
+	msg[1] = nil
+	-- there's more parameters, but they're very repetetive so the string pool doesn't suffer really, and it's faster to just not delete them.
+	MsgBin[msg] = true
+end
+
+local function NewMsg()
+	local msg = next(MsgBin)
+	if msg then
+		MsgBin[msg] = nil
+		return msg
+	end
+	return {}
+end
+
+
+-----------------------------------------------------------------------
+-- ChatThrottleLib:Init
+-- Initialize queues, set up frame for OnUpdate, etc
+
+
+function ChatThrottleLib:Init()	
+
+	-- Set up queues
+	if not self.Prio then
+		self.Prio = {}
+		self.Prio["ALERT"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
+		self.Prio["NORMAL"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
+		self.Prio["BULK"] = { ByName = {}, Ring = Ring:New(), avail = 0 }
+	end
+
+	-- v4: total send counters per priority
+	for _, Prio in pairs(self.Prio) do
+		Prio.nTotalSent = Prio.nTotalSent or 0
+	end
+
+	if not self.avail then
+		self.avail = 0 -- v5
+	end
+	if not self.nTotalSent then
+		self.nTotalSent = 0 -- v5
+	end
+
+
+	-- Set up a frame to get OnUpdate events
+	if not self.Frame then
+		self.Frame = CreateFrame("Frame")
+		self.Frame:Hide()
+	end
+	self.Frame:SetScript("OnUpdate", self.OnUpdate)
+	self.Frame:SetScript("OnEvent", self.OnEvent)	-- v11: Monitor P_E_W so we can throttle hard for a few seconds
+	self.Frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+	self.OnUpdateDelay = 0
+	self.LastAvailUpdate = GetTime()
+	self.HardThrottlingBeginTime = GetTime()	-- v11: Throttle hard for a few seconds after startup
+
+	-- Hook SendChatMessage and SendAddonMessage so we can measure unpiped traffic and avoid overloads (v7)
+	if not self.securelyHooked then
+		-- Use secure hooks as of v16. Old regular hook support yanked out in v21.
+		self.securelyHooked = true
+		--SendChatMessage
+		hooksecurefunc("SendChatMessage", function(...)
+			return ChatThrottleLib.Hook_SendChatMessage(...)
+		end)
+		--SendAddonMessage
+		hooksecurefunc("SendAddonMessage", function(...)
+			return ChatThrottleLib.Hook_SendAddonMessage(...)
+		end)
+	end
+	self.nBypass = 0
+end
+
+
+-----------------------------------------------------------------------
+-- ChatThrottleLib.Hook_SendChatMessage / .Hook_SendAddonMessage
+
+local bMyTraffic = false
+
+function ChatThrottleLib.Hook_SendChatMessage(text, chattype, language, destination, ...)
+	if bMyTraffic then
+		return
+	end
+	local self = ChatThrottleLib
+	local size = strlen(tostring(text or "")) + strlen(tostring(destination or "")) + self.MSG_OVERHEAD
+	self.avail = self.avail - size
+	self.nBypass = self.nBypass + size	-- just a statistic
+end
+function ChatThrottleLib.Hook_SendAddonMessage(prefix, text, chattype, destination, ...)
+	if bMyTraffic then
+		return
+	end
+	local self = ChatThrottleLib
+	local size = tostring(text or ""):len() + tostring(prefix or ""):len();
+	size = size + tostring(destination or ""):len() + self.MSG_OVERHEAD
+	self.avail = self.avail - size
+	self.nBypass = self.nBypass + size	-- just a statistic
+end
+
+
+
+-----------------------------------------------------------------------
+-- ChatThrottleLib:UpdateAvail
+-- Update self.avail with how much bandwidth is currently available
+
+function ChatThrottleLib:UpdateAvail()
+	local now = GetTime()
+	local MAX_CPS = self.MAX_CPS;
+	local newavail = MAX_CPS * (now - self.LastAvailUpdate)
+	local avail = self.avail
+
+	if now - self.HardThrottlingBeginTime < 5 then
+		-- First 5 seconds after startup/zoning: VERY hard clamping to avoid irritating the server rate limiter, it seems very cranky then
+		avail = math_min(avail + (newavail*0.1), MAX_CPS*0.5)
+		self.bChoking = true
+	elseif GetFramerate() < self.MIN_FPS then		-- GetFrameRate call takes ~0.002 secs
+		avail = math_min(MAX_CPS, avail + newavail*0.5)
+		self.bChoking = true		-- just a statistic
+	else
+		avail = math_min(self.BURST, avail + newavail)
+		self.bChoking = false
+	end
+
+	avail = math_max(avail, 0-(MAX_CPS*2))	-- Can go negative when someone is eating bandwidth past the lib. but we refuse to stay silent for more than 2 seconds; if they can do it, we can.
+
+	self.avail = avail
+	self.LastAvailUpdate = now
+
+	return avail
+end
+
+
+-----------------------------------------------------------------------
+-- Despooling logic
+-- Reminder:
+-- - We have 3 Priorities, each containing a "Ring" construct ...
+-- - ... made up of N "Pipe"s (1 for each destination/pipename)
+-- - and each pipe contains messages
+
+function ChatThrottleLib:Despool(Prio)
+	local ring = Prio.Ring
+	while ring.pos and Prio.avail > ring.pos[1].nSize do
+		local msg = table_remove(ring.pos, 1)
+		if not ring.pos[1] then  -- did we remove last msg in this pipe?
+			local pipe = Prio.Ring.pos
+			Prio.Ring:Remove(pipe)
+			Prio.ByName[pipe.name] = nil
+			DelPipe(pipe)
+		else
+			Prio.Ring.pos = Prio.Ring.pos.next
+		end
+		local didSend=false
+		local lowerDest = strlower(msg[3] or "")
+		if lowerDest == "raid" and not UnitInRaid("player") then
+			-- do nothing
+		elseif lowerDest == "party" and not UnitInParty("player") then
+			-- do nothing
+		else
+			Prio.avail = Prio.avail - msg.nSize
+			bMyTraffic = true
+			msg.f(unpack(msg, 1, msg.n))
+			bMyTraffic = false
+			Prio.nTotalSent = Prio.nTotalSent + msg.nSize
+			DelMsg(msg)
+			didSend = true
+		end
+		-- notify caller of delivery (even if we didn't send it)
+		if msg.callbackFn then
+			msg.callbackFn (msg.callbackArg, didSend)
+		end
+		-- USER CALLBACK MAY ERROR
+	end
+end
+
+
+function ChatThrottleLib.OnEvent(this,event)
+	-- v11: We know that the rate limiter is touchy after login. Assume that it's touchy after zoning, too.
+	local self = ChatThrottleLib
+	if event == "PLAYER_ENTERING_WORLD" then
+		self.HardThrottlingBeginTime = GetTime()	-- Throttle hard for a few seconds after zoning
+		self.avail = 0
+	end
+end
+
+
+function ChatThrottleLib.OnUpdate(this,delay)
+	local self = ChatThrottleLib
+
+	self.OnUpdateDelay = self.OnUpdateDelay + delay
+	if self.OnUpdateDelay < 0.08 then
+		return
+	end
+	self.OnUpdateDelay = 0
+
+	self:UpdateAvail()
+
+	if self.avail < 0  then
+		return -- argh. some bastard is spewing stuff past the lib. just bail early to save cpu.
+	end
+
+	-- See how many of our priorities have queued messages (we only have 3, don't worry about the loop)
+	local n = 0
+	for prioname,Prio in pairs(self.Prio) do
+		if Prio.Ring.pos or Prio.avail < 0 then 
+			n = n + 1 
+		end
+	end
+
+	-- Anything queued still?
+	if n<1 then
+		-- Nope. Move spillover bandwidth to global availability gauge and clear self.bQueueing
+		for prioname, Prio in pairs(self.Prio) do
+			self.avail = self.avail + Prio.avail
+			Prio.avail = 0
+		end
+		self.bQueueing = false
+		self.Frame:Hide()
+		return
+	end
+
+	-- There's stuff queued. Hand out available bandwidth to priorities as needed and despool their queues
+	local avail = self.avail/n
+	self.avail = 0
+
+	for prioname, Prio in pairs(self.Prio) do
+		if Prio.Ring.pos or Prio.avail < 0 then
+			Prio.avail = Prio.avail + avail
+			if Prio.Ring.pos and Prio.avail > Prio.Ring.pos[1].nSize then
+				self:Despool(Prio)
+				-- Note: We might not get here if the user-supplied callback function errors out! Take care!
+			end
+		end
+	end
+
+end
+
+
+
+
+-----------------------------------------------------------------------
+-- Spooling logic
+
+function ChatThrottleLib:Enqueue(prioname, pipename, msg)
+	local Prio = self.Prio[prioname]
+	local pipe = Prio.ByName[pipename]
+	if not pipe then
+		self.Frame:Show()
+		pipe = NewPipe()
+		pipe.name = pipename
+		Prio.ByName[pipename] = pipe
+		Prio.Ring:Add(pipe)
+	end
+
+	pipe[#pipe + 1] = msg
+
+	self.bQueueing = true
+end
+
+function ChatThrottleLib:SendChatMessage(prio, prefix,   text, chattype, language, destination, queueName, callbackFn, callbackArg)
+	if not self or not prio or not prefix or not text or not self.Prio[prio] then
+		error('Usage: ChatThrottleLib:SendChatMessage("{BULK||NORMAL||ALERT}", "prefix", "text"[, "chattype"[, "language"[, "destination"]]]', 2)
+	end
+	if callbackFn and type(callbackFn)~="function" then
+		error('ChatThrottleLib:ChatMessage(): callbackFn: expected function, got '..type(callbackFn), 2)
+	end
+
+	local nSize = text:len()
+
+	if nSize>255 then
+		error("ChatThrottleLib:SendChatMessage(): message length cannot exceed 255 bytes", 2)
+	end
+
+	nSize = nSize + self.MSG_OVERHEAD
+
+	-- Check if there's room in the global available bandwidth gauge to send directly
+	if not self.bQueueing and nSize < self:UpdateAvail() then
+		self.avail = self.avail - nSize
+		bMyTraffic = true
+		_G.SendChatMessage(text, chattype, language, destination)
+		bMyTraffic = false
+		self.Prio[prio].nTotalSent = self.Prio[prio].nTotalSent + nSize
+		if callbackFn then
+			callbackFn (callbackArg, true)
+		end
+		-- USER CALLBACK MAY ERROR
+		return
+	end
+
+	-- Message needs to be queued
+	local msg = NewMsg()
+	msg.f = _G.SendChatMessage
+	msg[1] = text
+	msg[2] = chattype or "SAY"
+	msg[3] = language
+	msg[4] = destination
+	msg.n = 4
+	msg.nSize = nSize
+	msg.callbackFn = callbackFn
+	msg.callbackArg = callbackArg
+
+	self:Enqueue(prio, queueName or (prefix..(chattype or "SAY")..(destination or "")), msg)
+end
+
+
+function ChatThrottleLib:SendAddonMessage(prio, prefix, text, chattype, target, queueName, callbackFn, callbackArg)
+	if not self or not prio or not prefix or not text or not chattype or not self.Prio[prio] then
+		error('Usage: ChatThrottleLib:SendAddonMessage("{BULK||NORMAL||ALERT}", "prefix", "text", "chattype"[, "target"])', 2)
+	end
+	if callbackFn and type(callbackFn)~="function" then
+		error('ChatThrottleLib:SendAddonMessage(): callbackFn: expected function, got '..type(callbackFn), 2)
+	end
+
+	local nSize = text:len();
+
+	if RegisterAddonMessagePrefix then
+		if nSize>255 then
+			error("ChatThrottleLib:SendAddonMessage(): message length cannot exceed 255 bytes", 2)
+		end
+	else
+		nSize = nSize + prefix:len() + 1
+		if nSize>255 then
+			error("ChatThrottleLib:SendAddonMessage(): prefix + message length cannot exceed 254 bytes", 2)
+		end
+	end
+
+	nSize = nSize + self.MSG_OVERHEAD;
+
+	-- Check if there's room in the global available bandwidth gauge to send directly
+	if not self.bQueueing and nSize < self:UpdateAvail() then
+		self.avail = self.avail - nSize
+		bMyTraffic = true
+		_G.SendAddonMessage(prefix, text, chattype, target)
+		bMyTraffic = false
+		self.Prio[prio].nTotalSent = self.Prio[prio].nTotalSent + nSize
+		if callbackFn then
+			callbackFn (callbackArg, true)
+		end
+		-- USER CALLBACK MAY ERROR
+		return
+	end
+
+	-- Message needs to be queued
+	local msg = NewMsg()
+	msg.f = _G.SendAddonMessage
+	msg[1] = prefix
+	msg[2] = text
+	msg[3] = chattype
+	msg[4] = target
+	msg.n = (target~=nil) and 4 or 3;
+	msg.nSize = nSize
+	msg.callbackFn = callbackFn
+	msg.callbackArg = callbackArg
+
+	self:Enqueue(prio, queueName or (prefix..chattype..(target or "")), msg)
+end
+
+
+
+
+-----------------------------------------------------------------------
+-- Get the ball rolling!
+
+ChatThrottleLib:Init()
+
+--[[ WoWBench debugging snippet
+if(WOWB_VER) then
+	local function SayTimer()
+		print("SAY: "..GetTime().." "..arg1)
+	end
+	ChatThrottleLib.Frame:SetScript("OnEvent", SayTimer)
+	ChatThrottleLib.Frame:RegisterEvent("CHAT_MSG_SAY")
+end
+]]
+
+
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.lua
index 4cd24457b..0567a6563 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.lua	
@@ -1,250 +1,250 @@
---- **AceConsole-3.0** provides registration facilities for slash commands.
--- You can register slash commands to your custom functions and use the `GetArgs` function to parse them
--- to your addons individual needs.
---
--- **AceConsole-3.0** can be embeded into your addon, either explicitly by calling AceConsole:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceConsole itself.\\
--- It is recommended to embed AceConsole, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceConsole.
--- @class file
--- @name AceConsole-3.0
--- @release $Id: AceConsole-3.0.lua 1143 2016-07-11 08:52:03Z nevcairiel $
-local MAJOR,MINOR = "AceConsole-3.0", 7
-
-local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceConsole then return end -- No upgrade needed
-
-AceConsole.embeds = AceConsole.embeds or {} -- table containing objects AceConsole is embedded in.
-AceConsole.commands = AceConsole.commands or {} -- table containing commands registered
-AceConsole.weakcommands = AceConsole.weakcommands or {} -- table containing self, command => func references for weak commands that don't persist through enable/disable
-
--- Lua APIs
-local tconcat, tostring, select = table.concat, tostring, select
-local type, pairs, error = type, pairs, error
-local format, strfind, strsub = string.format, string.find, string.sub
-local max = math.max
-
--- WoW APIs
-local _G = _G
-
--- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- List them here for Mikk's FindGlobals script
--- GLOBALS: DEFAULT_CHAT_FRAME, SlashCmdList, hash_SlashCmdList
-
-local tmp={}
-local function Print(self,frame,...)
-	local n=0
-	if self ~= AceConsole then
-		n=n+1
-		tmp[n] = "|cff33ff99"..tostring( self ).."|r:"
-	end
-	for i=1, select("#", ...) do
-		n=n+1
-		tmp[n] = tostring(select(i, ...))
-	end
-	frame:AddMessage( tconcat(tmp," ",1,n) )
-end
-
---- Print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
--- @paramsig [chatframe ,] ...
--- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
--- @param ... List of any values to be printed
-function AceConsole:Print(...)
-	local frame = ...
-	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
-		return Print(self, frame, select(2,...))
-	else
-		return Print(self, DEFAULT_CHAT_FRAME, ...)
-	end
-end
-
-
---- Formatted (using format()) print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
--- @paramsig [chatframe ,] "format"[, ...]
--- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
--- @param format Format string - same syntax as standard Lua format()
--- @param ... Arguments to the format string
-function AceConsole:Printf(...)
-	local frame = ...
-	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
-		return Print(self, frame, format(select(2,...)))
-	else
-		return Print(self, DEFAULT_CHAT_FRAME, format(...))
-	end
-end
-
-
-
-
---- Register a simple chat command
--- @param command Chat command to be registered WITHOUT leading "/"
--- @param func Function to call when the slash command is being used (funcref or methodname)
--- @param persist if false, the command will be soft disabled/enabled when aceconsole is used as a mixin (default: true)
-function AceConsole:RegisterChatCommand( command, func, persist )
-	if type(command)~="string" then error([[Usage: AceConsole:RegisterChatCommand( "command", func[, persist ]): 'command' - expected a string]], 2) end
-	
-	if persist==nil then persist=true end	-- I'd rather have my addon's "/addon enable" around if the author screws up. Having some extra slash regged when it shouldnt be isn't as destructive. True is a better default. /Mikk
-	
-	local name = "ACECONSOLE_"..command:upper()
-	
-	if type( func ) == "string" then
-		SlashCmdList[name] = function(input, editBox)
-			self[func](self, input, editBox)
-		end
-	else
-		SlashCmdList[name] = func
-	end
-	_G["SLASH_"..name.."1"] = "/"..command:lower()
-	AceConsole.commands[command] = name
-	-- non-persisting commands are registered for enabling disabling
-	if not persist then
-		if not AceConsole.weakcommands[self] then AceConsole.weakcommands[self] = {} end
-		AceConsole.weakcommands[self][command] = func
-	end
-	return true
-end
-
---- Unregister a chatcommand
--- @param command Chat command to be unregistered WITHOUT leading "/"
-function AceConsole:UnregisterChatCommand( command )
-	local name = AceConsole.commands[command]
-	if name then
-		SlashCmdList[name] = nil
-		_G["SLASH_" .. name .. "1"] = nil
-		hash_SlashCmdList["/" .. command:upper()] = nil
-		AceConsole.commands[command] = nil
-	end
-end
-
---- Get an iterator over all Chat Commands registered with AceConsole
--- @return Iterator (pairs) over all commands
-function AceConsole:IterateChatCommands() return pairs(AceConsole.commands) end
-
-
-local function nils(n, ...)
-	if n>1 then
-		return nil, nils(n-1, ...)
-	elseif n==1 then
-		return nil, ...
-	else
-		return ...
-	end
-end
-	
-
---- Retreive one or more space-separated arguments from a string. 
--- Treats quoted strings and itemlinks as non-spaced.
--- @param str The raw argument string
--- @param numargs How many arguments to get (default 1)
--- @param startpos Where in the string to start scanning (default  1)
--- @return Returns arg1, arg2, ..., nextposition\\
--- Missing arguments will be returned as nils. 'nextposition' is returned as 1e9 at the end of the string.
-function AceConsole:GetArgs(str, numargs, startpos)
-	numargs = numargs or 1
-	startpos = max(startpos or 1, 1)
-	
-	local pos=startpos
-
-	-- find start of new arg
-	pos = strfind(str, "[^ ]", pos)
-	if not pos then	-- whoops, end of string
-		return nils(numargs, 1e9)
-	end
-
-	if numargs<1 then
-		return pos
-	end
-
-	-- quoted or space separated? find out which pattern to use
-	local delim_or_pipe
-	local ch = strsub(str, pos, pos)
-	if ch=='"' then
-		pos = pos + 1
-		delim_or_pipe='([|"])'
-	elseif ch=="'" then
-		pos = pos + 1
-		delim_or_pipe="([|'])"
-	else
-		delim_or_pipe="([| ])"
-	end
-	
-	startpos = pos
-	
-	while true do
-		-- find delimiter or hyperlink
-		local ch,_
-		pos,_,ch = strfind(str, delim_or_pipe, pos)
-		
-		if not pos then break end
-		
-		if ch=="|" then
-			-- some kind of escape
-			
-			if strsub(str,pos,pos+1)=="|H" then
-				-- It's a |H....|hhyper link!|h
-				pos=strfind(str, "|h", pos+2)	-- first |h
-				if not pos then break end
-				
-				pos=strfind(str, "|h", pos+2)	-- second |h
-				if not pos then break end
-			elseif strsub(str,pos, pos+1) == "|T" then
-				-- It's a |T....|t  texture
-				pos=strfind(str, "|t", pos+2)
-				if not pos then break end
-			end
-			
-			pos=pos+2 -- skip past this escape (last |h if it was a hyperlink)
-		
-		else
-			-- found delimiter, done with this arg
-			return strsub(str, startpos, pos-1), AceConsole:GetArgs(str, numargs-1, pos+1)
-		end
-		
-	end
-	
-	-- search aborted, we hit end of string. return it all as one argument. (yes, even if it's an unterminated quote or hyperlink)
-	return strsub(str, startpos), nils(numargs-1, 1e9)
-end
-
-
---- embedding and embed handling
-
-local mixins = {
-	"Print",
-	"Printf",
-	"RegisterChatCommand", 
-	"UnregisterChatCommand",
-	"GetArgs",
-} 
-
--- Embeds AceConsole into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceBucket in
-function AceConsole:Embed( target )
-	for k, v in pairs( mixins ) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
-function AceConsole:OnEmbedEnable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:RegisterChatCommand( command, func, false, true ) -- nonpersisting and silent registry
-		end
-	end
-end
-
-function AceConsole:OnEmbedDisable( target )
-	if AceConsole.weakcommands[target] then
-		for command, func in pairs( AceConsole.weakcommands[target] ) do
-			target:UnregisterChatCommand( command ) -- TODO: this could potentially unregister a command from another application in case of command conflicts. Do we care?
-		end
-	end
-end
-
-for addon in pairs(AceConsole.embeds) do
-	AceConsole:Embed(addon)
-end
+--- **AceConsole-3.0** provides registration facilities for slash commands.
+-- You can register slash commands to your custom functions and use the `GetArgs` function to parse them
+-- to your addons individual needs.
+--
+-- **AceConsole-3.0** can be embeded into your addon, either explicitly by calling AceConsole:Embed(MyAddon) or by 
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceConsole itself.\\
+-- It is recommended to embed AceConsole, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceConsole.
+-- @class file
+-- @name AceConsole-3.0
+-- @release $Id: AceConsole-3.0.lua 1143 2016-07-11 08:52:03Z nevcairiel $
+local MAJOR,MINOR = "AceConsole-3.0", 7
+
+local AceConsole, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceConsole then return end -- No upgrade needed
+
+AceConsole.embeds = AceConsole.embeds or {} -- table containing objects AceConsole is embedded in.
+AceConsole.commands = AceConsole.commands or {} -- table containing commands registered
+AceConsole.weakcommands = AceConsole.weakcommands or {} -- table containing self, command => func references for weak commands that don't persist through enable/disable
+
+-- Lua APIs
+local tconcat, tostring, select = table.concat, tostring, select
+local type, pairs, error = type, pairs, error
+local format, strfind, strsub = string.format, string.find, string.sub
+local max = math.max
+
+-- WoW APIs
+local _G = _G
+
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: DEFAULT_CHAT_FRAME, SlashCmdList, hash_SlashCmdList
+
+local tmp={}
+local function Print(self,frame,...)
+	local n=0
+	if self ~= AceConsole then
+		n=n+1
+		tmp[n] = "|cff33ff99"..tostring( self ).."|r:"
+	end
+	for i=1, select("#", ...) do
+		n=n+1
+		tmp[n] = tostring(select(i, ...))
+	end
+	frame:AddMessage( tconcat(tmp," ",1,n) )
+end
+
+--- Print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
+-- @paramsig [chatframe ,] ...
+-- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
+-- @param ... List of any values to be printed
+function AceConsole:Print(...)
+	local frame = ...
+	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
+		return Print(self, frame, select(2,...))
+	else
+		return Print(self, DEFAULT_CHAT_FRAME, ...)
+	end
+end
+
+
+--- Formatted (using format()) print to DEFAULT_CHAT_FRAME or given ChatFrame (anything with an .AddMessage function)
+-- @paramsig [chatframe ,] "format"[, ...]
+-- @param chatframe Custom ChatFrame to print to (or any frame with an .AddMessage function)
+-- @param format Format string - same syntax as standard Lua format()
+-- @param ... Arguments to the format string
+function AceConsole:Printf(...)
+	local frame = ...
+	if type(frame) == "table" and frame.AddMessage then	-- Is first argument something with an .AddMessage member?
+		return Print(self, frame, format(select(2,...)))
+	else
+		return Print(self, DEFAULT_CHAT_FRAME, format(...))
+	end
+end
+
+
+
+
+--- Register a simple chat command
+-- @param command Chat command to be registered WITHOUT leading "/"
+-- @param func Function to call when the slash command is being used (funcref or methodname)
+-- @param persist if false, the command will be soft disabled/enabled when aceconsole is used as a mixin (default: true)
+function AceConsole:RegisterChatCommand( command, func, persist )
+	if type(command)~="string" then error([[Usage: AceConsole:RegisterChatCommand( "command", func[, persist ]): 'command' - expected a string]], 2) end
+	
+	if persist==nil then persist=true end	-- I'd rather have my addon's "/addon enable" around if the author screws up. Having some extra slash regged when it shouldnt be isn't as destructive. True is a better default. /Mikk
+	
+	local name = "ACECONSOLE_"..command:upper()
+	
+	if type( func ) == "string" then
+		SlashCmdList[name] = function(input, editBox)
+			self[func](self, input, editBox)
+		end
+	else
+		SlashCmdList[name] = func
+	end
+	_G["SLASH_"..name.."1"] = "/"..command:lower()
+	AceConsole.commands[command] = name
+	-- non-persisting commands are registered for enabling disabling
+	if not persist then
+		if not AceConsole.weakcommands[self] then AceConsole.weakcommands[self] = {} end
+		AceConsole.weakcommands[self][command] = func
+	end
+	return true
+end
+
+--- Unregister a chatcommand
+-- @param command Chat command to be unregistered WITHOUT leading "/"
+function AceConsole:UnregisterChatCommand( command )
+	local name = AceConsole.commands[command]
+	if name then
+		SlashCmdList[name] = nil
+		_G["SLASH_" .. name .. "1"] = nil
+		hash_SlashCmdList["/" .. command:upper()] = nil
+		AceConsole.commands[command] = nil
+	end
+end
+
+--- Get an iterator over all Chat Commands registered with AceConsole
+-- @return Iterator (pairs) over all commands
+function AceConsole:IterateChatCommands() return pairs(AceConsole.commands) end
+
+
+local function nils(n, ...)
+	if n>1 then
+		return nil, nils(n-1, ...)
+	elseif n==1 then
+		return nil, ...
+	else
+		return ...
+	end
+end
+	
+
+--- Retreive one or more space-separated arguments from a string. 
+-- Treats quoted strings and itemlinks as non-spaced.
+-- @param str The raw argument string
+-- @param numargs How many arguments to get (default 1)
+-- @param startpos Where in the string to start scanning (default  1)
+-- @return Returns arg1, arg2, ..., nextposition\\
+-- Missing arguments will be returned as nils. 'nextposition' is returned as 1e9 at the end of the string.
+function AceConsole:GetArgs(str, numargs, startpos)
+	numargs = numargs or 1
+	startpos = max(startpos or 1, 1)
+	
+	local pos=startpos
+
+	-- find start of new arg
+	pos = strfind(str, "[^ ]", pos)
+	if not pos then	-- whoops, end of string
+		return nils(numargs, 1e9)
+	end
+
+	if numargs<1 then
+		return pos
+	end
+
+	-- quoted or space separated? find out which pattern to use
+	local delim_or_pipe
+	local ch = strsub(str, pos, pos)
+	if ch=='"' then
+		pos = pos + 1
+		delim_or_pipe='([|"])'
+	elseif ch=="'" then
+		pos = pos + 1
+		delim_or_pipe="([|'])"
+	else
+		delim_or_pipe="([| ])"
+	end
+	
+	startpos = pos
+	
+	while true do
+		-- find delimiter or hyperlink
+		local ch,_
+		pos,_,ch = strfind(str, delim_or_pipe, pos)
+		
+		if not pos then break end
+		
+		if ch=="|" then
+			-- some kind of escape
+			
+			if strsub(str,pos,pos+1)=="|H" then
+				-- It's a |H....|hhyper link!|h
+				pos=strfind(str, "|h", pos+2)	-- first |h
+				if not pos then break end
+				
+				pos=strfind(str, "|h", pos+2)	-- second |h
+				if not pos then break end
+			elseif strsub(str,pos, pos+1) == "|T" then
+				-- It's a |T....|t  texture
+				pos=strfind(str, "|t", pos+2)
+				if not pos then break end
+			end
+			
+			pos=pos+2 -- skip past this escape (last |h if it was a hyperlink)
+		
+		else
+			-- found delimiter, done with this arg
+			return strsub(str, startpos, pos-1), AceConsole:GetArgs(str, numargs-1, pos+1)
+		end
+		
+	end
+	
+	-- search aborted, we hit end of string. return it all as one argument. (yes, even if it's an unterminated quote or hyperlink)
+	return strsub(str, startpos), nils(numargs-1, 1e9)
+end
+
+
+--- embedding and embed handling
+
+local mixins = {
+	"Print",
+	"Printf",
+	"RegisterChatCommand", 
+	"UnregisterChatCommand",
+	"GetArgs",
+} 
+
+-- Embeds AceConsole into the target object making the functions from the mixins list available on target:..
+-- @param target target object to embed AceBucket in
+function AceConsole:Embed( target )
+	for k, v in pairs( mixins ) do
+		target[v] = self[v]
+	end
+	self.embeds[target] = true
+	return target
+end
+
+function AceConsole:OnEmbedEnable( target )
+	if AceConsole.weakcommands[target] then
+		for command, func in pairs( AceConsole.weakcommands[target] ) do
+			target:RegisterChatCommand( command, func, false, true ) -- nonpersisting and silent registry
+		end
+	end
+end
+
+function AceConsole:OnEmbedDisable( target )
+	if AceConsole.weakcommands[target] then
+		for command, func in pairs( AceConsole.weakcommands[target] ) do
+			target:UnregisterChatCommand( command ) -- TODO: this could potentially unregister a command from another application in case of command conflicts. Do we care?
+		end
+	end
+end
+
+for addon in pairs(AceConsole.embeds) do
+	AceConsole:Embed(addon)
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.xml
index 35f6b5728..371278a62 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceConsole-3.0/AceConsole-3.0.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceConsole-3.0/AceConsole-3.0.xml	
@@ -1,4 +1,4 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-  <Script file="AceConsole-3.0.lua" />
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+  <Script file="AceConsole-3.0.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.lua
index 360a39344..bbf55c299 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.lua	
@@ -1,126 +1,126 @@
---- AceEvent-3.0 provides event registration and secure dispatching.
--- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around
--- CallbackHandler, and dispatches all game events or addon message to the registrees.
---
--- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by 
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceEvent itself.\\
--- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceEvent.
--- @class file
--- @name AceEvent-3.0
--- @release $Id: AceEvent-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
-local CallbackHandler = LibStub("CallbackHandler-1.0")
-
-local MAJOR, MINOR = "AceEvent-3.0", 4
-local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceEvent then return end
-
--- Lua APIs
-local pairs = pairs
-
-AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
-AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib
-
--- APIs and registry for blizzard events, using CallbackHandler lib
-if not AceEvent.events then
-	AceEvent.events = CallbackHandler:New(AceEvent, 
-		"RegisterEvent", "UnregisterEvent", "UnregisterAllEvents")
-end
-
-function AceEvent.events:OnUsed(target, eventname) 
-	AceEvent.frame:RegisterEvent(eventname)
-end
-
-function AceEvent.events:OnUnused(target, eventname) 
-	AceEvent.frame:UnregisterEvent(eventname)
-end
-
-
--- APIs and registry for IPC messages, using CallbackHandler lib
-if not AceEvent.messages then
-	AceEvent.messages = CallbackHandler:New(AceEvent, 
-		"RegisterMessage", "UnregisterMessage", "UnregisterAllMessages"
-	)
-	AceEvent.SendMessage = AceEvent.messages.Fire
-end
-
---- embedding and embed handling
-local mixins = {
-	"RegisterEvent", "UnregisterEvent",
-	"RegisterMessage", "UnregisterMessage",
-	"SendMessage",
-	"UnregisterAllEvents", "UnregisterAllMessages",
-}
-
---- Register for a Blizzard Event.
--- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterEvent
--- @class function
--- @paramsig event[, callback [, arg]]
--- @param event The event to register for
--- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister an event.
--- @name AceEvent:UnregisterEvent
--- @class function
--- @paramsig event
--- @param event The event to unregister
-
---- Register for a custom AceEvent-internal message.
--- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
--- Any arguments to the event will be passed on after that.
--- @name AceEvent:RegisterMessage
--- @class function
--- @paramsig message[, callback [, arg]]
--- @param message The message to register for
--- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name)
--- @param arg An optional argument to pass to the callback function
-
---- Unregister a message
--- @name AceEvent:UnregisterMessage
--- @class function
--- @paramsig message
--- @param message The message to unregister
-
---- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message.
--- @name AceEvent:SendMessage
--- @class function
--- @paramsig message, ...
--- @param message The message to send
--- @param ... Any arguments to the message
-
-
--- Embeds AceEvent into the target object making the functions from the mixins list available on target:..
--- @param target target object to embed AceEvent in
-function AceEvent:Embed(target)
-	for k, v in pairs(mixins) do
-		target[v] = self[v]
-	end
-	self.embeds[target] = true
-	return target
-end
-
--- AceEvent:OnEmbedDisable( target )
--- target (object) - target object that is being disabled
---
--- Unregister all events messages etc when the target disables.
--- this method should be called by the target manually or by an addon framework
-function AceEvent:OnEmbedDisable(target)
-	target:UnregisterAllEvents()
-	target:UnregisterAllMessages()
-end
-
--- Script to fire blizzard events into the event listeners
-local events = AceEvent.events
-AceEvent.frame:SetScript("OnEvent", function(this, event, ...)
-	events:Fire(event, ...)
-end)
-
---- Finally: upgrade our old embeds
-for target, v in pairs(AceEvent.embeds) do
-	AceEvent:Embed(target)
-end
+--- AceEvent-3.0 provides event registration and secure dispatching.
+-- All dispatching is done using **CallbackHandler-1.0**. AceEvent is a simple wrapper around
+-- CallbackHandler, and dispatches all game events or addon message to the registrees.
+--
+-- **AceEvent-3.0** can be embeded into your addon, either explicitly by calling AceEvent:Embed(MyAddon) or by 
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceEvent itself.\\
+-- It is recommended to embed AceEvent, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceEvent.
+-- @class file
+-- @name AceEvent-3.0
+-- @release $Id: AceEvent-3.0.lua 1161 2017-08-12 14:30:16Z funkydude $
+local CallbackHandler = LibStub("CallbackHandler-1.0")
+
+local MAJOR, MINOR = "AceEvent-3.0", 4
+local AceEvent = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceEvent then return end
+
+-- Lua APIs
+local pairs = pairs
+
+AceEvent.frame = AceEvent.frame or CreateFrame("Frame", "AceEvent30Frame") -- our event frame
+AceEvent.embeds = AceEvent.embeds or {} -- what objects embed this lib
+
+-- APIs and registry for blizzard events, using CallbackHandler lib
+if not AceEvent.events then
+	AceEvent.events = CallbackHandler:New(AceEvent, 
+		"RegisterEvent", "UnregisterEvent", "UnregisterAllEvents")
+end
+
+function AceEvent.events:OnUsed(target, eventname) 
+	AceEvent.frame:RegisterEvent(eventname)
+end
+
+function AceEvent.events:OnUnused(target, eventname) 
+	AceEvent.frame:UnregisterEvent(eventname)
+end
+
+
+-- APIs and registry for IPC messages, using CallbackHandler lib
+if not AceEvent.messages then
+	AceEvent.messages = CallbackHandler:New(AceEvent, 
+		"RegisterMessage", "UnregisterMessage", "UnregisterAllMessages"
+	)
+	AceEvent.SendMessage = AceEvent.messages.Fire
+end
+
+--- embedding and embed handling
+local mixins = {
+	"RegisterEvent", "UnregisterEvent",
+	"RegisterMessage", "UnregisterMessage",
+	"SendMessage",
+	"UnregisterAllEvents", "UnregisterAllMessages",
+}
+
+--- Register for a Blizzard Event.
+-- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
+-- Any arguments to the event will be passed on after that.
+-- @name AceEvent:RegisterEvent
+-- @class function
+-- @paramsig event[, callback [, arg]]
+-- @param event The event to register for
+-- @param callback The callback function to call when the event is triggered (funcref or method, defaults to a method with the event name)
+-- @param arg An optional argument to pass to the callback function
+
+--- Unregister an event.
+-- @name AceEvent:UnregisterEvent
+-- @class function
+-- @paramsig event
+-- @param event The event to unregister
+
+--- Register for a custom AceEvent-internal message.
+-- The callback will be called with the optional `arg` as the first argument (if supplied), and the event name as the second (or first, if no arg was supplied)
+-- Any arguments to the event will be passed on after that.
+-- @name AceEvent:RegisterMessage
+-- @class function
+-- @paramsig message[, callback [, arg]]
+-- @param message The message to register for
+-- @param callback The callback function to call when the message is triggered (funcref or method, defaults to a method with the event name)
+-- @param arg An optional argument to pass to the callback function
+
+--- Unregister a message
+-- @name AceEvent:UnregisterMessage
+-- @class function
+-- @paramsig message
+-- @param message The message to unregister
+
+--- Send a message over the AceEvent-3.0 internal message system to other addons registered for this message.
+-- @name AceEvent:SendMessage
+-- @class function
+-- @paramsig message, ...
+-- @param message The message to send
+-- @param ... Any arguments to the message
+
+
+-- Embeds AceEvent into the target object making the functions from the mixins list available on target:..
+-- @param target target object to embed AceEvent in
+function AceEvent:Embed(target)
+	for k, v in pairs(mixins) do
+		target[v] = self[v]
+	end
+	self.embeds[target] = true
+	return target
+end
+
+-- AceEvent:OnEmbedDisable( target )
+-- target (object) - target object that is being disabled
+--
+-- Unregister all events messages etc when the target disables.
+-- this method should be called by the target manually or by an addon framework
+function AceEvent:OnEmbedDisable(target)
+	target:UnregisterAllEvents()
+	target:UnregisterAllMessages()
+end
+
+-- Script to fire blizzard events into the event listeners
+local events = AceEvent.events
+AceEvent.frame:SetScript("OnEvent", function(this, event, ...)
+	events:Fire(event, ...)
+end)
+
+--- Finally: upgrade our old embeds
+for target, v in pairs(AceEvent.embeds) do
+	AceEvent:Embed(target)
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.xml
index c1c5214dc..dbe7d9933 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceEvent-3.0/AceEvent-3.0.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceEvent-3.0/AceEvent-3.0.xml	
@@ -1,4 +1,4 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-  <Script file="AceEvent-3.0.lua" />
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+  <Script file="AceEvent-3.0.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.lua
index 072ff8eaa..8ba6b3c9d 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.lua	
@@ -1,276 +1,276 @@
---- **AceTimer-3.0** provides a central facility for registering timers.
--- AceTimer supports one-shot timers and repeating timers. All timers are stored in an efficient
--- data structure that allows easy dispatching and fast rescheduling. Timers can be registered
--- or canceled at any time, even from within a running timer, without conflict or large overhead.\\
--- AceTimer is currently limited to firing timers at a frequency of 0.01s as this is what the WoW timer API
--- restricts us to.
---
--- All `:Schedule` functions will return a handle to the current timer, which you will need to store if you
--- need to cancel the timer you just registered.
---
--- **AceTimer-3.0** can be embeded into your addon, either explicitly by calling AceTimer:Embed(MyAddon) or by
--- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
--- and can be accessed directly, without having to explicitly call AceTimer itself.\\
--- It is recommended to embed AceTimer, otherwise you'll have to specify a custom `self` on all calls you
--- make into AceTimer.
--- @class file
--- @name AceTimer-3.0
--- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
-
-local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
-local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
-
-if not AceTimer then return end -- No upgrade needed
-AceTimer.activeTimers = AceTimer.activeTimers or {} -- Active timer list
-local activeTimers = AceTimer.activeTimers -- Upvalue our private data
-
--- Lua APIs
-local type, unpack, next, error, select = type, unpack, next, error, select
--- WoW APIs
-local GetTime, C_TimerAfter = GetTime, C_Timer.After
-
-local function new(self, loop, func, delay, ...)
-	if delay < 0.01 then
-		delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
-	end
-
-	local timer = {...}
-	timer.object = self
-	timer.func = func
-	timer.looping = loop
-	timer.argsCount = select("#", ...)
-	timer.delay = delay
-	timer.ends = GetTime() + delay
-
-	activeTimers[timer] = timer
-
-	-- Create new timer closure to wrap the "timer" object
-	timer.callback = function() 
-		if not timer.cancelled then
-			if type(timer.func) == "string" then
-				-- We manually set the unpack count to prevent issues with an arg set that contains nil and ends with nil
-				-- e.g. local t = {1, 2, nil, 3, nil} print(#t) will result in 2, instead of 5. This fixes said issue.
-				timer.object[timer.func](timer.object, unpack(timer, 1, timer.argsCount))
-			else
-				timer.func(unpack(timer, 1, timer.argsCount))
-			end
-
-			if timer.looping and not timer.cancelled then
-				-- Compensate delay to get a perfect average delay, even if individual times don't match up perfectly
-				-- due to fps differences
-				local time = GetTime()
-				local delay = timer.delay - (time - timer.ends)
-				-- Ensure the delay doesn't go below the threshold
-				if delay < 0.01 then delay = 0.01 end
-				C_TimerAfter(delay, timer.callback)
-				timer.ends = time + delay
-			else
-				activeTimers[timer.handle or timer] = nil
-			end
-		end
-	end
-
-	C_TimerAfter(delay, timer.callback)
-	return timer
-end
-
---- Schedule a new one-shot timer.
--- The timer will fire once in `delay` seconds, unless canceled before.
--- @param callback Callback function for the timer pulse (funcref or method name).
--- @param delay Delay for the timer, in seconds.
--- @param ... An optional, unlimited amount of arguments to pass to the callback function.
--- @usage
--- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
---
--- function MyAddOn:OnEnable()
---   self:ScheduleTimer("TimerFeedback", 5)
--- end
---
--- function MyAddOn:TimerFeedback()
---   print("5 seconds passed")
--- end
-function AceTimer:ScheduleTimer(func, delay, ...)
-	if not func or not delay then
-		error(MAJOR..": ScheduleTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
-	end
-	if type(func) == "string" then
-		if type(self) ~= "table" then
-			error(MAJOR..": ScheduleTimer(callback, delay, args...): 'self' - must be a table.", 2)
-		elseif not self[func] then
-			error(MAJOR..": ScheduleTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
-		end
-	end
-	return new(self, nil, func, delay, ...)
-end
-
---- Schedule a repeating timer.
--- The timer will fire every `delay` seconds, until canceled.
--- @param callback Callback function for the timer pulse (funcref or method name).
--- @param delay Delay for the timer, in seconds.
--- @param ... An optional, unlimited amount of arguments to pass to the callback function.
--- @usage
--- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
---
--- function MyAddOn:OnEnable()
---   self.timerCount = 0
---   self.testTimer = self:ScheduleRepeatingTimer("TimerFeedback", 5)
--- end
---
--- function MyAddOn:TimerFeedback()
---   self.timerCount = self.timerCount + 1
---   print(("%d seconds passed"):format(5 * self.timerCount))
---   -- run 30 seconds in total
---   if self.timerCount == 6 then
---     self:CancelTimer(self.testTimer)
---   end
--- end
-function AceTimer:ScheduleRepeatingTimer(func, delay, ...)
-	if not func or not delay then
-		error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
-	end
-	if type(func) == "string" then
-		if type(self) ~= "table" then
-			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'self' - must be a table.", 2)
-		elseif not self[func] then
-			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
-		end
-	end
-	return new(self, true, func, delay, ...)
-end
-
---- Cancels a timer with the given id, registered by the same addon object as used for `:ScheduleTimer`
--- Both one-shot and repeating timers can be canceled with this function, as long as the `id` is valid
--- and the timer has not fired yet or was canceled before.
--- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
-function AceTimer:CancelTimer(id)
-	local timer = activeTimers[id]
-
-	if not timer then
-		return false
-	else
-		timer.cancelled = true
-		activeTimers[id] = nil
-		return true
-	end
-end
-
---- Cancels all timers registered to the current addon object ('self')
-function AceTimer:CancelAllTimers()
-	for k,v in pairs(activeTimers) do
-		if v.object == self then
-			AceTimer.CancelTimer(self, k)
-		end
-	end
-end
-
---- Returns the time left for a timer with the given id, registered by the current addon object ('self').
--- This function will return 0 when the id is invalid.
--- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
--- @return The time left on the timer.
-function AceTimer:TimeLeft(id)
-	local timer = activeTimers[id]
-	if not timer then
-		return 0
-	else
-		return timer.ends - GetTime()
-	end
-end
-
-
--- ---------------------------------------------------------------------
--- Upgrading
-
--- Upgrade from old hash-bucket based timers to C_Timer.After timers.
-if oldminor and oldminor < 10 then
-	-- disable old timer logic
-	AceTimer.frame:SetScript("OnUpdate", nil)
-	AceTimer.frame:SetScript("OnEvent", nil)
-	AceTimer.frame:UnregisterAllEvents()
-	-- convert timers
-	for object,timers in pairs(AceTimer.selfs) do
-		for handle,timer in pairs(timers) do
-			if type(timer) == "table" and timer.callback then
-				local newTimer
-				if timer.delay then
-					newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.callback, timer.delay, timer.arg)
-				else
-					newTimer = AceTimer.ScheduleTimer(timer.object, timer.callback, timer.when - GetTime(), timer.arg)
-				end
-				-- Use the old handle for old timers
-				activeTimers[newTimer] = nil
-				activeTimers[handle] = newTimer
-				newTimer.handle = handle
-			end
-		end
-	end
-	AceTimer.selfs = nil
-	AceTimer.hash = nil
-	AceTimer.debug = nil
-elseif oldminor and oldminor < 17 then
-	-- Upgrade from old animation based timers to C_Timer.After timers.
-	AceTimer.inactiveTimers = nil
-	AceTimer.frame = nil
-	local oldTimers = AceTimer.activeTimers
-	-- Clear old timer table and update upvalue
-	AceTimer.activeTimers = {}
-	activeTimers = AceTimer.activeTimers
-	for handle, timer in pairs(oldTimers) do
-		local newTimer
-		-- Stop the old timer animation
-		local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
-		timer:GetParent():Stop()
-		if timer.looping then
-			newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.func, duration, unpack(timer.args, 1, timer.argsCount))
-		else
-			newTimer = AceTimer.ScheduleTimer(timer.object, timer.func, duration - elapsed, unpack(timer.args, 1, timer.argsCount))
-		end
-		-- Use the old handle for old timers
-		activeTimers[newTimer] = nil
-		activeTimers[handle] = newTimer
-		newTimer.handle = handle
-	end
-
-	-- Migrate transitional handles
-	if oldminor < 13 and AceTimer.hashCompatTable then
-		for handle, id in pairs(AceTimer.hashCompatTable) do
-			local t = activeTimers[id]
-			if t then
-				activeTimers[id] = nil
-				activeTimers[handle] = t
-				t.handle = handle
-			end
-		end
-		AceTimer.hashCompatTable = nil
-	end
-end
-
--- ---------------------------------------------------------------------
--- Embed handling
-
-AceTimer.embeds = AceTimer.embeds or {}
-
-local mixins = {
-	"ScheduleTimer", "ScheduleRepeatingTimer",
-	"CancelTimer", "CancelAllTimers",
-	"TimeLeft"
-}
-
-function AceTimer:Embed(target)
-	AceTimer.embeds[target] = true
-	for _,v in pairs(mixins) do
-		target[v] = AceTimer[v]
-	end
-	return target
-end
-
--- AceTimer:OnEmbedDisable(target)
--- target (object) - target object that AceTimer is embedded in.
---
--- cancel all timers registered for the object
-function AceTimer:OnEmbedDisable(target)
-	target:CancelAllTimers()
-end
-
-for addon in pairs(AceTimer.embeds) do
-	AceTimer:Embed(addon)
-end
+--- **AceTimer-3.0** provides a central facility for registering timers.
+-- AceTimer supports one-shot timers and repeating timers. All timers are stored in an efficient
+-- data structure that allows easy dispatching and fast rescheduling. Timers can be registered
+-- or canceled at any time, even from within a running timer, without conflict or large overhead.\\
+-- AceTimer is currently limited to firing timers at a frequency of 0.01s as this is what the WoW timer API
+-- restricts us to.
+--
+-- All `:Schedule` functions will return a handle to the current timer, which you will need to store if you
+-- need to cancel the timer you just registered.
+--
+-- **AceTimer-3.0** can be embeded into your addon, either explicitly by calling AceTimer:Embed(MyAddon) or by
+-- specifying it as an embeded library in your AceAddon. All functions will be available on your addon object
+-- and can be accessed directly, without having to explicitly call AceTimer itself.\\
+-- It is recommended to embed AceTimer, otherwise you'll have to specify a custom `self` on all calls you
+-- make into AceTimer.
+-- @class file
+-- @name AceTimer-3.0
+-- @release $Id: AceTimer-3.0.lua 1119 2014-10-14 17:23:29Z nevcairiel $
+
+local MAJOR, MINOR = "AceTimer-3.0", 17 -- Bump minor on changes
+local AceTimer, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
+
+if not AceTimer then return end -- No upgrade needed
+AceTimer.activeTimers = AceTimer.activeTimers or {} -- Active timer list
+local activeTimers = AceTimer.activeTimers -- Upvalue our private data
+
+-- Lua APIs
+local type, unpack, next, error, select = type, unpack, next, error, select
+-- WoW APIs
+local GetTime, C_TimerAfter = GetTime, C_Timer.After
+
+local function new(self, loop, func, delay, ...)
+	if delay < 0.01 then
+		delay = 0.01 -- Restrict to the lowest time that the C_Timer API allows us
+	end
+
+	local timer = {...}
+	timer.object = self
+	timer.func = func
+	timer.looping = loop
+	timer.argsCount = select("#", ...)
+	timer.delay = delay
+	timer.ends = GetTime() + delay
+
+	activeTimers[timer] = timer
+
+	-- Create new timer closure to wrap the "timer" object
+	timer.callback = function() 
+		if not timer.cancelled then
+			if type(timer.func) == "string" then
+				-- We manually set the unpack count to prevent issues with an arg set that contains nil and ends with nil
+				-- e.g. local t = {1, 2, nil, 3, nil} print(#t) will result in 2, instead of 5. This fixes said issue.
+				timer.object[timer.func](timer.object, unpack(timer, 1, timer.argsCount))
+			else
+				timer.func(unpack(timer, 1, timer.argsCount))
+			end
+
+			if timer.looping and not timer.cancelled then
+				-- Compensate delay to get a perfect average delay, even if individual times don't match up perfectly
+				-- due to fps differences
+				local time = GetTime()
+				local delay = timer.delay - (time - timer.ends)
+				-- Ensure the delay doesn't go below the threshold
+				if delay < 0.01 then delay = 0.01 end
+				C_TimerAfter(delay, timer.callback)
+				timer.ends = time + delay
+			else
+				activeTimers[timer.handle or timer] = nil
+			end
+		end
+	end
+
+	C_TimerAfter(delay, timer.callback)
+	return timer
+end
+
+--- Schedule a new one-shot timer.
+-- The timer will fire once in `delay` seconds, unless canceled before.
+-- @param callback Callback function for the timer pulse (funcref or method name).
+-- @param delay Delay for the timer, in seconds.
+-- @param ... An optional, unlimited amount of arguments to pass to the callback function.
+-- @usage
+-- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
+--
+-- function MyAddOn:OnEnable()
+--   self:ScheduleTimer("TimerFeedback", 5)
+-- end
+--
+-- function MyAddOn:TimerFeedback()
+--   print("5 seconds passed")
+-- end
+function AceTimer:ScheduleTimer(func, delay, ...)
+	if not func or not delay then
+		error(MAJOR..": ScheduleTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
+	end
+	if type(func) == "string" then
+		if type(self) ~= "table" then
+			error(MAJOR..": ScheduleTimer(callback, delay, args...): 'self' - must be a table.", 2)
+		elseif not self[func] then
+			error(MAJOR..": ScheduleTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
+		end
+	end
+	return new(self, nil, func, delay, ...)
+end
+
+--- Schedule a repeating timer.
+-- The timer will fire every `delay` seconds, until canceled.
+-- @param callback Callback function for the timer pulse (funcref or method name).
+-- @param delay Delay for the timer, in seconds.
+-- @param ... An optional, unlimited amount of arguments to pass to the callback function.
+-- @usage
+-- MyAddOn = LibStub("AceAddon-3.0"):NewAddon("MyAddOn", "AceTimer-3.0")
+--
+-- function MyAddOn:OnEnable()
+--   self.timerCount = 0
+--   self.testTimer = self:ScheduleRepeatingTimer("TimerFeedback", 5)
+-- end
+--
+-- function MyAddOn:TimerFeedback()
+--   self.timerCount = self.timerCount + 1
+--   print(("%d seconds passed"):format(5 * self.timerCount))
+--   -- run 30 seconds in total
+--   if self.timerCount == 6 then
+--     self:CancelTimer(self.testTimer)
+--   end
+-- end
+function AceTimer:ScheduleRepeatingTimer(func, delay, ...)
+	if not func or not delay then
+		error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'callback' and 'delay' must have set values.", 2)
+	end
+	if type(func) == "string" then
+		if type(self) ~= "table" then
+			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): 'self' - must be a table.", 2)
+		elseif not self[func] then
+			error(MAJOR..": ScheduleRepeatingTimer(callback, delay, args...): Tried to register '"..func.."' as the callback, but it doesn't exist in the module.", 2)
+		end
+	end
+	return new(self, true, func, delay, ...)
+end
+
+--- Cancels a timer with the given id, registered by the same addon object as used for `:ScheduleTimer`
+-- Both one-shot and repeating timers can be canceled with this function, as long as the `id` is valid
+-- and the timer has not fired yet or was canceled before.
+-- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
+function AceTimer:CancelTimer(id)
+	local timer = activeTimers[id]
+
+	if not timer then
+		return false
+	else
+		timer.cancelled = true
+		activeTimers[id] = nil
+		return true
+	end
+end
+
+--- Cancels all timers registered to the current addon object ('self')
+function AceTimer:CancelAllTimers()
+	for k,v in pairs(activeTimers) do
+		if v.object == self then
+			AceTimer.CancelTimer(self, k)
+		end
+	end
+end
+
+--- Returns the time left for a timer with the given id, registered by the current addon object ('self').
+-- This function will return 0 when the id is invalid.
+-- @param id The id of the timer, as returned by `:ScheduleTimer` or `:ScheduleRepeatingTimer`
+-- @return The time left on the timer.
+function AceTimer:TimeLeft(id)
+	local timer = activeTimers[id]
+	if not timer then
+		return 0
+	else
+		return timer.ends - GetTime()
+	end
+end
+
+
+-- ---------------------------------------------------------------------
+-- Upgrading
+
+-- Upgrade from old hash-bucket based timers to C_Timer.After timers.
+if oldminor and oldminor < 10 then
+	-- disable old timer logic
+	AceTimer.frame:SetScript("OnUpdate", nil)
+	AceTimer.frame:SetScript("OnEvent", nil)
+	AceTimer.frame:UnregisterAllEvents()
+	-- convert timers
+	for object,timers in pairs(AceTimer.selfs) do
+		for handle,timer in pairs(timers) do
+			if type(timer) == "table" and timer.callback then
+				local newTimer
+				if timer.delay then
+					newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.callback, timer.delay, timer.arg)
+				else
+					newTimer = AceTimer.ScheduleTimer(timer.object, timer.callback, timer.when - GetTime(), timer.arg)
+				end
+				-- Use the old handle for old timers
+				activeTimers[newTimer] = nil
+				activeTimers[handle] = newTimer
+				newTimer.handle = handle
+			end
+		end
+	end
+	AceTimer.selfs = nil
+	AceTimer.hash = nil
+	AceTimer.debug = nil
+elseif oldminor and oldminor < 17 then
+	-- Upgrade from old animation based timers to C_Timer.After timers.
+	AceTimer.inactiveTimers = nil
+	AceTimer.frame = nil
+	local oldTimers = AceTimer.activeTimers
+	-- Clear old timer table and update upvalue
+	AceTimer.activeTimers = {}
+	activeTimers = AceTimer.activeTimers
+	for handle, timer in pairs(oldTimers) do
+		local newTimer
+		-- Stop the old timer animation
+		local duration, elapsed = timer:GetDuration(), timer:GetElapsed()
+		timer:GetParent():Stop()
+		if timer.looping then
+			newTimer = AceTimer.ScheduleRepeatingTimer(timer.object, timer.func, duration, unpack(timer.args, 1, timer.argsCount))
+		else
+			newTimer = AceTimer.ScheduleTimer(timer.object, timer.func, duration - elapsed, unpack(timer.args, 1, timer.argsCount))
+		end
+		-- Use the old handle for old timers
+		activeTimers[newTimer] = nil
+		activeTimers[handle] = newTimer
+		newTimer.handle = handle
+	end
+
+	-- Migrate transitional handles
+	if oldminor < 13 and AceTimer.hashCompatTable then
+		for handle, id in pairs(AceTimer.hashCompatTable) do
+			local t = activeTimers[id]
+			if t then
+				activeTimers[id] = nil
+				activeTimers[handle] = t
+				t.handle = handle
+			end
+		end
+		AceTimer.hashCompatTable = nil
+	end
+end
+
+-- ---------------------------------------------------------------------
+-- Embed handling
+
+AceTimer.embeds = AceTimer.embeds or {}
+
+local mixins = {
+	"ScheduleTimer", "ScheduleRepeatingTimer",
+	"CancelTimer", "CancelAllTimers",
+	"TimeLeft"
+}
+
+function AceTimer:Embed(target)
+	AceTimer.embeds[target] = true
+	for _,v in pairs(mixins) do
+		target[v] = AceTimer[v]
+	end
+	return target
+end
+
+-- AceTimer:OnEmbedDisable(target)
+-- target (object) - target object that AceTimer is embedded in.
+--
+-- cancel all timers registered for the object
+function AceTimer:OnEmbedDisable(target)
+	target:CancelAllTimers()
+end
+
+for addon in pairs(AceTimer.embeds) do
+	AceTimer:Embed(addon)
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.xml
index 77fb196c7..be43d8ead 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/AceTimer-3.0/AceTimer-3.0.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/AceTimer-3.0/AceTimer-3.0.xml	
@@ -1,4 +1,4 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
-..\FrameXML\UI.xsd">
-  <Script file="AceTimer-3.0.lua" />
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+  <Script file="AceTimer-3.0.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/LibStub/LibStub.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/LibStub/LibStub.lua
similarity index 97%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/LibStub/LibStub.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/LibStub/LibStub.lua
index cfc97de71..0a41ac04d 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/LibStub/LibStub.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/LibStub/LibStub.lua	
@@ -1,30 +1,30 @@
--- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
--- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
-local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
-local LibStub = _G[LIBSTUB_MAJOR]
-
-if not LibStub or LibStub.minor < LIBSTUB_MINOR then
-	LibStub = LibStub or {libs = {}, minors = {} }
-	_G[LIBSTUB_MAJOR] = LibStub
-	LibStub.minor = LIBSTUB_MINOR
-	
-	function LibStub:NewLibrary(major, minor)
-		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
-		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
-		
-		local oldminor = self.minors[major]
-		if oldminor and oldminor >= minor then return nil end
-		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
-		return self.libs[major], oldminor
-	end
-	
-	function LibStub:GetLibrary(major, silent)
-		if not self.libs[major] and not silent then
-			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
-		end
-		return self.libs[major], self.minors[major]
-	end
-	
-	function LibStub:IterateLibraries() return pairs(self.libs) end
-	setmetatable(LibStub, { __call = LibStub.GetLibrary })
-end
+-- LibStub is a simple versioning stub meant for use in Libraries.  http://www.wowace.com/wiki/LibStub for more info
+-- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke
+local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2  -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS!
+local LibStub = _G[LIBSTUB_MAJOR]
+
+if not LibStub or LibStub.minor < LIBSTUB_MINOR then
+	LibStub = LibStub or {libs = {}, minors = {} }
+	_G[LIBSTUB_MAJOR] = LibStub
+	LibStub.minor = LIBSTUB_MINOR
+	
+	function LibStub:NewLibrary(major, minor)
+		assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
+		minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
+		
+		local oldminor = self.minors[major]
+		if oldminor and oldminor >= minor then return nil end
+		self.minors[major], self.libs[major] = minor, self.libs[major] or {}
+		return self.libs[major], oldminor
+	end
+	
+	function LibStub:GetLibrary(major, silent)
+		if not self.libs[major] and not silent then
+			error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
+		end
+		return self.libs[major], self.minors[major]
+	end
+	
+	function LibStub:IterateLibraries() return pairs(self.libs) end
+	setmetatable(LibStub, { __call = LibStub.GetLibrary })
+end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/json.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/json.lua
similarity index 95%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/json.lua
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/json.lua
index fd25af5d2..8bdc71440 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/Libs/json.lua
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Libs/json.lua	
@@ -1,382 +1,382 @@
-local json = LibStub:NewLibrary("json", 1)
-if not json then return end
-
---
--- json.lua
---
--- Copyright (c) 2015 rxi
---
--- This library is free software; you can redistribute it and/or modify it
--- under the terms of the MIT license. See LICENSE for details.
---
-
-
--------------------------------------------------------------------------------
--- Encode
--------------------------------------------------------------------------------
-
-local encode
-
-local escape_char_map = {
-  [ "\\" ] = "\\\\",
-  [ "\"" ] = "\\\"",
-  [ "\b" ] = "\\b",
-  [ "\f" ] = "\\f",
-  [ "\n" ] = "\\n",
-  [ "\r" ] = "\\r",
-  [ "\t" ] = "\\t",
-}
-
-local escape_char_map_inv = { [ "\\/" ] = "/" }
-for k, v in pairs(escape_char_map) do
-  escape_char_map_inv[v] = k
-end
-
-
-local function escape_char(c)
-  return escape_char_map[c] or string.format("\\u%04x", c:byte())
-end
-
-
-local function encode_nil(val)
-  return "null"
-end 
-
-
-local function encode_table(val, stack)
-  local res = {}
-  stack = stack or {}
-
-  -- Circular reference?
-  if stack[val] then error("circular reference") end
-
-  stack[val] = true
-
-  if val[1] ~= nil or next(val) == nil then
-    -- Treat as array -- check keys are valid and it is not sparse
-    local n = 0
-    for k in pairs(val) do
-      if type(k) ~= "number" then
-        error("invalid table: mixed or invalid key types")
-      end
-      n = n + 1
-    end
-    if n ~= #val then
-      error("invalid table: sparse array")
-    end
-    -- Encode
-    for i, v in ipairs(val) do
-      table.insert(res, encode(v, stack))
-    end
-    stack[val] = nil
-    return "[" .. table.concat(res, ",") .. "]"
-
-  else
-    -- Treat as an object
-    for k, v in pairs(val) do
-      if type(k) ~= "string" then
-        error("invalid table: mixed or invalid key types")
-      end
-      table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
-    end
-    stack[val] = nil
-    return "{" .. table.concat(res, ",") .. "}"
-  end
-end
-
-
-local function encode_string(val)
-  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
-end
-
-
-local function encode_number(val)
-  -- Check for NaN, -inf and inf
-  if val ~= val or val <= -math.huge or val >= math.huge then
-    error("unexpected number value '" .. tostring(val) .. "'")
-  end
-  return string.format("%.14g", val)
-end
-
-
-local type_func_map = {
-  [ "nil"     ] = encode_nil,
-  [ "table"   ] = encode_table,
-  [ "string"  ] = encode_string,
-  [ "number"  ] = encode_number,
-  [ "boolean" ] = tostring,
-}
-
-
-encode = function(val, stack)
-  local t = type(val)
-  local f = type_func_map[t]
-  if f then
-    return f(val, stack)
-  end
-  error("unexpected type '" .. t .. "'")
-end
-
-
-function json.encode(val)
-  return ( encode(val) )
-end
-
-
--------------------------------------------------------------------------------
--- Decode
--------------------------------------------------------------------------------
-
-local parse
-
-local function create_set(...) 
-  local res = {}
-  for i = 1, select("#", ...) do
-    res[ select(i, ...) ] = true
-  end
-  return res
-end
-
-local space_chars   = create_set(" ", "\t", "\r", "\n")
-local delim_chars   = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
-local escape_chars  = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
-local literals      = create_set("true", "false", "null")
-
-local literal_map = {
-  [ "true"  ] = true,
-  [ "false" ] = false,
-  [ "null"  ] = nil,
-}
-
-
-local function next_char(str, idx, set, negate)
-  for i = idx, #str do
-    if set[str:sub(i, i)] ~= negate then
-      return i
-    end
-  end
-  return #str + 1
-end
-
-
-local function decode_error(str, idx, msg)
-  local line_count = 1
-  local col_count = 1
-  for i = 1, idx - 1 do
-    col_count = col_count + 1
-    if str:sub(i, i) == "\n" then
-      line_count = line_count + 1
-      col_count = 1
-    end
-  end
-  error( string.format("%s at line %d col %d", msg, line_count, col_count) )
-end
-
-
-local function codepoint_to_utf8(n)
-  -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
-  local f = math.floor
-  if n <= 0x7f then
-    return string.char(n)
-  elseif n <= 0x7ff then
-    return string.char(f(n / 64) + 192, n % 64 + 128)
-  elseif n <= 0xffff then
-    return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
-  elseif n <= 0x10ffff then
-    return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
-                       f(n % 4096 / 64) + 128, n % 64 + 128)
-  end
-  error( string.format("invalid unicode codepoint '%x'", n) )
-end
-
-
-local function parse_unicode_escape(s)
-  local n1 = tonumber( s:sub(3, 6),  16 )
-  local n2 = tonumber( s:sub(9, 12), 16 )
-  -- Surrogate pair?
-  if n2 then
-    return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
-  else
-    return codepoint_to_utf8(n1)
-  end
-end
-
-
-local function parse_string(str, i)
-  local has_unicode_escape = false
-  local has_surrogate_escape = false
-  local has_escape = false
-  local last
-  for j = i + 1, #str do
-    local x = str:byte(j)
-
-    if x < 32 then
-      decode_error(str, j, "control character in string")
-    end
-
-    if last == 92 then -- "\\" (escape char)
-      if x == 117 then -- "u" (unicode escape sequence)
-        local hex = str:sub(j + 1, j + 5)
-        if not hex:find("%x%x%x%x") then
-          decode_error(str, j, "invalid unicode escape in string")
-        end
-        if hex:find("^[dD][89aAbB]") then
-          has_surrogate_escape = true
-        else
-          has_unicode_escape = true
-        end
-      else
-        local c = string.char(x)
-        if not escape_chars[c] then
-          decode_error(str, j, "invalid escape char '" .. c .. "' in string")
-        end
-        has_escape = true
-      end
-      last = nil
-
-    elseif x == 34 then -- '"' (end of string)
-      local s = str:sub(i + 1, j - 1)
-      if has_surrogate_escape then 
-        s = s:gsub("\\u[dD][89aAbB]..\\u....", parse_unicode_escape)
-      end
-      if has_unicode_escape then 
-        s = s:gsub("\\u....", parse_unicode_escape)
-      end
-      if has_escape then
-        s = s:gsub("\\.", escape_char_map_inv)
-      end
-      return s, j + 1
-    
-    else
-      last = x
-    end
-  end
-  decode_error(str, i, "expected closing quote for string")
-end
-
-
-local function parse_number(str, i)
-  local x = next_char(str, i, delim_chars)
-  local s = str:sub(i, x - 1)
-  local n = tonumber(s)
-  if not n then
-    decode_error(str, i, "invalid number '" .. s .. "'")
-  end
-  return n, x
-end
-
-
-local function parse_literal(str, i)
-  local x = next_char(str, i, delim_chars)
-  local word = str:sub(i, x - 1)
-  if not literals[word] then
-    decode_error(str, i, "invalid literal '" .. word .. "'")
-  end
-  return literal_map[word], x
-end
-
-
-local function parse_array(str, i)
-  local res = {}
-  local n = 1
-  i = i + 1
-  while 1 do
-    local x
-    i = next_char(str, i, space_chars, true)
-    -- Empty / end of array?
-    if str:sub(i, i) == "]" then 
-      i = i + 1
-      break
-    end
-    -- Read token
-    x, i = parse(str, i)
-    res[n] = x
-    n = n + 1
-    -- Next token 
-    i = next_char(str, i, space_chars, true)
-    local chr = str:sub(i, i)
-    i = i + 1
-    if chr == "]" then break end
-    if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
-  end
-  return res, i
-end
-
-
-local function parse_object(str, i)
-  local res = {}
-  i = i + 1
-  while 1 do
-    local key, val
-    i = next_char(str, i, space_chars, true)
-    -- Empty / end of object?
-    if str:sub(i, i) == "}" then 
-      i = i + 1
-      break
-    end
-    -- Read key
-    if str:sub(i, i) ~= '"' then
-      decode_error(str, i, "expected string for key")
-    end
-    key, i = parse(str, i)
-    -- Read ':' delimiter
-    i = next_char(str, i, space_chars, true)
-    if str:sub(i, i) ~= ":" then
-      decode_error(str, i, "expected ':' after key")
-    end
-    i = next_char(str, i + 1, space_chars, true)
-    -- Read value
-    val, i = parse(str, i)
-    -- Set
-    res[key] = val
-    -- Next token
-    i = next_char(str, i, space_chars, true)
-    local chr = str:sub(i, i)
-    i = i + 1
-    if chr == "}" then break end
-    if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
-  end
-  return res, i
-end
-
-
-local char_func_map = {
-  [ '"' ] = parse_string,
-  [ "0" ] = parse_number,
-  [ "1" ] = parse_number,
-  [ "2" ] = parse_number,
-  [ "3" ] = parse_number,
-  [ "4" ] = parse_number,
-  [ "5" ] = parse_number,
-  [ "6" ] = parse_number,
-  [ "7" ] = parse_number,
-  [ "8" ] = parse_number,
-  [ "9" ] = parse_number,
-  [ "-" ] = parse_number,
-  [ "t" ] = parse_literal,
-  [ "f" ] = parse_literal,
-  [ "n" ] = parse_literal,
-  [ "[" ] = parse_array,
-  [ "{" ] = parse_object,
-}
-
-
-parse = function(str, idx)
-  local chr = str:sub(idx, idx)
-  local f = char_func_map[chr]
-  if f then
-    return f(str, idx)
-  end
-  decode_error(str, idx, "unexpected character '" .. chr .. "'")
-end
-
-
-function json.decode(str)
-  if type(str) ~= "string" then
-    error("expected argument of type string, got " .. type(str))
-  end
-  return ( parse(str, next_char(str, 1, space_chars, true)) )
-end
-
-
+local json = LibStub:NewLibrary("json", 1)
+if not json then return end
+
+--
+-- json.lua
+--
+-- Copyright (c) 2015 rxi
+--
+-- This library is free software; you can redistribute it and/or modify it
+-- under the terms of the MIT license. See LICENSE for details.
+--
+
+
+-------------------------------------------------------------------------------
+-- Encode
+-------------------------------------------------------------------------------
+
+local encode
+
+local escape_char_map = {
+  [ "\\" ] = "\\\\",
+  [ "\"" ] = "\\\"",
+  [ "\b" ] = "\\b",
+  [ "\f" ] = "\\f",
+  [ "\n" ] = "\\n",
+  [ "\r" ] = "\\r",
+  [ "\t" ] = "\\t",
+}
+
+local escape_char_map_inv = { [ "\\/" ] = "/" }
+for k, v in pairs(escape_char_map) do
+  escape_char_map_inv[v] = k
+end
+
+
+local function escape_char(c)
+  return escape_char_map[c] or string.format("\\u%04x", c:byte())
+end
+
+
+local function encode_nil(val)
+  return "null"
+end 
+
+
+local function encode_table(val, stack)
+  local res = {}
+  stack = stack or {}
+
+  -- Circular reference?
+  if stack[val] then error("circular reference") end
+
+  stack[val] = true
+
+  if val[1] ~= nil or next(val) == nil then
+    -- Treat as array -- check keys are valid and it is not sparse
+    local n = 0
+    for k in pairs(val) do
+      if type(k) ~= "number" then
+        error("invalid table: mixed or invalid key types")
+      end
+      n = n + 1
+    end
+    if n ~= #val then
+      error("invalid table: sparse array")
+    end
+    -- Encode
+    for i, v in ipairs(val) do
+      table.insert(res, encode(v, stack))
+    end
+    stack[val] = nil
+    return "[" .. table.concat(res, ",") .. "]"
+
+  else
+    -- Treat as an object
+    for k, v in pairs(val) do
+      if type(k) ~= "string" then
+        error("invalid table: mixed or invalid key types")
+      end
+      table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
+    end
+    stack[val] = nil
+    return "{" .. table.concat(res, ",") .. "}"
+  end
+end
+
+
+local function encode_string(val)
+  return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+end
+
+
+local function encode_number(val)
+  -- Check for NaN, -inf and inf
+  if val ~= val or val <= -math.huge or val >= math.huge then
+    error("unexpected number value '" .. tostring(val) .. "'")
+  end
+  return string.format("%.14g", val)
+end
+
+
+local type_func_map = {
+  [ "nil"     ] = encode_nil,
+  [ "table"   ] = encode_table,
+  [ "string"  ] = encode_string,
+  [ "number"  ] = encode_number,
+  [ "boolean" ] = tostring,
+}
+
+
+encode = function(val, stack)
+  local t = type(val)
+  local f = type_func_map[t]
+  if f then
+    return f(val, stack)
+  end
+  error("unexpected type '" .. t .. "'")
+end
+
+
+function json.encode(val)
+  return ( encode(val) )
+end
+
+
+-------------------------------------------------------------------------------
+-- Decode
+-------------------------------------------------------------------------------
+
+local parse
+
+local function create_set(...) 
+  local res = {}
+  for i = 1, select("#", ...) do
+    res[ select(i, ...) ] = true
+  end
+  return res
+end
+
+local space_chars   = create_set(" ", "\t", "\r", "\n")
+local delim_chars   = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
+local escape_chars  = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
+local literals      = create_set("true", "false", "null")
+
+local literal_map = {
+  [ "true"  ] = true,
+  [ "false" ] = false,
+  [ "null"  ] = nil,
+}
+
+
+local function next_char(str, idx, set, negate)
+  for i = idx, #str do
+    if set[str:sub(i, i)] ~= negate then
+      return i
+    end
+  end
+  return #str + 1
+end
+
+
+local function decode_error(str, idx, msg)
+  local line_count = 1
+  local col_count = 1
+  for i = 1, idx - 1 do
+    col_count = col_count + 1
+    if str:sub(i, i) == "\n" then
+      line_count = line_count + 1
+      col_count = 1
+    end
+  end
+  error( string.format("%s at line %d col %d", msg, line_count, col_count) )
+end
+
+
+local function codepoint_to_utf8(n)
+  -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
+  local f = math.floor
+  if n <= 0x7f then
+    return string.char(n)
+  elseif n <= 0x7ff then
+    return string.char(f(n / 64) + 192, n % 64 + 128)
+  elseif n <= 0xffff then
+    return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
+  elseif n <= 0x10ffff then
+    return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
+                       f(n % 4096 / 64) + 128, n % 64 + 128)
+  end
+  error( string.format("invalid unicode codepoint '%x'", n) )
+end
+
+
+local function parse_unicode_escape(s)
+  local n1 = tonumber( s:sub(3, 6),  16 )
+  local n2 = tonumber( s:sub(9, 12), 16 )
+  -- Surrogate pair?
+  if n2 then
+    return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
+  else
+    return codepoint_to_utf8(n1)
+  end
+end
+
+
+local function parse_string(str, i)
+  local has_unicode_escape = false
+  local has_surrogate_escape = false
+  local has_escape = false
+  local last
+  for j = i + 1, #str do
+    local x = str:byte(j)
+
+    if x < 32 then
+      decode_error(str, j, "control character in string")
+    end
+
+    if last == 92 then -- "\\" (escape char)
+      if x == 117 then -- "u" (unicode escape sequence)
+        local hex = str:sub(j + 1, j + 5)
+        if not hex:find("%x%x%x%x") then
+          decode_error(str, j, "invalid unicode escape in string")
+        end
+        if hex:find("^[dD][89aAbB]") then
+          has_surrogate_escape = true
+        else
+          has_unicode_escape = true
+        end
+      else
+        local c = string.char(x)
+        if not escape_chars[c] then
+          decode_error(str, j, "invalid escape char '" .. c .. "' in string")
+        end
+        has_escape = true
+      end
+      last = nil
+
+    elseif x == 34 then -- '"' (end of string)
+      local s = str:sub(i + 1, j - 1)
+      if has_surrogate_escape then 
+        s = s:gsub("\\u[dD][89aAbB]..\\u....", parse_unicode_escape)
+      end
+      if has_unicode_escape then 
+        s = s:gsub("\\u....", parse_unicode_escape)
+      end
+      if has_escape then
+        s = s:gsub("\\.", escape_char_map_inv)
+      end
+      return s, j + 1
+    
+    else
+      last = x
+    end
+  end
+  decode_error(str, i, "expected closing quote for string")
+end
+
+
+local function parse_number(str, i)
+  local x = next_char(str, i, delim_chars)
+  local s = str:sub(i, x - 1)
+  local n = tonumber(s)
+  if not n then
+    decode_error(str, i, "invalid number '" .. s .. "'")
+  end
+  return n, x
+end
+
+
+local function parse_literal(str, i)
+  local x = next_char(str, i, delim_chars)
+  local word = str:sub(i, x - 1)
+  if not literals[word] then
+    decode_error(str, i, "invalid literal '" .. word .. "'")
+  end
+  return literal_map[word], x
+end
+
+
+local function parse_array(str, i)
+  local res = {}
+  local n = 1
+  i = i + 1
+  while 1 do
+    local x
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of array?
+    if str:sub(i, i) == "]" then 
+      i = i + 1
+      break
+    end
+    -- Read token
+    x, i = parse(str, i)
+    res[n] = x
+    n = n + 1
+    -- Next token 
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "]" then break end
+    if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
+  end
+  return res, i
+end
+
+
+local function parse_object(str, i)
+  local res = {}
+  i = i + 1
+  while 1 do
+    local key, val
+    i = next_char(str, i, space_chars, true)
+    -- Empty / end of object?
+    if str:sub(i, i) == "}" then 
+      i = i + 1
+      break
+    end
+    -- Read key
+    if str:sub(i, i) ~= '"' then
+      decode_error(str, i, "expected string for key")
+    end
+    key, i = parse(str, i)
+    -- Read ':' delimiter
+    i = next_char(str, i, space_chars, true)
+    if str:sub(i, i) ~= ":" then
+      decode_error(str, i, "expected ':' after key")
+    end
+    i = next_char(str, i + 1, space_chars, true)
+    -- Read value
+    val, i = parse(str, i)
+    -- Set
+    res[key] = val
+    -- Next token
+    i = next_char(str, i, space_chars, true)
+    local chr = str:sub(i, i)
+    i = i + 1
+    if chr == "}" then break end
+    if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
+  end
+  return res, i
+end
+
+
+local char_func_map = {
+  [ '"' ] = parse_string,
+  [ "0" ] = parse_number,
+  [ "1" ] = parse_number,
+  [ "2" ] = parse_number,
+  [ "3" ] = parse_number,
+  [ "4" ] = parse_number,
+  [ "5" ] = parse_number,
+  [ "6" ] = parse_number,
+  [ "7" ] = parse_number,
+  [ "8" ] = parse_number,
+  [ "9" ] = parse_number,
+  [ "-" ] = parse_number,
+  [ "t" ] = parse_literal,
+  [ "f" ] = parse_literal,
+  [ "n" ] = parse_literal,
+  [ "[" ] = parse_array,
+  [ "{" ] = parse_object,
+}
+
+
+parse = function(str, idx)
+  local chr = str:sub(idx, idx)
+  local f = char_func_map[chr]
+  if f then
+    return f(str, idx)
+  end
+  decode_error(str, idx, "unexpected character '" .. chr .. "'")
+end
+
+
+function json.decode(str)
+  if type(str) ~= "string" then
+    error("expected argument of type string, got " .. type(str))
+  end
+  return ( parse(str, next_char(str, 1, space_chars, true)) )
+end
+
+
 return json
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/embeds.xml b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/embeds.xml
similarity index 98%
rename from Artemis/Artemis/Modules/Games/WoW/Resources/Addon/embeds.xml
rename to Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/embeds.xml
index 781538970..36826abe0 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon/embeds.xml
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/embeds.xml	
@@ -1,9 +1,9 @@
-<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
-  <Script file="Libs\LibStub\LibStub.lua" />
-  <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml" />
-  <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml" />
-  <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
-  <Include file="Libs\AceTimer-3.0\AceTimer-3.0.xml" />
-  <Include file="Libs\AceComm-3.0\AceComm-3.0.xml" />
-  <Include file="Libs\json.lua" />
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+  <Script file="Libs\LibStub\LibStub.lua" />
+  <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml" />
+  <Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml" />
+  <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
+  <Include file="Libs\AceTimer-3.0\AceTimer-3.0.xml" />
+  <Include file="Libs\AceComm-3.0\AceComm-3.0.xml" />
+  <Include file="Libs\json.lua" />
 </Ui>
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip b/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip
new file mode 100644
index 0000000000000000000000000000000000000000..70d820a9ada4cda8ae87fa2abd783737ca313b96
GIT binary patch
literal 33708
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
F{{sndJTU+O

literal 0
HcmV?d00001

diff --git a/Artemis/Artemis/Modules/Games/WoW/WoWModel.cs b/Artemis/Artemis/Modules/Games/WoW/WoWModel.cs
index 8c95e8652..f3a53d9d9 100644
--- a/Artemis/Artemis/Modules/Games/WoW/WoWModel.cs
+++ b/Artemis/Artemis/Modules/Games/WoW/WoWModel.cs
@@ -2,22 +2,37 @@
 using Artemis.Managers;
 using Artemis.Modules.Abstract;
 using Artemis.Modules.Games.WoW.Models;
+using Artemis.Properties;
+using Artemis.Services;
+using Artemis.Utilities;
+using Microsoft.Win32;
 using Newtonsoft.Json.Linq;
+using System.IO;
+using System.IO.Compression;
 
 namespace Artemis.Modules.Games.WoW
 {
     public class WoWModel : ModuleModel
     {
+        private readonly MetroDialogService _dialogService;
         private readonly WowPacketScanner _packetScanner;
 
-        public WoWModel(DeviceManager deviceManager, LuaManager luaManager, WowPacketScanner packetScanner) : base(deviceManager, luaManager)
+        public WoWModel(DeviceManager deviceManager, LuaManager luaManager, WowPacketScanner packetScanner, MetroDialogService dialogService) : base(deviceManager, luaManager)
         {
             Settings = SettingsProvider.Load<WoWSettings>();
             DataModel = new WoWDataModel();
             ProcessNames.Add("Wow-64");
 
             _packetScanner = packetScanner;
+            _dialogService = dialogService;
             _packetScanner.RaiseDataReceived += (sender, args) => HandleGameData(args.Command, args.Data);
+
+            FindWoW();
+
+            // I simply cannot be sure wether this addon will bring people's accounts in trouble so
+            // lets remove it whenever Artemis isn't running the WoW module.
+            // (This also means the addon isnt left behind should the user uninstall Artemis.)
+            RemoveAddon();
         }
 
         public override string Name => "WoW";
@@ -26,12 +41,14 @@ namespace Artemis.Modules.Games.WoW
 
         public override void Enable()
         {
+            PlaceAddon();
             _packetScanner.Start();
             base.Enable();
         }
 
         public override void Dispose()
         {
+            RemoveAddon();
             _packetScanner.Stop();
             base.Dispose();
         }
@@ -44,6 +61,67 @@ namespace Artemis.Modules.Games.WoW
             dataModel.Target.Update();
         }
 
+        public void FindWoW()
+        {
+            var gameSettings = Settings as WoWSettings;
+            if (gameSettings == null)
+                return;
+
+            // If already propertly set up, don't do anything
+            if (gameSettings.GameDirectory != null && File.Exists(gameSettings.GameDirectory + @"\Wow.exe"))
+                return;
+
+            var key = Registry.LocalMachine.OpenSubKey(
+                @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\World of Warcraft");
+            var path = key?.GetValue("DisplayIcon")?.ToString();
+            if (string.IsNullOrEmpty(path) || !File.Exists(path))
+                return;
+
+            gameSettings.GameDirectory = path.Substring(0, path.Length - 8);
+            gameSettings.Save();
+        }
+
+        public void ChangeDirectory(string directory, bool checkExe)
+        {
+            var settings = (WoWSettings) Settings;
+            if (checkExe && !File.Exists(directory + @"\Wow.exe"))
+            {
+                _dialogService.ShowErrorMessageBox("Please select a valid WoW directory\n\n" +
+                                                   @"By default WoW is in C:\Program Files (x86)\World of Warcraft");
+
+                settings.GameDirectory = string.Empty;
+                settings.Save();
+                return;
+            }
+            settings.GameDirectory = directory;
+            settings.Save();
+        }
+
+        public void PlaceAddon()
+        {
+            var settings = (WoWSettings) Settings;
+            var path = settings.GameDirectory;
+
+            if (!File.Exists(path + @"\Wow.exe"))
+                return;
+
+            // Load the ZIP from resources
+            using (var stream = new MemoryStream(Resources.wow_addon))
+            {
+                using (var archive = new ZipArchive(stream))
+                {
+                    archive.ExtractToDirectory(settings.GameDirectory + @"\Interface\Addons\Artemis", true);
+                }
+            }
+        }
+
+        public void RemoveAddon()
+        {
+            var settings = (WoWSettings) Settings;
+            if (Directory.Exists(settings.GameDirectory + @"\Interface\Addons\Artemis"))
+                Directory.Delete(settings.GameDirectory + @"\Interface\Addons\Artemis", true);
+        }
+
         private void HandleGameData(string command, string data)
         {
             JToken json = null;
@@ -180,4 +258,4 @@ namespace Artemis.Modules.Games.WoW
                 dataModel.Target.CastBar.Clear();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Artemis/Artemis/Modules/Games/WoW/WoWSettings.cs b/Artemis/Artemis/Modules/Games/WoW/WoWSettings.cs
index c4a3f3b5d..524fdac66 100644
--- a/Artemis/Artemis/Modules/Games/WoW/WoWSettings.cs
+++ b/Artemis/Artemis/Modules/Games/WoW/WoWSettings.cs
@@ -4,5 +4,6 @@ namespace Artemis.Modules.Games.WoW
 {
     public class WoWSettings : ModuleSettings
     {
+        public string GameDirectory { get; set; }
     }
 }
diff --git a/Artemis/Artemis/Modules/Games/WoW/WoWView.xaml b/Artemis/Artemis/Modules/Games/WoW/WoWView.xaml
index 032a99375..78ef8d991 100644
--- a/Artemis/Artemis/Modules/Games/WoW/WoWView.xaml
+++ b/Artemis/Artemis/Modules/Games/WoW/WoWView.xaml
@@ -7,6 +7,7 @@
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -32,11 +33,20 @@
                 Style="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" ToolTip="Note: You can't enable an module when Artemis is disabled" />
         </StackPanel>
 
+        <!-- Game directory -->
+        <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,1,0">
+            <Label FontSize="20" HorizontalAlignment="Left" Content="World of Warcraft directory" />
+            <Grid>
+                <TextBox x:Name="GameDirectory" Height="23" TextWrapping="Wrap" Margin="0,0,30,0" Text="{Binding Path=Settings.GameDirectory, Mode=TwoWay}" cal:Message.Attach="[Event LostFocus] = [Action PlaceAddon]" />
+                <Button x:Name="BrowseDirectory" Content="..." RenderTransformOrigin="-0.039,-0.944" HorizontalAlignment="Right" Width="25" Style="{DynamicResource SquareButtonStyle}" Height="26" />
+            </Grid>
+        </StackPanel>
+
         <!-- Profile editor -->
-        <ContentControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" />
+        <ContentControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" />
 
         <!-- Buttons -->
-        <StackPanel Grid.Column="0" Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Bottom">
+        <StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Bottom">
             <Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100" Style="{DynamicResource SquareButtonStyle}" />
             <Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100" Margin="10,0,0,0" Style="{DynamicResource SquareButtonStyle}" />
         </StackPanel>
diff --git a/Artemis/Artemis/Modules/Games/WoW/WoWViewModel.cs b/Artemis/Artemis/Modules/Games/WoW/WoWViewModel.cs
index 5978f88c2..1aca250f2 100644
--- a/Artemis/Artemis/Modules/Games/WoW/WoWViewModel.cs
+++ b/Artemis/Artemis/Modules/Games/WoW/WoWViewModel.cs
@@ -1,4 +1,5 @@
-using Artemis.Managers;
+using System.Windows.Forms;
+using Artemis.Managers;
 using Artemis.Modules.Abstract;
 using Ninject;
 
@@ -13,5 +14,23 @@ namespace Artemis.Modules.Games.WoW
         }
 
         public override bool UsesProfileEditor => true;
+
+        public void PlaceAddon()
+        {
+            ((WoWModel) ModuleModel).PlaceAddon();
+        }
+
+        public void BrowseDirectory()
+        {
+            var dialog = new FolderBrowserDialog {SelectedPath = ((WoWSettings) Settings).GameDirectory};
+            var result = dialog.ShowDialog();
+            if (result != DialogResult.OK)
+                return;
+
+            ((WoWSettings) Settings).GameDirectory = dialog.SelectedPath;
+            ((WoWModel) ModuleModel).PlaceAddon();
+            Settings.Save();
+            NotifyOfPropertyChange(() => Settings);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Artemis/Artemis/Properties/Resources.Designer.cs b/Artemis/Artemis/Properties/Resources.Designer.cs
index 2ae2a31ad..be17825d8 100644
--- a/Artemis/Artemis/Properties/Resources.Designer.cs
+++ b/Artemis/Artemis/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Artemis.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -105,6 +105,7 @@ namespace Artemis.Properties {
         ///{
         /// &quot;uri&quot; &quot;http://localhost:{{port}}/csgo_game_event&quot;
         /// &quot;timeout&quot; &quot;0.1&quot;
+        /// &quot;heartbeat&quot; &quot;0.1&quot;
         /// &quot;data&quot;
         /// {
         ///   &quot;provider&quot;            &quot;1&quot;
@@ -437,5 +438,15 @@ namespace Artemis.Properties {
                 return ((byte[])(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] wow_addon {
+            get {
+                object obj = ResourceManager.GetObject("wow_addon", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }
diff --git a/Artemis/Artemis/Properties/Resources.resx b/Artemis/Artemis/Properties/Resources.resx
index fa4d5de48..529de8e53 100644
--- a/Artemis/Artemis/Properties/Resources.resx
+++ b/Artemis/Artemis/Properties/Resources.resx
@@ -223,4 +223,7 @@
   <data name="k95_platinum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Keyboards\k95-platinum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="wow_addon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Modules\Games\WoW\Resources\wow-addon.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index e12bb7f35..451475e77 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -4,10 +4,10 @@
   <package id="Caliburn.Micro" version="3.1.0" targetFramework="net461" />
   <package id="Caliburn.Micro.Core" version="3.1.0" targetFramework="net461" />
   <package id="Colore" version="5.1.0" targetFramework="net461" />
-  <package id="CSCore" version="1.2.1.1" targetFramework="net461" />
+  <package id="CSCore" version="1.2.1.2" targetFramework="net461" />
   <package id="CUE.NET" version="1.1.3.1" targetFramework="net461" />
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net461" />
-  <package id="DynamicExpresso.Core" version="1.3.3.6" targetFramework="net461" />
+  <package id="DynamicExpresso.Core" version="1.3.4.7" targetFramework="net461" />
   <package id="gong-wpf-dragdrop" version="0.1.4.3" targetFramework="net461" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net461" />
@@ -28,7 +28,7 @@
   <package id="SharpDX" version="4.0.1" targetFramework="net461" />
   <package id="SharpDX.Direct3D9" version="4.0.1" targetFramework="net461" />
   <package id="Splat" version="2.0.0" targetFramework="net461" />
-  <package id="SpotifyAPI-NET" version="2.16.0" targetFramework="net461" />
+  <package id="SpotifyAPI-NET" version="2.16.1" targetFramework="net461" />
   <package id="squirrel.windows" version="1.4.4" targetFramework="net461" />
   <package id="WpfExceptionViewer" version="1.0.0.0" targetFramework="net452" />
 </packages>
\ No newline at end of file