diff --git a/TCC.Core/R.cs b/TCC.Core/R.cs index a748e7f0..a00e8802 100644 --- a/TCC.Core/R.cs +++ b/TCC.Core/R.cs @@ -549,126 +549,126 @@ public static class TemplateSelectors // pack://application:,,,/Nostrum;component/Resources/Converters.xaml public static class Nostrum_Converters { - public static FactorToAngleConverter FactorToAngle => ((FactorToAngleConverter)App.Current.FindResource("FactorToAngle")); - public static RoundedClipConverter RoundedClipConverter => ((RoundedClipConverter)App.Current.FindResource("RoundedClipConverter")); public static BooleanInverter BoolInverter => ((BooleanInverter)App.Current.FindResource("BoolInverter")); - public static EnumDescriptionConverter EnumDescriptionConverter => ((EnumDescriptionConverter)App.Current.FindResource("EnumDescriptionConverter")); public static MillisecondsToStringConverter MillisecondsToString => ((MillisecondsToStringConverter)App.Current.FindResource("MillisecondsToString")); - public static NullToVisibleCollapsedConverter NullToVisibleCollapsed => ((NullToVisibleCollapsedConverter)App.Current.FindResource("NullToVisibleCollapsed")); - public static MathMultiplicationConverter MathMultiplication => ((MathMultiplicationConverter)App.Current.FindResource("MathMultiplication")); - public static EpochConverter EpochConverter => ((EpochConverter)App.Current.FindResource("EpochConverter")); public static ListBoxItemIndexConverter ListBoxItemIndex => ((ListBoxItemIndexConverter)App.Current.FindResource("ListBoxItemIndex")); - public static ColorToTransparent ColorToTransparent => ((ColorToTransparent)App.Current.FindResource("ColorToTransparent")); - public static ValueToFactorConverter ValueToFactor => ((ValueToFactorConverter)App.Current.FindResource("ValueToFactor")); - public static DurationToStringConverter DurationToString => ((DurationToStringConverter)App.Current.FindResource("DurationToString")); + public static FactorToAngleConverter FactorToAngle => ((FactorToAngleConverter)App.Current.FindResource("FactorToAngle")); public static BoolToVisibility BoolToVisibility => ((BoolToVisibility)App.Current.FindResource("BoolToVisibility")); + public static MathMultiplicationConverter MathMultiplication => ((MathMultiplicationConverter)App.Current.FindResource("MathMultiplication")); + public static NullToVisibleCollapsedConverter NullToVisibleCollapsed => ((NullToVisibleCollapsedConverter)App.Current.FindResource("NullToVisibleCollapsed")); + public static EnumDescriptionConverter EnumDescriptionConverter => ((EnumDescriptionConverter)App.Current.FindResource("EnumDescriptionConverter")); + public static ValueToFactorConverter ValueToFactor => ((ValueToFactorConverter)App.Current.FindResource("ValueToFactor")); + public static RoundedClipConverter RoundedClipConverter => ((RoundedClipConverter)App.Current.FindResource("RoundedClipConverter")); public static NullToVisibilityConverter NullToVisibilty => ((NullToVisibilityConverter)App.Current.FindResource("NullToVisibilty")); + public static ColorToTransparent ColorToTransparent => ((ColorToTransparent)App.Current.FindResource("ColorToTransparent")); + public static DurationToStringConverter DurationToString => ((DurationToStringConverter)App.Current.FindResource("DurationToString")); + public static EpochConverter EpochConverter => ((EpochConverter)App.Current.FindResource("EpochConverter")); } // pack://application:,,,/Nostrum;component/Resources/MiscResources.xaml public static class Nostrum_MiscResources { + public static RotateTransform Rotate45Inv => ((RotateTransform)App.Current.FindResource("Rotate45Inv")); + public static SkewTransform Skew45Inv => ((SkewTransform)App.Current.FindResource("Skew45Inv")); + public static TranslateTransform DefaultTranslateTransform => ((TranslateTransform)App.Current.FindResource("DefaultTranslateTransform")); public static SkewTransform Skew45 => ((SkewTransform)App.Current.FindResource("Skew45")); + public static QuadraticEase QuadraticEase => ((QuadraticEase)App.Current.FindResource("QuadraticEase")); + public static ScaleTransform DefaultScaleTransform => ((ScaleTransform)App.Current.FindResource("DefaultScaleTransform")); public static RotateTransform DefaultRotateTransform => ((RotateTransform)App.Current.FindResource("DefaultRotateTransform")); - public static TranslateTransform DefaultTranslateTransform => ((TranslateTransform)App.Current.FindResource("DefaultTranslateTransform")); public static RotateTransform Rotate45 => ((RotateTransform)App.Current.FindResource("Rotate45")); - public static ScaleTransform DefaultScaleTransform => ((ScaleTransform)App.Current.FindResource("DefaultScaleTransform")); - public static SkewTransform Skew45Inv => ((SkewTransform)App.Current.FindResource("Skew45Inv")); - public static RotateTransform Rotate45Inv => ((RotateTransform)App.Current.FindResource("Rotate45Inv")); - public static QuadraticEase QuadraticEase => ((QuadraticEase)App.Current.FindResource("QuadraticEase")); } // pack://application:,,,/Nostrum;component/Resources/SVG.xaml public static class Nostrum_SVG { + public static StreamGeometry SvgHide => ((StreamGeometry)App.Current.FindResource("SvgHide")); + public static StreamGeometry SvgInfo => ((StreamGeometry)App.Current.FindResource("SvgInfo")); + public static StreamGeometry SvgMenuRight => ((StreamGeometry)App.Current.FindResource("SvgMenuRight")); + public static StreamGeometry SvgRemoveCircle => ((StreamGeometry)App.Current.FindResource("SvgRemoveCircle")); + public static StreamGeometry SvgDotsVertical => ((StreamGeometry)App.Current.FindResource("SvgDotsVertical")); + public static StreamGeometry SvgConfirm => ((StreamGeometry)App.Current.FindResource("SvgConfirm")); public static StreamGeometry SvgEye => ((StreamGeometry)App.Current.FindResource("SvgEye")); - public static StreamGeometry SvgDrag => ((StreamGeometry)App.Current.FindResource("SvgDrag")); - public static StreamGeometry SvgPaypal => ((StreamGeometry)App.Current.FindResource("SvgPaypal")); - public static StreamGeometry SvgSettings => ((StreamGeometry)App.Current.FindResource("SvgSettings")); - public static StreamGeometry SvgStar => ((StreamGeometry)App.Current.FindResource("SvgStar")); public static StreamGeometry SvgMinimize => ((StreamGeometry)App.Current.FindResource("SvgMinimize")); + public static StreamGeometry SvgAdd => ((StreamGeometry)App.Current.FindResource("SvgAdd")); + public static StreamGeometry SvgOpenLink => ((StreamGeometry)App.Current.FindResource("SvgOpenLink")); + public static StreamGeometry SvgShare => ((StreamGeometry)App.Current.FindResource("SvgShare")); + public static StreamGeometry SvgAchievements => ((StreamGeometry)App.Current.FindResource("SvgAchievements")); + public static StreamGeometry SvgPin => ((StreamGeometry)App.Current.FindResource("SvgPin")); + public static StreamGeometry SvgDrag => ((StreamGeometry)App.Current.FindResource("SvgDrag")); + public static StreamGeometry SvgSearch => ((StreamGeometry)App.Current.FindResource("SvgSearch")); + public static StreamGeometry SvgBasket => ((StreamGeometry)App.Current.FindResource("SvgBasket")); + public static StreamGeometry SvgAddUser => ((StreamGeometry)App.Current.FindResource("SvgAddUser")); + public static StreamGeometry SvgFolder => ((StreamGeometry)App.Current.FindResource("SvgFolder")); + public static StreamGeometry SvgCollapseAll => ((StreamGeometry)App.Current.FindResource("SvgCollapseAll")); + public static StreamGeometry SvgReload => ((StreamGeometry)App.Current.FindResource("SvgReload")); public static StreamGeometry SvgAuto => ((StreamGeometry)App.Current.FindResource("SvgAuto")); - public static StreamGeometry SvgChatMessage => ((StreamGeometry)App.Current.FindResource("SvgChatMessage")); - public static StreamGeometry SvgBlurOff => ((StreamGeometry)App.Current.FindResource("SvgBlurOff")); - public static StreamGeometry SvgTrophy => ((StreamGeometry)App.Current.FindResource("SvgTrophy")); - public static StreamGeometry SvgHide => ((StreamGeometry)App.Current.FindResource("SvgHide")); public static StreamGeometry SvgAddCircle => ((StreamGeometry)App.Current.FindResource("SvgAddCircle")); - public static StreamGeometry SvgCopy => ((StreamGeometry)App.Current.FindResource("SvgCopy")); - public static StreamGeometry SvgMapMarker => ((StreamGeometry)App.Current.FindResource("SvgMapMarker")); - public static StreamGeometry SvgBasket => ((StreamGeometry)App.Current.FindResource("SvgBasket")); + public static StreamGeometry SvgAwaken => ((StreamGeometry)App.Current.FindResource("SvgAwaken")); + public static StreamGeometry SvgUserAdd => ((StreamGeometry)App.Current.FindResource("SvgUserAdd")); + public static StreamGeometry SvgQuestionMark => ((StreamGeometry)App.Current.FindResource("SvgQuestionMark")); + public static StreamGeometry SvgExpandAll => ((StreamGeometry)App.Current.FindResource("SvgExpandAll")); public static StreamGeometry SvgUpArrow => ((StreamGeometry)App.Current.FindResource("SvgUpArrow")); - public static StreamGeometry SvgCrossedSwords => ((StreamGeometry)App.Current.FindResource("SvgCrossedSwords")); - public static StreamGeometry SvgMoney => ((StreamGeometry)App.Current.FindResource("SvgMoney")); - public static StreamGeometry SvgPin => ((StreamGeometry)App.Current.FindResource("SvgPin")); - public static StreamGeometry SvgDiscord => ((StreamGeometry)App.Current.FindResource("SvgDiscord")); - public static StreamGeometry SvgGuild => ((StreamGeometry)App.Current.FindResource("SvgGuild")); + public static StreamGeometry SvgHeart => ((StreamGeometry)App.Current.FindResource("SvgHeart")); + public static StreamGeometry SvgPaypal => ((StreamGeometry)App.Current.FindResource("SvgPaypal")); public static StreamGeometry SvgMatching => ((StreamGeometry)App.Current.FindResource("SvgMatching")); - public static StreamGeometry SvgClose => ((StreamGeometry)App.Current.FindResource("SvgClose")); - public static StreamGeometry SvgWarning => ((StreamGeometry)App.Current.FindResource("SvgWarning")); + public static StreamGeometry SvgUsers => ((StreamGeometry)App.Current.FindResource("SvgUsers")); public static StreamGeometry SvgQuestLog => ((StreamGeometry)App.Current.FindResource("SvgQuestLog")); - public static StreamGeometry SvgExpandAll => ((StreamGeometry)App.Current.FindResource("SvgExpandAll")); - public static StreamGeometry SvgMove => ((StreamGeometry)App.Current.FindResource("SvgMove")); - public static StreamGeometry SvgShare => ((StreamGeometry)App.Current.FindResource("SvgShare")); - public static StreamGeometry SvgConfirm => ((StreamGeometry)App.Current.FindResource("SvgConfirm")); - public static StreamGeometry SvgReload => ((StreamGeometry)App.Current.FindResource("SvgReload")); - public static StreamGeometry SvgDotsVertical => ((StreamGeometry)App.Current.FindResource("SvgDotsVertical")); - public static StreamGeometry SvgInfo => ((StreamGeometry)App.Current.FindResource("SvgInfo")); - public static StreamGeometry SvgOpenLink => ((StreamGeometry)App.Current.FindResource("SvgOpenLink")); - public static StreamGeometry SvgSearch => ((StreamGeometry)App.Current.FindResource("SvgSearch")); - public static StreamGeometry SvgBlurOn => ((StreamGeometry)App.Current.FindResource("SvgBlurOn")); - public static StreamGeometry SvgMenuRight => ((StreamGeometry)App.Current.FindResource("SvgMenuRight")); - public static StreamGeometry SvgAwaken => ((StreamGeometry)App.Current.FindResource("SvgAwaken")); - public static StreamGeometry SvgMail => ((StreamGeometry)App.Current.FindResource("SvgMail")); - public static StreamGeometry SvgRemoveCircle => ((StreamGeometry)App.Current.FindResource("SvgRemoveCircle")); - public static StreamGeometry SvgAddUser => ((StreamGeometry)App.Current.FindResource("SvgAddUser")); - public static StreamGeometry SvgDownArrow => ((StreamGeometry)App.Current.FindResource("SvgDownArrow")); - public static StreamGeometry SvgBlock => ((StreamGeometry)App.Current.FindResource("SvgBlock")); - public static StreamGeometry SvgAdd => ((StreamGeometry)App.Current.FindResource("SvgAdd")); public static StreamGeometry SvgAddUsers => ((StreamGeometry)App.Current.FindResource("SvgAddUsers")); - public static StreamGeometry SvgAchievements => ((StreamGeometry)App.Current.FindResource("SvgAchievements")); - public static StreamGeometry SvgUnpin => ((StreamGeometry)App.Current.FindResource("SvgUnpin")); + public static StreamGeometry SvgCheckAll => ((StreamGeometry)App.Current.FindResource("SvgCheckAll")); public static StreamGeometry SvgCheckCircle => ((StreamGeometry)App.Current.FindResource("SvgCheckCircle")); public static StreamGeometry SvgTwitch => ((StreamGeometry)App.Current.FindResource("SvgTwitch")); + public static StreamGeometry SvgGift => ((StreamGeometry)App.Current.FindResource("SvgGift")); + public static StreamGeometry SvgDownArrow => ((StreamGeometry)App.Current.FindResource("SvgDownArrow")); + public static StreamGeometry SvgBlurOn => ((StreamGeometry)App.Current.FindResource("SvgBlurOn")); + public static StreamGeometry SvgSettings => ((StreamGeometry)App.Current.FindResource("SvgSettings")); public static StreamGeometry SvgShop => ((StreamGeometry)App.Current.FindResource("SvgShop")); - public static StreamGeometry SvgHeart => ((StreamGeometry)App.Current.FindResource("SvgHeart")); - public static StreamGeometry SvgUser => ((StreamGeometry)App.Current.FindResource("SvgUser")); - public static StreamGeometry SvgCollapseAll => ((StreamGeometry)App.Current.FindResource("SvgCollapseAll")); - public static StreamGeometry SvgPen => ((StreamGeometry)App.Current.FindResource("SvgPen")); - public static StreamGeometry SvgGitHub => ((StreamGeometry)App.Current.FindResource("SvgGitHub")); + public static StreamGeometry SvgShirt => ((StreamGeometry)App.Current.FindResource("SvgShirt")); + public static StreamGeometry SvgStar => ((StreamGeometry)App.Current.FindResource("SvgStar")); + public static StreamGeometry SvgCopy => ((StreamGeometry)App.Current.FindResource("SvgCopy")); + public static StreamGeometry SvgChatMessage => ((StreamGeometry)App.Current.FindResource("SvgChatMessage")); + public static StreamGeometry SvgUnpin => ((StreamGeometry)App.Current.FindResource("SvgUnpin")); public static StreamGeometry SvgSocial => ((StreamGeometry)App.Current.FindResource("SvgSocial")); - public static StreamGeometry SvgCheckAll => ((StreamGeometry)App.Current.FindResource("SvgCheckAll")); - public static StreamGeometry SvgUsers => ((StreamGeometry)App.Current.FindResource("SvgUsers")); - public static StreamGeometry SvgFolder => ((StreamGeometry)App.Current.FindResource("SvgFolder")); + public static StreamGeometry SvgMapMarker => ((StreamGeometry)App.Current.FindResource("SvgMapMarker")); + public static StreamGeometry SvgPen => ((StreamGeometry)App.Current.FindResource("SvgPen")); public static StreamGeometry SvgRemoveUser => ((StreamGeometry)App.Current.FindResource("SvgRemoveUser")); - public static StreamGeometry SvgShirt => ((StreamGeometry)App.Current.FindResource("SvgShirt")); - public static StreamGeometry SvgGift => ((StreamGeometry)App.Current.FindResource("SvgGift")); - public static StreamGeometry SvgUserAdd => ((StreamGeometry)App.Current.FindResource("SvgUserAdd")); - public static StreamGeometry SvgDelegateLeader => ((StreamGeometry)App.Current.FindResource("SvgDelegateLeader")); - public static StreamGeometry SvgQuestionMark => ((StreamGeometry)App.Current.FindResource("SvgQuestionMark")); public static StreamGeometry SvgDisband => ((StreamGeometry)App.Current.FindResource("SvgDisband")); + public static StreamGeometry SvgMove => ((StreamGeometry)App.Current.FindResource("SvgMove")); + public static StreamGeometry SvgTrophy => ((StreamGeometry)App.Current.FindResource("SvgTrophy")); + public static StreamGeometry SvgMail => ((StreamGeometry)App.Current.FindResource("SvgMail")); + public static StreamGeometry SvgMoney => ((StreamGeometry)App.Current.FindResource("SvgMoney")); + public static StreamGeometry SvgUser => ((StreamGeometry)App.Current.FindResource("SvgUser")); + public static StreamGeometry SvgWarning => ((StreamGeometry)App.Current.FindResource("SvgWarning")); + public static StreamGeometry SvgGitHub => ((StreamGeometry)App.Current.FindResource("SvgGitHub")); + public static StreamGeometry SvgCrossedSwords => ((StreamGeometry)App.Current.FindResource("SvgCrossedSwords")); + public static StreamGeometry SvgGuild => ((StreamGeometry)App.Current.FindResource("SvgGuild")); + public static StreamGeometry SvgDiscord => ((StreamGeometry)App.Current.FindResource("SvgDiscord")); + public static StreamGeometry SvgClose => ((StreamGeometry)App.Current.FindResource("SvgClose")); + public static StreamGeometry SvgDelegateLeader => ((StreamGeometry)App.Current.FindResource("SvgDelegateLeader")); + public static StreamGeometry SvgBlurOff => ((StreamGeometry)App.Current.FindResource("SvgBlurOff")); + public static StreamGeometry SvgBlock => ((StreamGeometry)App.Current.FindResource("SvgBlock")); } // pack://application:,,,/Nostrum;component/Resources/Styles.xaml public static class Nostrum_Styles { - public static ControlTemplate MenuItemControlTemplate1 => ((ControlTemplate)App.Current.FindResource("MenuItemControlTemplate1")); - public static Style ComboBoxMainStyle => ((Style)App.Current.FindResource("ComboBoxMainStyle")); - public static Style ButtonContentOpacityStyle => ((Style)App.Current.FindResource("ButtonContentOpacityStyle")); - public static SolidColorBrush SelectionBackgroundLightBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundLightBrush")); + public static Style EmptyFocusVisual => ((Style)App.Current.FindResource("EmptyFocusVisual")); public static Style ComboBoxEditableTextBox => ((Style)App.Current.FindResource("ComboBoxEditableTextBox")); - public static DropShadowEffect DropShadow => ((DropShadowEffect)App.Current.FindResource("DropShadow")); - public static Style NoHilightListItemStyle => ((Style)App.Current.FindResource("NoHilightListItemStyle")); + public static SolidColorBrush SelectionBackgroundLightBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundLightBrush")); + public static DropShadowEffect FadedDropShadow => ((DropShadowEffect)App.Current.FindResource("FadedDropShadow")); + public static ControlTemplate ComboBoxTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxTemplate")); public static Style ButtonMainStyle => ((Style)App.Current.FindResource("ButtonMainStyle")); - public static SolidColorBrush SelectionBackgroundBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundBrush")); - public static ControlTemplate ComboBoxEditableTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxEditableTemplate")); - public static Style DefaultListItemStyle => ((Style)App.Current.FindResource("DefaultListItemStyle")); - public static SolidColorBrush SelectionBorderBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBorderBrush")); public static Style ComboBoxToggleButton => ((Style)App.Current.FindResource("ComboBoxToggleButton")); - public static ControlTemplate ComboBoxTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxTemplate")); - public static DropShadowEffect FadedDropShadow => ((DropShadowEffect)App.Current.FindResource("FadedDropShadow")); - public static Style NoHilightListItemStyleWithLines => ((Style)App.Current.FindResource("NoHilightListItemStyleWithLines")); public static DropShadowEffect BigDropShadow => ((DropShadowEffect)App.Current.FindResource("BigDropShadow")); - public static Style EmptyFocusVisual => ((Style)App.Current.FindResource("EmptyFocusVisual")); + public static SolidColorBrush SelectionBorderBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBorderBrush")); + public static DropShadowEffect DropShadow => ((DropShadowEffect)App.Current.FindResource("DropShadow")); + public static Style NoHilightListItemStyleWithLines => ((Style)App.Current.FindResource("NoHilightListItemStyleWithLines")); + public static Style ComboBoxMainStyle => ((Style)App.Current.FindResource("ComboBoxMainStyle")); + public static Style ButtonContentOpacityStyle => ((Style)App.Current.FindResource("ButtonContentOpacityStyle")); + public static SolidColorBrush SelectionBackgroundBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundBrush")); + public static Style DefaultListItemStyle => ((Style)App.Current.FindResource("DefaultListItemStyle")); + public static ControlTemplate MenuItemControlTemplate1 => ((ControlTemplate)App.Current.FindResource("MenuItemControlTemplate1")); + public static Style NoHilightListItemStyle => ((Style)App.Current.FindResource("NoHilightListItemStyle")); + public static ControlTemplate ComboBoxEditableTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxEditableTemplate")); } } diff --git a/TCC.Core/TCC.Core.csproj b/TCC.Core/TCC.Core.csproj index 0dd9b4d0..6ae7b789 100644 --- a/TCC.Core/TCC.Core.csproj +++ b/TCC.Core/TCC.Core.csproj @@ -11,7 +11,7 @@ 9 Foglio Foglio - 1.4.114 + 1.4.115 TERA Custom Cooldowns tcc.ico false @@ -104,7 +104,7 @@ - + @@ -116,7 +116,7 @@ ..\dependencies\Dragablz\bin\Release_net45\Dragablz.dll - + @@ -174,4 +174,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/version b/version index a580a674..e6050cac 100644 --- a/version +++ b/version @@ -1,2 +1,2 @@ -1.4.114 -https://github.com/Foglio1024/Tera-custom-cooldowns/releases/download/v1.4.114/TCC-1.4.114.zip \ No newline at end of file +1.4.115 +https://github.com/Foglio1024/Tera-custom-cooldowns/releases/download/v1.4.115/TCC-1.4.115.zip \ No newline at end of file