LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-24 23:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3dSkinRenderer

Browse Source
This commit is contained in:
miku-666
2024-05-01 19:26:38 +02:00
parent 02eec26996 a570f99b44
commit 91c667bad0
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PCK-Studio/Features/CemuPanel.Designer.cs → PCK-Studio/Forms/Features/CemuPanel.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio.Features
namespace PckStudio.Forms.Features
{
partial class CemuPanel
{

2
PCK-Studio/Features/CemuPanel.cs → PCK-Studio/Forms/Features/CemuPanel.cs
View File

@@ -24,7 +24,7 @@ using PckStudio.Extensions;
using PckStudio.Classes.Misc;
using System.Diagnostics;
namespace PckStudio.Features
namespace PckStudio.Forms.Features
{
/// <summary>
/// Wishlist:

0
PCK-Studio/Features/CemuPanel.resx → PCK-Studio/Forms/Features/CemuPanel.resx
View File

2
PCK-Studio/Features/PckManager.Designer.cs → PCK-Studio/Forms/Features/PckManager.Designer.cs generated
View File

@@ -1,4 +1,4 @@
namespace PckStudio.Features
namespace PckStudio.Forms.Features
{
partial class PckManager
{

2
PCK-Studio/Features/PckManager.cs → PCK-Studio/Forms/Features/PckManager.cs
View File

@@ -18,7 +18,7 @@
using System;
using System.Windows.Forms;
namespace PckStudio.Features
namespace PckStudio.Forms.Features
{
public partial class PckManager : MetroFramework.Forms.MetroForm
{

0
PCK-Studio/Features/PckManager.resx → PCK-Studio/Forms/Features/PckManager.resx
View File

2
PCK-Studio/MainForm.cs
View File

@@ -25,7 +25,7 @@ using PckStudio.Classes.Misc;
using PckStudio.Internal.IO.PckAudio;
using PckStudio.Internal.IO._3DST;
using PckStudio.Internal;
using PckStudio.Features;
using PckStudio.Forms.Features;
using PckStudio.Extensions;
using PckStudio.Popups;
using PckStudio.Classes.Utils;

12
PCK-Studio/PckStudio.csproj
View File

@@ -262,10 +262,10 @@
<Compile Include="Extensions\ImageExtensions.cs" />
<Compile Include="Internal\SkinANIM.cs" />
<Compile Include="Classes\Misc\RichPresenceClient.cs" />
<Compile Include="Features\CemuPanel.cs">
<Compile Include="Forms\Features\CemuPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Features\CemuPanel.Designer.cs">
<Compile Include="Forms\Features\CemuPanel.Designer.cs">
<DependentUpon>CemuPanel.cs</DependentUpon>
</Compile>
<Compile Include="Internal\IO\TGA\TGAFileData.cs" />
@@ -399,10 +399,10 @@
<Compile Include="Forms\Editor\BoxEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Features\PckManager.cs">
<Compile Include="Forms\Features\PckManager.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Features\PckManager.Designer.cs">
<Compile Include="Forms\Features\PckManager.Designer.cs">
<DependentUpon>PckManager.cs</DependentUpon>
</Compile>
<Compile Include="Forms\Editor\BoxEditor.Designer.cs">
@@ -460,7 +460,7 @@
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Internal\IO\3DST\TextureCodec.cs" />
<EmbeddedResource Include="Features\CemuPanel.resx">
<EmbeddedResource Include="Forms\Features\CemuPanel.resx">
<DependentUpon>CemuPanel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Additional-Popups\EntityForms\AddEntry.resx">
@@ -546,7 +546,7 @@
<EmbeddedResource Include="Forms\Additional-Popups\InProgressPrompt.resx">
<DependentUpon>InProgressPrompt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Features\PckManager.resx">
<EmbeddedResource Include="Forms\Features\PckManager.resx">
<DependentUpon>PckManager.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\Editor\BoxEditor.resx">