From 1448ba0d087299db596d4f8293c18c6cf8fef4a6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 13 Nov 2018 19:22:55 -0800 Subject: [PATCH] Update project & add resources with new additions --- PKHeX.WinForms/PKHeX.WinForms.csproj | 55 +++++++++++ .../Properties/Resources.Designer.cs | 92 ++++++++++++++++++- PKHeX.WinForms/Properties/Resources.resx | 24 +++++ 3 files changed, 166 insertions(+), 5 deletions(-) diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index 6e294a344..02087001f 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -157,6 +157,12 @@ CatchRate.cs + + UserControl + + + SizeCP.cs + UserControl @@ -490,12 +496,24 @@ SAV_Pokebean.cs + + Form + + + SAV_PokedexGG.cs + Form SAV_PokedexSM.cs + + Form + + + SAV_Trainer7GG.cs + Form @@ -520,6 +538,12 @@ SAV_BoxViewer.cs + + Form + + + SAV_EventWork.cs + Form @@ -574,6 +598,12 @@ TrainerStat.cs + + Form + + + SAV_Encounters.cs + Form @@ -616,6 +646,9 @@ CatchRate.cs + + SizeCP.cs + StatEditor.cs @@ -772,9 +805,15 @@ SAV_Pokebean.cs + + SAV_PokedexGG.cs + SAV_PokedexSM.cs + + SAV_Trainer7GG.cs + SAV_Trainer7.cs @@ -787,6 +826,9 @@ SAV_BoxViewer.cs + + SAV_EventWork.cs + SAV_EventFlags.cs @@ -811,6 +853,9 @@ TrainerStat.cs + + SAV_Encounters.cs + SAV_Database.cs @@ -836,6 +881,13 @@ + + + + + + + @@ -1916,6 +1968,9 @@ + + + diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs index 8e81af517..755cf7d49 100644 --- a/PKHeX.WinForms/Properties/Resources.Designer.cs +++ b/PKHeX.WinForms/Properties/Resources.Designer.cs @@ -930,6 +930,26 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _133_1p { + get { + object obj = ResourceManager.GetObject("_133_1p", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _133_1ps { + get { + object obj = ResourceManager.GetObject("_133_1ps", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -4620,6 +4640,26 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_8p { + get { + object obj = ResourceManager.GetObject("_25_8p", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_8ps { + get { + object obj = ResourceManager.GetObject("_25_8ps", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -20450,6 +20490,46 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _808 { + get { + object obj = ResourceManager.GetObject("_808", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _808s { + get { + object obj = ResourceManager.GetObject("_808s", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _809 { + get { + object obj = ResourceManager.GetObject("_809", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _809s { + get { + object obj = ResourceManager.GetObject("_809s", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -22944,11 +23024,13 @@ internal class Resources { /// Looks up a localized string similar to PKHeX - By Kaphotics ///http://projectpokemon.org/pkhex/ /// - ///18/09/11 - New Update: + ///18/11/01 - New Update: /// - Legality: - /// - - Changed: Another round of legality check updates. Thanks HaxAras, @sora10pls, ICanSnake, Omnipotent Arceus, Raptor385, PF649, PrometheusG, @Narithegreat, Yami_Wheeler, crzyc, ThePunish3D, @Lusamine! - /// - - Added: Poké Pelago status legality checks have been enabled, which can detect improperly transferred files. - /// - Added: Clicking on the "Ball" label now brings up a list of all balls, with background color i [rest of string was truncated]";. + /// - - Added: Colosseum/XD Shadow encounters are now more thoroughly checked for RNG conditions (nature/gender/shiny locks). + /// - - Added: OT/Nickname length checks. + /// - - Fixed: Colosseum MATTLE Ho-Oh in different languages is now allowed as .ck3 to have the original too-long OT name. + /// - - Fixed: Gen4 Shuckie (different between HG & SS) is now accounted for properly. + /// - - Fixed: Gen4 KOR Pichu mystery gift is now [rest of string was truncated]";. /// internal static string changelog { get { @@ -28137,7 +28219,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to 20180911. + /// Looks up a localized string similar to 20181101. /// internal static string ProgramVersion { get { diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index 4fc749f15..0674a149a 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -9208,4 +9208,28 @@ ..\Resources\img\Pokemon Sprites\249x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\133-1p.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\133-1ps.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\808.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\808s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\809.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\809s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-8p.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\25-8ps.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file