diff --git a/pk3DS.Core/Properties/Resources.Designer.cs b/pk3DS.Core/Properties/Resources.Designer.cs index 44fb5af..9476456 100644 --- a/pk3DS.Core/Properties/Resources.Designer.cs +++ b/pk3DS.Core/Properties/Resources.Designer.cs @@ -11730,29 +11730,6 @@ public class Resources { } } - /// - /// Looks up a localized string similar to pk3DS - By Kaphotics - ///http://projectpokemon.org/ - ///http://projectpokemon.org/forums/showthread.php?44950 - /// - ///A package of Pokémon X/Y/OR/AS tools by various contributors. - /// - ///GARCTool (Backbone): Kaphotics - ///Text Editing (xytext): Kaphotics - ///Wild Editor (**WE): SciresM & Kaphotics - ///Trainer Editor (**TE): SciresM, Kaphotics, and KazoWAR - ///Personal Editor: SciresM - ///Mega Evolution Editor (MEE): SciresM - ///OverWorld/Script Editor: Kaphotics & FireFly - ///Evolutions, Moves, Items, Maison, Title Screen Editors: Kaphotics - /// [rest of string was truncated]";. - /// - public static string changelog { - get { - return ResourceManager.GetString("changelog", resourceCulture); - } - } - /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/pk3DS.Core/Properties/Resources.resx b/pk3DS.Core/Properties/Resources.resx index f441a13..a5f7d73 100644 --- a/pk3DS.Core/Properties/Resources.resx +++ b/pk3DS.Core/Properties/Resources.resx @@ -1414,9 +1414,6 @@ ..\Resources\ETC1Lib.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\changelog.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\Resources\img\F.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/pk3DS.Core/pk3DS.Core.csproj b/pk3DS.Core/pk3DS.Core.csproj index 2b021cc..2858c79 100644 --- a/pk3DS.Core/pk3DS.Core.csproj +++ b/pk3DS.Core/pk3DS.Core.csproj @@ -1387,7 +1387,6 @@ - diff --git a/pk3DS/Misc/About.cs b/pk3DS/Misc/About.cs index 1108a5e..6ad37bd 100644 --- a/pk3DS/Misc/About.cs +++ b/pk3DS/Misc/About.cs @@ -8,7 +8,7 @@ public partial class About : Form public About() { InitializeComponent(); - RTB.Text = Core.Properties.Resources.changelog; + RTB.Text = Properties.Resources.changelog; } private void B_Close_Click(object sender, EventArgs e) { diff --git a/pk3DS/Properties/Resources.Designer.cs b/pk3DS/Properties/Resources.Designer.cs index 77c89eb..51b8c51 100644 --- a/pk3DS/Properties/Resources.Designer.cs +++ b/pk3DS/Properties/Resources.Designer.cs @@ -59,5 +59,28 @@ internal class Resources { resourceCulture = value; } } + + /// + /// Looks up a localized string similar to pk3DS - By Kaphotics + ///http://projectpokemon.org/ + ///http://projectpokemon.org/forums/showthread.php?44950 + /// + ///A package of Pokémon X/Y/OR/AS tools by various contributors. + /// + ///GARCTool (Backbone): Kaphotics + ///Text Editing (xytext): Kaphotics + ///Wild Editor (**WE): SciresM & Kaphotics + ///Trainer Editor (**TE): SciresM, Kaphotics, and KazoWAR + ///Personal Editor: SciresM + ///Mega Evolution Editor (MEE): SciresM + ///OverWorld/Script Editor: Kaphotics & FireFly + ///Evolutions, Moves, Items, Maison, Title Screen Editors: Kaphotics + /// [rest of string was truncated]";. + /// + internal static string changelog { + get { + return ResourceManager.GetString("changelog", resourceCulture); + } + } } } diff --git a/pk3DS/Properties/Resources.resx b/pk3DS/Properties/Resources.resx index d44c5a5..a86a4f7 100644 --- a/pk3DS/Properties/Resources.resx +++ b/pk3DS/Properties/Resources.resx @@ -118,5 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + ..\Resources\changelog.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file diff --git a/pk3DS.Core/Resources/changelog.txt b/pk3DS/Resources/changelog.txt similarity index 100% rename from pk3DS.Core/Resources/changelog.txt rename to pk3DS/Resources/changelog.txt diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index 72c3870..e83f5c0 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -538,15 +538,16 @@ True - - - + {BC4D176C-9471-432A-82EB-ABF9AF1D6DFD} pk3DS.Core + + +