Merge branch 'master' into new-palette-formats

PixiEditor · May 5, 2023 · 29a8f38 · 29a8f38
2 parents 2232eec + ae24c35
commit 29a8f38
Show file tree

Hide file tree

Showing 11 changed files with 536 additions and 603 deletions.
diff --git a/README.md b/README.md
@@ -22,8 +22,7 @@ Want to create beautiful pixel art for your games? PixiEditor can help you! Our
 
 Have you ever used Photoshop or Gimp? Reinventing the wheel is unnecessary, we wanted users to get familiar with the tool quickly and with ease. 
 
-![](https://user-images.githubusercontent.com/45312141/146670495-ae521a18-a89e-4e94-9317-6838b51407fa.png)
-
+![](https://user-images.githubusercontent.com/45312141/235351211-e00bcaea-9c63-4ecd-a2ee-e4fb2b2c9651.png)
 
 ### Fast
 

diff --git a/src/ChunkyImageLib/ChunkyImageLib.csproj b/src/ChunkyImageLib/ChunkyImageLib.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj b/src/PixiEditor.ChangeableDocument/PixiEditor.ChangeableDocument.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj b/src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj
@@ -7,6 +7,7 @@
         <LangVersion>10</LangVersion>
         <Configurations>Debug;Release;Steam;DevRelease</Configurations>
         <Platforms>AnyCPU;x64;x86</Platforms>
+      <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj b/src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj
@@ -6,6 +6,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Configurations>Debug;Release;Steam;DevRelease</Configurations>
         <Platforms>AnyCPU;x64;x86</Platforms>
+      <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.MSIX/Package.appxmanifest b/src/PixiEditor.MSIX/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="56069PixiEditorOrganizati.PixiEditor"
     Publisher="CN=0AFA75AD-56A3-481D-B5E4-D3C6274DD38A"
-    Version="1.0.0.0" />
+    Version="1.0.3.0" />
 
   <Properties>
     <DisplayName>PixiEditor</DisplayName>

diff --git a/src/PixiEditor.MSIX/PixiEditor.MSIX.wapproj b/src/PixiEditor.MSIX/PixiEditor.MSIX.wapproj
@@ -59,7 +59,7 @@
     <PackageCertificateKeyFile>PixiEditor.MSIX_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>

diff --git a/src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj b/src/PixiEditor.UpdateModule/PixiEditor.UpdateModule.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>net7.0</TargetFramework>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">

diff --git a/src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj b/src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj
@@ -7,6 +7,7 @@
     <WarningsAsErrors>Nullable</WarningsAsErrors>
     <Configurations>Debug;Release;Steam;DevRelease</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam|AnyCPU'">