From 9e5680786ac911df7c0886a57bdf6b8163ec90b0 Mon Sep 17 00:00:00 2001 From: Foglio Date: Wed, 9 Jun 2021 12:44:24 +0200 Subject: [PATCH] v1.4.125 --- TCC.Core/R.cs | 153 ++++++++++++++++++++------------------- TCC.Core/TCC.Core.csproj | 4 +- version | 4 +- 3 files changed, 82 insertions(+), 79 deletions(-) diff --git a/TCC.Core/R.cs b/TCC.Core/R.cs index e752ca33..d77ceab4 100644 --- a/TCC.Core/R.cs +++ b/TCC.Core/R.cs @@ -452,6 +452,7 @@ public static class MiscResources public static ImageSource CharWindowBgTriple => ((ImageSource)App.Current.FindResource("CharWindowBgTriple")); public static ImageSource CharWindowBgSorc => ((ImageSource)App.Current.FindResource("CharWindowBgSorc")); public static ImageSource CharWindowFg => ((ImageSource)App.Current.FindResource("CharWindowFg")); + public static ImageSource SlotNeutralBg => ((ImageSource)App.Current.FindResource("SlotNeutralBg")); public static ImageSource MobIcon => ((ImageSource)App.Current.FindResource("MobIcon")); public static ImageSource BossIcon => ((ImageSource)App.Current.FindResource("BossIcon")); public static ImageSource BossIconFull => ((ImageSource)App.Current.FindResource("BossIconFull")); @@ -549,124 +550,124 @@ public static class TemplateSelectors // pack://application:,,,/Nostrum;component/Resources/Converters.xaml public static class Nostrum_Converters { - public static ValueToFactorConverter ValueToFactor => ((ValueToFactorConverter)App.Current.FindResource("ValueToFactor")); - public static RoundedClipConverter RoundedClipConverter => ((RoundedClipConverter)App.Current.FindResource("RoundedClipConverter")); - public static NullToVisibilityConverter NullToVisibility => ((NullToVisibilityConverter)App.Current.FindResource("NullToVisibility")); - public static FactorToAngleConverter FactorToAngle => ((FactorToAngleConverter)App.Current.FindResource("FactorToAngle")); + public static ColorToTransparent ColorToTransparent => ((ColorToTransparent)App.Current.FindResource("ColorToTransparent")); + public static ListBoxItemIndexConverter ListBoxItemIndex => ((ListBoxItemIndexConverter)App.Current.FindResource("ListBoxItemIndex")); public static DurationToStringConverter DurationToString => ((DurationToStringConverter)App.Current.FindResource("DurationToString")); + public static NullToVisibilityConverter NullToVisibility => ((NullToVisibilityConverter)App.Current.FindResource("NullToVisibility")); + public static BoolToVisibility BoolToVisibility => ((BoolToVisibility)App.Current.FindResource("BoolToVisibility")); public static BooleanInverter BoolInverter => ((BooleanInverter)App.Current.FindResource("BoolInverter")); + public static MathMultiplicationConverter MathMultiplication => ((MathMultiplicationConverter)App.Current.FindResource("MathMultiplication")); + public static ValueToFactorConverter ValueToFactor => ((ValueToFactorConverter)App.Current.FindResource("ValueToFactor")); + public static FactorToAngleConverter FactorToAngle => ((FactorToAngleConverter)App.Current.FindResource("FactorToAngle")); public static EpochConverter EpochConverter => ((EpochConverter)App.Current.FindResource("EpochConverter")); public static EnumDescriptionConverter EnumDescriptionConverter => ((EnumDescriptionConverter)App.Current.FindResource("EnumDescriptionConverter")); - public static ListBoxItemIndexConverter ListBoxItemIndex => ((ListBoxItemIndexConverter)App.Current.FindResource("ListBoxItemIndex")); - public static ColorToTransparent ColorToTransparent => ((ColorToTransparent)App.Current.FindResource("ColorToTransparent")); - public static MathMultiplicationConverter MathMultiplication => ((MathMultiplicationConverter)App.Current.FindResource("MathMultiplication")); - public static BoolToVisibility BoolToVisibility => ((BoolToVisibility)App.Current.FindResource("BoolToVisibility")); + public static RoundedClipConverter RoundedClipConverter => ((RoundedClipConverter)App.Current.FindResource("RoundedClipConverter")); } // pack://application:,,,/Nostrum;component/Resources/MiscResources.xaml public static class Nostrum_MiscResources { - public static RotateTransform DefaultRotateTransform => ((RotateTransform)App.Current.FindResource("DefaultRotateTransform")); public static ScaleTransform DefaultScaleTransform => ((ScaleTransform)App.Current.FindResource("DefaultScaleTransform")); + public static RotateTransform DefaultRotateTransform => ((RotateTransform)App.Current.FindResource("DefaultRotateTransform")); + public static SkewTransform Skew45 => ((SkewTransform)App.Current.FindResource("Skew45")); public static RotateTransform Rotate45Inv => ((RotateTransform)App.Current.FindResource("Rotate45Inv")); - public static TranslateTransform DefaultTranslateTransform => ((TranslateTransform)App.Current.FindResource("DefaultTranslateTransform")); public static RotateTransform Rotate45 => ((RotateTransform)App.Current.FindResource("Rotate45")); public static SkewTransform Skew45Inv => ((SkewTransform)App.Current.FindResource("Skew45Inv")); + public static TranslateTransform DefaultTranslateTransform => ((TranslateTransform)App.Current.FindResource("DefaultTranslateTransform")); public static QuadraticEase QuadraticEase => ((QuadraticEase)App.Current.FindResource("QuadraticEase")); - public static SkewTransform Skew45 => ((SkewTransform)App.Current.FindResource("Skew45")); } // pack://application:,,,/Nostrum;component/Resources/SVG.xaml public static class Nostrum_SVG { - public static StreamGeometry SvgUpArrow => ((StreamGeometry)App.Current.FindResource("SvgUpArrow")); - public static StreamGeometry SvgQuestionMark => ((StreamGeometry)App.Current.FindResource("SvgQuestionMark")); - public static StreamGeometry SvgDrag => ((StreamGeometry)App.Current.FindResource("SvgDrag")); - public static StreamGeometry SvgSocial => ((StreamGeometry)App.Current.FindResource("SvgSocial")); - public static StreamGeometry SvgDelegateLeader => ((StreamGeometry)App.Current.FindResource("SvgDelegateLeader")); - public static StreamGeometry SvgShare => ((StreamGeometry)App.Current.FindResource("SvgShare")); - public static StreamGeometry SvgTwitch => ((StreamGeometry)App.Current.FindResource("SvgTwitch")); - public static StreamGeometry SvgUserAdd => ((StreamGeometry)App.Current.FindResource("SvgUserAdd")); - public static StreamGeometry SvgBlurOff => ((StreamGeometry)App.Current.FindResource("SvgBlurOff")); - public static StreamGeometry SvgExpandAll => ((StreamGeometry)App.Current.FindResource("SvgExpandAll")); - public static StreamGeometry SvgSearch => ((StreamGeometry)App.Current.FindResource("SvgSearch")); - public static StreamGeometry SvgStar => ((StreamGeometry)App.Current.FindResource("SvgStar")); - public static StreamGeometry SvgWarning => ((StreamGeometry)App.Current.FindResource("SvgWarning")); + public static StreamGeometry SvgDownArrow => ((StreamGeometry)App.Current.FindResource("SvgDownArrow")); + public static StreamGeometry SvgAchievements => ((StreamGeometry)App.Current.FindResource("SvgAchievements")); + public static StreamGeometry SvgMenuRight => ((StreamGeometry)App.Current.FindResource("SvgMenuRight")); + public static StreamGeometry SvgAddUser => ((StreamGeometry)App.Current.FindResource("SvgAddUser")); public static StreamGeometry SvgRemoveUser => ((StreamGeometry)App.Current.FindResource("SvgRemoveUser")); - public static StreamGeometry SvgQuestLog => ((StreamGeometry)App.Current.FindResource("SvgQuestLog")); + public static StreamGeometry SvgAuto => ((StreamGeometry)App.Current.FindResource("SvgAuto")); + public static StreamGeometry SvgTwitch => ((StreamGeometry)App.Current.FindResource("SvgTwitch")); + public static StreamGeometry SvgDisband => ((StreamGeometry)App.Current.FindResource("SvgDisband")); + public static StreamGeometry SvgUser => ((StreamGeometry)App.Current.FindResource("SvgUser")); public static StreamGeometry SvgMatching => ((StreamGeometry)App.Current.FindResource("SvgMatching")); - public static StreamGeometry SvgUsers => ((StreamGeometry)App.Current.FindResource("SvgUsers")); - public static StreamGeometry SvgMail => ((StreamGeometry)App.Current.FindResource("SvgMail")); - public static StreamGeometry SvgGitHub => ((StreamGeometry)App.Current.FindResource("SvgGitHub")); - public static StreamGeometry SvgShirt => ((StreamGeometry)App.Current.FindResource("SvgShirt")); - public static StreamGeometry SvgGift => ((StreamGeometry)App.Current.FindResource("SvgGift")); - public static StreamGeometry SvgCheckAll => ((StreamGeometry)App.Current.FindResource("SvgCheckAll")); - public static StreamGeometry SvgDownArrow => ((StreamGeometry)App.Current.FindResource("SvgDownArrow")); + public static StreamGeometry SvgPen => ((StreamGeometry)App.Current.FindResource("SvgPen")); public static StreamGeometry SvgAddUsers => ((StreamGeometry)App.Current.FindResource("SvgAddUsers")); - public static StreamGeometry SvgSettings => ((StreamGeometry)App.Current.FindResource("SvgSettings")); + public static StreamGeometry SvgPin => ((StreamGeometry)App.Current.FindResource("SvgPin")); + public static StreamGeometry SvgCheckCircle => ((StreamGeometry)App.Current.FindResource("SvgCheckCircle")); + public static StreamGeometry SvgBlock => ((StreamGeometry)App.Current.FindResource("SvgBlock")); + public static StreamGeometry SvgUnpin => ((StreamGeometry)App.Current.FindResource("SvgUnpin")); + public static StreamGeometry SvgPaypal => ((StreamGeometry)App.Current.FindResource("SvgPaypal")); + public static StreamGeometry SvgCheckAll => ((StreamGeometry)App.Current.FindResource("SvgCheckAll")); + public static StreamGeometry SvgCollapseAll => ((StreamGeometry)App.Current.FindResource("SvgCollapseAll")); + public static StreamGeometry SvgWarning => ((StreamGeometry)App.Current.FindResource("SvgWarning")); + public static StreamGeometry SvgHeart => ((StreamGeometry)App.Current.FindResource("SvgHeart")); + public static StreamGeometry SvgHide => ((StreamGeometry)App.Current.FindResource("SvgHide")); + public static StreamGeometry SvgConfirm => ((StreamGeometry)App.Current.FindResource("SvgConfirm")); + public static StreamGeometry SvgMail => ((StreamGeometry)App.Current.FindResource("SvgMail")); public static StreamGeometry SvgInfo => ((StreamGeometry)App.Current.FindResource("SvgInfo")); + public static StreamGeometry SvgRemoveCircle => ((StreamGeometry)App.Current.FindResource("SvgRemoveCircle")); + public static StreamGeometry SvgOpenLink => ((StreamGeometry)App.Current.FindResource("SvgOpenLink")); public static StreamGeometry SvgAdd => ((StreamGeometry)App.Current.FindResource("SvgAdd")); - public static StreamGeometry SvgTrophy => ((StreamGeometry)App.Current.FindResource("SvgTrophy")); + public static StreamGeometry SvgGitHub => ((StreamGeometry)App.Current.FindResource("SvgGitHub")); public static StreamGeometry SvgBlurOn => ((StreamGeometry)App.Current.FindResource("SvgBlurOn")); - public static StreamGeometry SvgDotsVertical => ((StreamGeometry)App.Current.FindResource("SvgDotsVertical")); - public static StreamGeometry SvgConfirm => ((StreamGeometry)App.Current.FindResource("SvgConfirm")); public static StreamGeometry SvgCopy => ((StreamGeometry)App.Current.FindResource("SvgCopy")); - public static StreamGeometry SvgAuto => ((StreamGeometry)App.Current.FindResource("SvgAuto")); - public static StreamGeometry SvgPen => ((StreamGeometry)App.Current.FindResource("SvgPen")); - public static StreamGeometry SvgMinimize => ((StreamGeometry)App.Current.FindResource("SvgMinimize")); - public static StreamGeometry SvgCrossedSwords => ((StreamGeometry)App.Current.FindResource("SvgCrossedSwords")); - public static StreamGeometry SvgClose => ((StreamGeometry)App.Current.FindResource("SvgClose")); - public static StreamGeometry SvgMapMarker => ((StreamGeometry)App.Current.FindResource("SvgMapMarker")); - public static StreamGeometry SvgMove => ((StreamGeometry)App.Current.FindResource("SvgMove")); - public static StreamGeometry SvgPin => ((StreamGeometry)App.Current.FindResource("SvgPin")); - public static StreamGeometry SvgShop => ((StreamGeometry)App.Current.FindResource("SvgShop")); + public static StreamGeometry SvgUsers => ((StreamGeometry)App.Current.FindResource("SvgUsers")); + public static StreamGeometry SvgGift => ((StreamGeometry)App.Current.FindResource("SvgGift")); + public static StreamGeometry SvgUserAdd => ((StreamGeometry)App.Current.FindResource("SvgUserAdd")); + public static StreamGeometry SvgBlurOff => ((StreamGeometry)App.Current.FindResource("SvgBlurOff")); + public static StreamGeometry SvgAddCircle => ((StreamGeometry)App.Current.FindResource("SvgAddCircle")); public static StreamGeometry SvgEye => ((StreamGeometry)App.Current.FindResource("SvgEye")); - public static StreamGeometry SvgDiscord => ((StreamGeometry)App.Current.FindResource("SvgDiscord")); + public static StreamGeometry SvgReload => ((StreamGeometry)App.Current.FindResource("SvgReload")); + public static StreamGeometry SvgUpArrow => ((StreamGeometry)App.Current.FindResource("SvgUpArrow")); + public static StreamGeometry SvgDelegateLeader => ((StreamGeometry)App.Current.FindResource("SvgDelegateLeader")); + public static StreamGeometry SvgMove => ((StreamGeometry)App.Current.FindResource("SvgMove")); + public static StreamGeometry SvgBasket => ((StreamGeometry)App.Current.FindResource("SvgBasket")); public static StreamGeometry SvgFolder => ((StreamGeometry)App.Current.FindResource("SvgFolder")); - public static StreamGeometry SvgAddCircle => ((StreamGeometry)App.Current.FindResource("SvgAddCircle")); + public static StreamGeometry SvgMapMarker => ((StreamGeometry)App.Current.FindResource("SvgMapMarker")); + public static StreamGeometry SvgShirt => ((StreamGeometry)App.Current.FindResource("SvgShirt")); + public static StreamGeometry SvgCrossedSwords => ((StreamGeometry)App.Current.FindResource("SvgCrossedSwords")); + public static StreamGeometry SvgStar => ((StreamGeometry)App.Current.FindResource("SvgStar")); public static StreamGeometry SvgGuild => ((StreamGeometry)App.Current.FindResource("SvgGuild")); - public static StreamGeometry SvgBlock => ((StreamGeometry)App.Current.FindResource("SvgBlock")); - public static StreamGeometry SvgCheckCircle => ((StreamGeometry)App.Current.FindResource("SvgCheckCircle")); - public static StreamGeometry SvgOpenLink => ((StreamGeometry)App.Current.FindResource("SvgOpenLink")); - public static StreamGeometry SvgBasket => ((StreamGeometry)App.Current.FindResource("SvgBasket")); - public static StreamGeometry SvgUser => ((StreamGeometry)App.Current.FindResource("SvgUser")); - public static StreamGeometry SvgDisband => ((StreamGeometry)App.Current.FindResource("SvgDisband")); - public static StreamGeometry SvgMoney => ((StreamGeometry)App.Current.FindResource("SvgMoney")); - public static StreamGeometry SvgMenuRight => ((StreamGeometry)App.Current.FindResource("SvgMenuRight")); - public static StreamGeometry SvgCollapseAll => ((StreamGeometry)App.Current.FindResource("SvgCollapseAll")); + public static StreamGeometry SvgQuestLog => ((StreamGeometry)App.Current.FindResource("SvgQuestLog")); public static StreamGeometry SvgChatMessage => ((StreamGeometry)App.Current.FindResource("SvgChatMessage")); - public static StreamGeometry SvgHeart => ((StreamGeometry)App.Current.FindResource("SvgHeart")); - public static StreamGeometry SvgHide => ((StreamGeometry)App.Current.FindResource("SvgHide")); - public static StreamGeometry SvgAchievements => ((StreamGeometry)App.Current.FindResource("SvgAchievements")); - public static StreamGeometry SvgAddUser => ((StreamGeometry)App.Current.FindResource("SvgAddUser")); - public static StreamGeometry SvgRemoveCircle => ((StreamGeometry)App.Current.FindResource("SvgRemoveCircle")); - public static StreamGeometry SvgUnpin => ((StreamGeometry)App.Current.FindResource("SvgUnpin")); - public static StreamGeometry SvgReload => ((StreamGeometry)App.Current.FindResource("SvgReload")); - public static StreamGeometry SvgPaypal => ((StreamGeometry)App.Current.FindResource("SvgPaypal")); + public static StreamGeometry SvgClose => ((StreamGeometry)App.Current.FindResource("SvgClose")); + public static StreamGeometry SvgDotsVertical => ((StreamGeometry)App.Current.FindResource("SvgDotsVertical")); + public static StreamGeometry SvgSearch => ((StreamGeometry)App.Current.FindResource("SvgSearch")); + public static StreamGeometry SvgShop => ((StreamGeometry)App.Current.FindResource("SvgShop")); + public static StreamGeometry SvgTrophy => ((StreamGeometry)App.Current.FindResource("SvgTrophy")); + public static StreamGeometry SvgDrag => ((StreamGeometry)App.Current.FindResource("SvgDrag")); + public static StreamGeometry SvgExpandAll => ((StreamGeometry)App.Current.FindResource("SvgExpandAll")); public static StreamGeometry SvgAwaken => ((StreamGeometry)App.Current.FindResource("SvgAwaken")); + public static StreamGeometry SvgMinimize => ((StreamGeometry)App.Current.FindResource("SvgMinimize")); + public static StreamGeometry SvgQuestionMark => ((StreamGeometry)App.Current.FindResource("SvgQuestionMark")); + public static StreamGeometry SvgSocial => ((StreamGeometry)App.Current.FindResource("SvgSocial")); + public static StreamGeometry SvgSettings => ((StreamGeometry)App.Current.FindResource("SvgSettings")); + public static StreamGeometry SvgShare => ((StreamGeometry)App.Current.FindResource("SvgShare")); + public static StreamGeometry SvgDiscord => ((StreamGeometry)App.Current.FindResource("SvgDiscord")); + public static StreamGeometry SvgMoney => ((StreamGeometry)App.Current.FindResource("SvgMoney")); } // pack://application:,,,/Nostrum;component/Resources/Styles.xaml public static class Nostrum_Styles { - public static Style NoHilightListItemStyle => ((Style)App.Current.FindResource("NoHilightListItemStyle")); - public static ControlTemplate ComboBoxTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxTemplate")); - public static Style ButtonContentOpacityStyle => ((Style)App.Current.FindResource("ButtonContentOpacityStyle")); - public static Style EmptyFocusVisual => ((Style)App.Current.FindResource("EmptyFocusVisual")); - public static Style ButtonMainStyle => ((Style)App.Current.FindResource("ButtonMainStyle")); - public static SolidColorBrush SelectionBackgroundLightBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundLightBrush")); - public static Style NoHilightListItemStyleWithLines => ((Style)App.Current.FindResource("NoHilightListItemStyleWithLines")); + public static DropShadowEffect FadedDropShadow => ((DropShadowEffect)App.Current.FindResource("FadedDropShadow")); public static DropShadowEffect DropShadow => ((DropShadowEffect)App.Current.FindResource("DropShadow")); + public static ControlTemplate ComboBoxEditableTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxEditableTemplate")); + public static Style ButtonContentOpacityStyle => ((Style)App.Current.FindResource("ButtonContentOpacityStyle")); + public static ControlTemplate MenuItemControlTemplate1 => ((ControlTemplate)App.Current.FindResource("MenuItemControlTemplate1")); + public static Style ComboBoxMainStyle => ((Style)App.Current.FindResource("ComboBoxMainStyle")); public static Style DefaultListItemStyle => ((Style)App.Current.FindResource("DefaultListItemStyle")); - public static DropShadowEffect FadedDropShadow => ((DropShadowEffect)App.Current.FindResource("FadedDropShadow")); + public static Style NoHilightListItemStyle => ((Style)App.Current.FindResource("NoHilightListItemStyle")); public static SolidColorBrush SelectionBorderBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBorderBrush")); + public static ControlTemplate ComboBoxTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxTemplate")); + public static SolidColorBrush SelectionBackgroundBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundBrush")); public static Style ComboBoxEditableTextBox => ((Style)App.Current.FindResource("ComboBoxEditableTextBox")); + public static SolidColorBrush SelectionBackgroundLightBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundLightBrush")); + public static Style NoHilightListItemStyleWithLines => ((Style)App.Current.FindResource("NoHilightListItemStyleWithLines")); + public static Style ButtonMainStyle => ((Style)App.Current.FindResource("ButtonMainStyle")); + public static Style EmptyFocusVisual => ((Style)App.Current.FindResource("EmptyFocusVisual")); public static DropShadowEffect BigDropShadow => ((DropShadowEffect)App.Current.FindResource("BigDropShadow")); - public static Style ComboBoxMainStyle => ((Style)App.Current.FindResource("ComboBoxMainStyle")); - public static ControlTemplate ComboBoxEditableTemplate => ((ControlTemplate)App.Current.FindResource("ComboBoxEditableTemplate")); - public static ControlTemplate MenuItemControlTemplate1 => ((ControlTemplate)App.Current.FindResource("MenuItemControlTemplate1")); public static Style ComboBoxToggleButton => ((Style)App.Current.FindResource("ComboBoxToggleButton")); - public static SolidColorBrush SelectionBackgroundBrush => ((SolidColorBrush)App.Current.FindResource("SelectionBackgroundBrush")); } } diff --git a/TCC.Core/TCC.Core.csproj b/TCC.Core/TCC.Core.csproj index d0e89aac..0bc2d403 100644 --- a/TCC.Core/TCC.Core.csproj +++ b/TCC.Core/TCC.Core.csproj @@ -14,7 +14,7 @@ true Foglio Foglio - 1.4.124 + 1.4.125 TERA Custom Cooldowns tcc.ico @@ -90,6 +90,7 @@ + @@ -163,6 +164,7 @@ + diff --git a/version b/version index cb19442f..822f3872 100644 --- a/version +++ b/version @@ -1,2 +1,2 @@ -1.4.124 -https://github.com/Foglio1024/Tera-custom-cooldowns/releases/download/v1.4.124/TCC-1.4.124.zip \ No newline at end of file +1.4.125 +https://github.com/Foglio1024/Tera-custom-cooldowns/releases/download/v1.4.125/TCC-1.4.125.zip \ No newline at end of file