Merge branch main into '3dSkinRenderer'

This commit is contained in:
miku-666
2024-08-23 17:27:24 +02:00
3 changed files with 2 additions and 7 deletions

View File

@@ -6,7 +6,7 @@ using Newtonsoft.Json;
using PckStudio.Internal.Json;
using PckStudio.Properties;
namespace PckStudio.Internal
namespace PckStudio.Internal.App
{
internal static class Updater
{

View File

@@ -153,6 +153,7 @@
</Compile>
<Compile Include="Extensions\OpenTkMatrixExtensions.cs" />
<Compile Include="Interfaces\IModelImportProvider.cs" />
<Compile Include="Internal\App\Updater.cs" />
<Compile Include="Internal\GameModelInfo.cs" />
<Compile Include="Internal\IO\PSM\PSMFileReader.cs" />
<Compile Include="Internal\IO\PSM\PSMFileWriter.cs" />
@@ -195,7 +196,6 @@
<Compile Include="Internal\Serializer\ImageSerializer.cs" />
<Compile Include="Internal\Skin\SkinAnimFlag.cs" />
<Compile Include="Internal\Skin\SkinAnimMask.cs" />
<Compile Include="Internal\Updater.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

View File

@@ -1,14 +1,9 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using PckStudio.Internal.Misc;
using PckStudio.Internal;
using PckStudio.Properties;
using PckStudio.Internal.App;
using AutoUpdaterDotNET;
using Newtonsoft.Json;
namespace PckStudio