From e5dc69c4d4e18577ecce629a6d3d07a64584069c Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 11:58:19 -0600 Subject: [PATCH 1/6] Potentially fixed linux builds --- pk3DS/Properties/Resources.resx | 8 ++++---- pk3DS/pk3DS.csproj | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pk3DS/Properties/Resources.resx b/pk3DS/Properties/Resources.resx index 31da3be..ac3da28 100644 --- a/pk3DS/Properties/Resources.resx +++ b/pk3DS/Properties/Resources.resx @@ -1430,7 +1430,7 @@ ..\Resources\img\W.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\FLY.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\fly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\slotDel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1442,7 +1442,7 @@ ..\Resources\img\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\img\rare_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\rare_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Pokemon Sprites\egg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -4943,10 +4943,10 @@ ..\Resources\img\Pokemon Sprites\9-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\img\moon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\moon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\img\sun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\sun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\img\Pokemon Sprites\empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index bcf5e67..af42b8c 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -4976,7 +4976,7 @@ - + From 0334c7912b99ca6ba98801bf67fb3f54c3dd17c4 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 12:27:33 -0600 Subject: [PATCH 2/6] Fixed casing issues in project --- pk3DS/pk3DS.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index af42b8c..98dc8f0 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -200,7 +200,7 @@ Form - + SMWE.cs @@ -366,7 +366,7 @@ Form - + OWSE.cs @@ -384,7 +384,7 @@ Form - + XYWE.cs From 3acc92f4bdf2007b47e3385cbe8b90ba020d293e Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 12:28:19 -0600 Subject: [PATCH 3/6] Unfixed casing Because renaming designer to Designer on Windows doesn't count as a change --- pk3DS/Subforms/Gen6/{RSWE.designer.cs => RSWE1.designer.cs} | 0 pk3DS/Subforms/Gen6/{XYWE.designer.cs => XYWE1.designer.cs} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pk3DS/Subforms/Gen6/{RSWE.designer.cs => RSWE1.designer.cs} (100%) rename pk3DS/Subforms/Gen6/{XYWE.designer.cs => XYWE1.designer.cs} (100%) diff --git a/pk3DS/Subforms/Gen6/RSWE.designer.cs b/pk3DS/Subforms/Gen6/RSWE1.designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/RSWE.designer.cs rename to pk3DS/Subforms/Gen6/RSWE1.designer.cs diff --git a/pk3DS/Subforms/Gen6/XYWE.designer.cs b/pk3DS/Subforms/Gen6/XYWE1.designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/XYWE.designer.cs rename to pk3DS/Subforms/Gen6/XYWE1.designer.cs From 8d621cda789d6fe1d4daff340e3a6f1a9a59bd26 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 12:28:48 -0600 Subject: [PATCH 4/6] Re-fixed casing issues --- pk3DS/Subforms/Gen6/{RSWE1.designer.cs => RSWE.Designer.cs} | 0 pk3DS/Subforms/Gen6/{XYWE1.designer.cs => XYWE.Designer.cs} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pk3DS/Subforms/Gen6/{RSWE1.designer.cs => RSWE.Designer.cs} (100%) rename pk3DS/Subforms/Gen6/{XYWE1.designer.cs => XYWE.Designer.cs} (100%) diff --git a/pk3DS/Subforms/Gen6/RSWE1.designer.cs b/pk3DS/Subforms/Gen6/RSWE.Designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/RSWE1.designer.cs rename to pk3DS/Subforms/Gen6/RSWE.Designer.cs diff --git a/pk3DS/Subforms/Gen6/XYWE1.designer.cs b/pk3DS/Subforms/Gen6/XYWE.Designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/XYWE1.designer.cs rename to pk3DS/Subforms/Gen6/XYWE.Designer.cs From f5f194be7299748a9983a4ca938008304c8aea09 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 12:30:39 -0600 Subject: [PATCH 5/6] Unfixed casing issue --- .../Gen6/Experimental/{OWSE.designer.cs => OWSE1.designer.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pk3DS/Subforms/Gen6/Experimental/{OWSE.designer.cs => OWSE1.designer.cs} (100%) diff --git a/pk3DS/Subforms/Gen6/Experimental/OWSE.designer.cs b/pk3DS/Subforms/Gen6/Experimental/OWSE1.designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/Experimental/OWSE.designer.cs rename to pk3DS/Subforms/Gen6/Experimental/OWSE1.designer.cs From 81c2d988993741b9439a5ad46a49f9cf244718c9 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Thu, 26 Jan 2017 12:31:22 -0600 Subject: [PATCH 6/6] Re-fixed casing issues --- .../Gen6/Experimental/{OWSE1.designer.cs => OWSE.Designer.cs} | 0 pk3DS/pk3DS.csproj | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pk3DS/Subforms/Gen6/Experimental/{OWSE1.designer.cs => OWSE.Designer.cs} (100%) diff --git a/pk3DS/Subforms/Gen6/Experimental/OWSE1.designer.cs b/pk3DS/Subforms/Gen6/Experimental/OWSE.Designer.cs similarity index 100% rename from pk3DS/Subforms/Gen6/Experimental/OWSE1.designer.cs rename to pk3DS/Subforms/Gen6/Experimental/OWSE.Designer.cs diff --git a/pk3DS/pk3DS.csproj b/pk3DS/pk3DS.csproj index 98dc8f0..83fc6b7 100644 --- a/pk3DS/pk3DS.csproj +++ b/pk3DS/pk3DS.csproj @@ -272,7 +272,7 @@ Form - + RSWE.cs