# HG changeset patch
# User Nenue
# Date 1531853539 14400
# Node ID 283dacee2850ec3251b5a76d2613532112721d54
# Parent  b80e78f4a17b52e72d0cf98b275f898ab1ef0f4d# Parent  1407e3a2cd1f260435e57c790f71cc7ad1438511
Merge

diff -r 1407e3a2cd1f -r 283dacee2850 ActionTemplates.lua
--- a/ActionTemplates.lua	Sun May 28 12:46:08 2017 -0400
+++ b/ActionTemplates.lua	Tue Jul 17 14:52:19 2018 -0400
@@ -501,6 +501,7 @@
     end
   end
 
+--[[
   for row = 1, MAX_PVP_TALENT_TIERS do
     for col = 1, MAX_PVP_TALENT_COLUMNS do
       local talentID, talentName, icon, selected, available, spellID, unlocked = GetPvpTalentInfo(row, col, 1)
@@ -509,6 +510,7 @@
       end
     end
   end
+  --]]
 
   local numTabs = GetNumSpellTabs()
   for i = 1, numTabs do
diff -r 1407e3a2cd1f -r 283dacee2850 KeyButton.lua
--- a/KeyButton.lua	Sun May 28 12:46:08 2017 -0400
+++ b/KeyButton.lua	Tue Jul 17 14:52:19 2018 -0400
@@ -210,8 +210,6 @@
         name = TALENT_SPELLS[actionID].actionName
         actionID  = TALENT_SPELLS[actionID].actionID
         icon = TALENT_SPELLS[actionID].icon
-      end
-
     elseif actionType == 'macro' then
       name, icon, macroText = GetMacroInfo(actionID)
       macroName = name
diff -r 1407e3a2cd1f -r 283dacee2850 SkeletonKey.toc
--- a/SkeletonKey.toc	Sun May 28 12:46:08 2017 -0400
+++ b/SkeletonKey.toc	Tue Jul 17 14:52:19 2018 -0400
@@ -1,4 +1,4 @@
-## Interface: 70100
+## Interface: 80000
 ## Title: SkeletonKey
 ## Notes: Key Bindings for dinosaurs
 ## Author: Krakyn
@@ -10,4 +10,4 @@
 ## OptionalDeps: Devian
 
 SkeletonKey.xml
-SystemBindings.xml
\ No newline at end of file
+##SystemBindings.xml
\ No newline at end of file
diff -r 1407e3a2cd1f -r 283dacee2850 SkeletonKey.xml
--- a/SkeletonKey.xml	Sun May 28 12:46:08 2017 -0400
+++ b/SkeletonKey.xml	Tue Jul 17 14:52:19 2018 -0400
@@ -24,11 +24,11 @@
       <OnLoad method="OnLoad" />
       <OnEvent method="OnEvent" />
       <OnShow method="OnShow" />
-      <OnUpdate method="OnUpdate" />
+      <!--<OnUpdate method="OnUpdate" />-->
       <OnKeyDown method="OnKeyDown" />
       <OnKeyUp method="OnKeyUp" />
-      <OnMouseDown method="OnMouseDown" />
-      <OnMouseUp method="OnMouseUp" />
+      <!--<OnMouseDown method="OnMouseDown" />
+      <OnMouseUp method="OnMouseUp" />-->
       <OnMouseWheel method="OnMouseWheel" />
       <OnDragStart method="OnDragStart" />
       <OnDragStop method="OnDragStop" />
@@ -142,7 +142,7 @@
           <OnEvent method="OnEvent" />
         </Scripts>
       </Frame>
-
+<!--
       <Frame name="KeyBinderTutorial" parent="KeyBinder">
 
         <Size x="20" y="20" />
@@ -159,7 +159,7 @@
               </Anchors>
               <TexCoords left="0.0019531" right="0.1484375" top="0.4257813" bottom="0.6210938"/>
             </Texture>
-            <FontString inherits="KTLogString" text="to change a key binding.">
+            <FontString inherits="SkeletonKeyButtonFont" text="to change a key binding.">
               <Anchors>
                 <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeTo="$parentMouseLeftClick" x="2" y="0" />
               </Anchors>
@@ -172,7 +172,7 @@
               </Anchors>
               <TexCoords left="0.0019531" right="0.1484375" top="0.6269531" bottom="0.8222656"/>
             </Texture>
-            <FontString inherits="KTLogString" text="to remove actions from profile.">
+            <FontString inherits="SkeletonKeyButtonFont" text="to remove actions from profile.">
               <Anchors>
                 <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeTo="$parentMouseRightClick" x="2" y="0" />
               </Anchors>
@@ -180,7 +180,7 @@
 
           </Layer>
         </Layers>
-      </Frame>
+      </Frame>-->
 
       <Button inherits="UIPanelCloseButton" parentKey="CloseButton">
         <Anchors>
@@ -193,7 +193,7 @@
         <Size  y="32" x="32" />
         <Layers>
           <Layer level="OVERLAY">
-            <FontString parentKey="header" inherits="KTLogString" text="Sticky Mode:" />
+            <FontString parentKey="header" inherits="SkeletonKeyButtonFont" text="Sticky Mode:" />
           </Layer>
         </Layers>
       </CheckButton>
@@ -205,7 +205,7 @@
         </Anchors>
         <Layers>
           <Layer level="OVERLAY">
-            <FontString parentKey="header" inherits="KTLogString" text="Bind" />
+            <FontString parentKey="header" inherits="SkeletonKeyButtonFont" text="Bind" />
             <FontString inherits="SkeletonKeyHeaderFont" text="Settings">
               <Anchors>
                 <Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT" x="0" y="32" />
@@ -222,7 +222,7 @@
         </Anchors>
         <Layers>
           <Layer level="OVERLAY">
-            <FontString parentKey="header" inherits="KTLogString" text="Safe" />
+            <FontString parentKey="header" inherits="SkeletonKeyButtonFont" text="Safe" />
           </Layer>
         </Layers>
       </CheckButton>
@@ -329,7 +329,7 @@
     <Scripts>
       <OnLoad method="OnLoad" />
       <OnShow method="OnShow" />
-      <OnEvent method="OnEvent" />
+      <!--<OnEvent method="OnEvent" />-->
     </Scripts>
     <Layers>
       <Layer level="BACKGROUND">
@@ -391,8 +391,10 @@
       </Button>
     </Frames>
   </Frame>
+
+  <!--
   <Frame name="$parentSystemBindings" mixin="SkeletonKeySystemBindingsMixin" inherits="SkeletonKeyPanelTemplate" />
-
+-->
   <Button name="SkeletonKeyTabTemplate" parentArray="tabButtons" virtual="true">
     <Size x="48" y="32" />
     <Layers>