Merge branch 'main' into 3dSkinRenderer

This commit is contained in:
miku-666
2024-06-28 21:53:14 +02:00
2 changed files with 14 additions and 14 deletions

View File

@@ -304,6 +304,7 @@
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.buttonCape);
this.Controls.Add(this.buttonAnimGen);
this.Controls.Add(this.capeLabel);
this.Controls.Add(this.textThemeName);
@@ -314,7 +315,6 @@
this.Controls.Add(this.radioButtonAuto);
this.Controls.Add(this.buttonDone);
this.Controls.Add(this.buttonModelGen);
this.Controls.Add(this.buttonCape);
this.Controls.Add(this.buttonSkin);
this.Controls.Add(this.capePictureBox);
this.Controls.Add(this.skinPictureBox);

View File

@@ -298,7 +298,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonDone.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="buttonModelGen.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 259</value>
@@ -322,7 +322,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonModelGen.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="buttonCape.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Center</value>
@@ -349,7 +349,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonCape.ZOrder" xml:space="preserve">
<value>12</value>
<value>0</value>
</data>
<data name="buttonSkin.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
<value>Center</value>
@@ -424,7 +424,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;radioButtonAuto.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="radioButtonManual.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -451,7 +451,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;radioButtonManual.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="resource.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
@@ -490,7 +490,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textSkinID.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="resource.Image1" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
@@ -529,7 +529,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textSkinName.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="resource.Image2" type="System.Resources.ResXNullRef, System.Windows.Forms">
<value />
@@ -568,7 +568,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;textThemeName.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="labelSelectTexture.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -601,7 +601,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;labelSelectTexture.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="capeLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -637,7 +637,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;capeLabel.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="buttonAnimGen.Location" type="System.Drawing.Point, System.Drawing">
<value>108, 259</value>
@@ -661,7 +661,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;buttonAnimGen.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="capePictureBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
@@ -688,7 +688,7 @@
<value>capePictureBox</value>
</data>
<data name="&gt;&gt;capePictureBox.Type" xml:space="preserve">
<value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;capePictureBox.Parent" xml:space="preserve">
<value>$this</value>
@@ -718,7 +718,7 @@
<value>skinPictureBox</value>
</data>
<data name="&gt;&gt;skinPictureBox.Type" xml:space="preserve">
<value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>PckStudio.ToolboxItems.InterpolationPictureBox, PCK-Studio, Version=7.0.0.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;skinPictureBox.Parent" xml:space="preserve">
<value>$this</value>