Merge branch 'master' into dev

PixiEditor/PixiEditor.csproj

@@ -1,52 +1,57 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <AssemblyName>PixiEditor</AssemblyName>
-    <RootNamespace>PixiEditor</RootNamespace>
-    <PackageProjectUrl>https://github.com/flabbet/PixiEditor</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/flabbet/PixiEditor</RepositoryUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Images\SwapArrows.png" />
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Expression.Blend.Sdk">
-      <Version>1.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="Extended.Wpf.Toolkit">
-      <Version>3.8.1</Version>
-    </PackageReference>
-    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="WriteableBitmapEx">
-      <Version>1.6.5</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\BucketImage.png" />
-    <Resource Include="Images\CircleImage.png" />
-    <Resource Include="Images\Cross.png" />
-    <Resource Include="Images\EarserImage.png" />
-    <Resource Include="Images\LightenImage.png" />
-    <Resource Include="Images\LineImage.png" />
-    <Resource Include="Images\PenImage.png" />
-    <Resource Include="Images\PipetteImage.png" />
-    <Resource Include="Images\RectangleImage.png" />
-    <Resource Include="Images\SwapArrows.png" />
-    <Resource Include="Images\transparentbg.png" />
-  </ItemGroup>
-  
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <AssemblyName>PixiEditor</AssemblyName>
+    <RootNamespace>PixiEditor</RootNamespace>
+    <RepositoryUrl>https://github.com/flabbet/PixiEditor</RepositoryUrl>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Images\SwapArrows.png" />
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Expression.Blend.Sdk">
+      <Version>1.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="Extended.Wpf.Toolkit">
+      <Version>3.8.1</Version>
+    </PackageReference>
+    <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="WriteableBitmapEx">
+      <Version>1.6.5</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\BucketImage.png" />
+    <Resource Include="Images\CircleImage.png" />
+    <Resource Include="Images\Cross.png" />
+    <Resource Include="Images\EarserImage.png" />
+    <Resource Include="Images\LightenImage.png" />
+    <Resource Include="Images\LineImage.png" />
+    <Resource Include="Images\PenImage.png" />
+    <Resource Include="Images\PipetteImage.png" />
+    <Resource Include="Images\RectangleImage.png" />
+    <Resource Include="Images\SwapArrows.png" />
+    <Resource Include="Images\transparentbg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+  
 </Project>

PixiEditor/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PixiEditor")]
-[assembly: AssemblyCopyright("Copyright © Krzysztof Krysiński 2018 -2020")]
+[assembly: AssemblyCopyright("Copyright Krzysztof Krysiński © 2018 - 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,6 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
+
 [assembly: AssemblyVersion("0.0.3.1")]
 [assembly: AssemblyFileVersion("0.0.3.1")]

README.md

@@ -3,7 +3,7 @@
 # PixiEditor
 Pixi is lightweighted pixel art creator.
 
-![ss](https://user-images.githubusercontent.com/25402427/46804050-fb832d80-cd61-11e8-9df6-f9fafd3fa354.jpg)
+![screenshot](https://raw.githubusercontent.com/flabbet/PixiEditor/master/screenshot.png)
 
 ## Getting started with Pixi