From b28c707cb5a845ee3eed911adced7dc09747691b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin768@outlook.com>
Date: Fri, 12 Jul 2024 09:02:15 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=95=B4=E5=90=88=E5=8C=85UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionExport.xaml  | 106 +++++++++++-------
 .../PageVersion/PageVersionExport.xaml.vb     |  33 +-----
 2 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index dc77126..6408ab1 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -7,7 +7,13 @@
     PanScroll="{Binding ElementName=PanBack}">
     <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <StackPanel Margin="25,10">
-            <local:MyCard x:Name="CardExport" Margin="0,20,0,15" Title="导出选项">
+
+            <local:MyCard Margin="0,15" Title="">
+                <Grid Margin="10,7" Name="PanDisplayItem" />
+                <TextBlock TextWrapping="Wrap" Margin="0,0,0,4" Text="空白填充" />
+            </local:MyCard>
+
+            <local:MyCard x:Name="CardExport" Margin="0,0,0,15" Title="整合包信息">
                 <StackPanel Margin="25,40,25,21">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -20,49 +26,73 @@
                             <RowDefinition Height="9" />
                             <RowDefinition Height="28" />
                             <RowDefinition Height="9" />
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="9" />
                         </Grid.RowDefinitions>
-                        <TextBlock Grid.Column="0" Grid.Row="0" Text="整合包类型" VerticalAlignment="Center" />
-                        <local:MyComboBox x:Name="ComboExportType" Margin="10,0,0,0" Grid.Column="1" Grid.Row="0">
-                            <local:MyComboBoxItem Content="压缩包" IsSelected="True" />
-                            <local:MyComboBoxItem Content="Modrinth" />
+                        <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="整合包名称" Margin="0,0,25,0" />
+                        <local:MyTextBox Grid.Row="0" x:Name="TbExportName" Grid.ColumnSpan="2" Tag="VersionArgumentTitle" Grid.Column="1" MaxLength="100" />
+                        <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Text="图标" Margin="0,0,25,0"  />
+                        <local:MyComboBox Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="1">
+                            <local:MyComboBoxItem Content="自动" IsSelected="True" Tag="" />
+                            <!-- 此处需要添加一个自定义图标 -->
+                            <local:MyComboBoxItem Content="自定义..." />
+                            <!--x:Name="ItemDisplayLogoCustom"-->
+                            <local:MyComboBoxItem Content="圆石" Tag="pack://application:,,,/images/Blocks/CobbleStone.png" />
+                            <local:MyComboBoxItem Content="命令方块" Tag="pack://application:,,,/images/Blocks/CommandBlock.png" />
+                            <local:MyComboBoxItem Content="金块" Tag="pack://application:,,,/images/Blocks/GoldBlock.png" />
+                            <local:MyComboBoxItem Content="草方块" Tag="pack://application:,,,/images/Blocks/Grass.png" />
+                            <local:MyComboBoxItem Content="草径" Tag="pack://application:,,,/images/Blocks/GrassPath.png" />
+                            <local:MyComboBoxItem Content="铁砧" Tag="pack://application:,,,/images/Blocks/Anvil.png" />
+                            <local:MyComboBoxItem Content="红石块" Tag="pack://application:,,,/images/Blocks/RedstoneBlock.png" />
+                            <local:MyComboBoxItem Content="红石灯（开）" Tag="pack://application:,,,/images/Blocks/RedstoneLampOn.png" />
+                            <local:MyComboBoxItem Content="红石灯（关）" Tag="pack://application:,,,/images/Blocks/RedstoneLampOff.png" />
+                            <local:MyComboBoxItem Content="鸡蛋" Tag="pack://application:,,,/images/Blocks/Egg.png" />
+                            <local:MyComboBoxItem Content="布料（Fabric）" Tag="pack://application:,,,/images/Blocks/Fabric.png" />
+                            <local:MyComboBoxItem Content="狐狸（NeoForge）" Tag="pack://application:,,,/images/Blocks/NeoForge.png" />
                         </local:MyComboBox>
-                        <TextBlock Grid.Column="0" Grid.Row="2" Text="包含存档" VerticalAlignment="Center" />
-                        <local:MyTextBox x:Name="TbExportSave" HintText="不包含存档" ToolTip="在此处填写存档目录名，可以将存档包含在整合包内，留空则不包含存档。" Margin="10,0,0,0" Grid.Column="1" Grid.Row="2" Tag="1" />
-                    </Grid>
-                    <Grid x:Name="GridCompressed">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />
-                            <ColumnDefinition Width="20" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="9" />
-                        </Grid.RowDefinitions>
-                        <local:MyCheckBox x:Name="CheckExportGlobal" Text="导出 PCL 全局设置" Grid.Column="0" Grid.Row="0" Checked="True" />
-                        <local:MyCheckBox x:Name="CheckExportVersion" Text="导出 PCL 版本设置" Grid.Column="2" Grid.Row="0" Checked="True" />
-                    </Grid>
-                    <Grid x:Name="GridModrinth" Visibility="Collapsed">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="60" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="9" />
-                            <RowDefinition Height="28" />
-                            <RowDefinition Height="9" />
-                        </Grid.RowDefinitions>
-                        <TextBlock Text="整合包名称" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" />
-                        <local:MyTextBox x:Name="TbExportName" HintText="" Grid.Column="2" Grid.Row="0" />
-                        <TextBlock Text="整合包版本" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" />
-                        <local:MyTextBox x:Name="TbExportVersion" HintText="1.0.0" Grid.Column="2" Grid.Row="2" />
+                        <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="整合包版本" Margin="0,0,25,0" />
+                        <local:MyTextBox Grid.Row="4" x:Name="TbExportVersion" HintText="1.0.0" Grid.ColumnSpan="2" Tag="VersionArgumentTitle" Grid.Column="1" MaxLength="100" />
                     </Grid>
                     <local:MyButton x:Name="BtnExportExport" HorizontalAlignment="Left" Text="导出整合包" Height="35" Width="150" ColorType="Highlight" />
                 </StackPanel>
             </local:MyCard>
+
+            <local:MyCard x:Name="CardSwitch" Margin="0,0,0,15" Title="基础选择">
+                <StackPanel Margin="25,38,15,15">
+                    <TextBlock Margin="0,1,0,1" Text="你可以在此处勾选需要包含进整合包的文件夹，其他文件夹请前往高级选项添加。" TextWrapping="Wrap" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="18" />
+                            <ColumnDefinition Width="1.0*" />
+                            <ColumnDefinition Width="1.2*" />
+                            <ColumnDefinition Width="1.0*" />
+                            <ColumnDefinition Width="1.0*" />
+                            <ColumnDefinition Width="1.0*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="4" />
+                            <RowDefinition Height="30" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="包含启动器" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="启动器全局配置" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="配置" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="存档" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="材质包" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="光影包" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="光影配置" />
+                    </Grid>
+                </StackPanel>
+                
+            </local:MyCard>
+            <local:MyCard Title="高级选项" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+                <StackPanel Margin="25,40,23,15">
+                    <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="空白填充" />
+                </StackPanel>
+            </local:MyCard>
+
         </StackPanel>
     </local:MyScrollViewer>
 </local:MyPageRight>
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb
index 15c81c7..57e83ff 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
@@ -18,38 +18,9 @@
     End Sub
 
 #Region "控件事件"
-    Private Sub ComboExportType_Change(sender As ComboBox, e As SelectionChangedEventArgs) Handles ComboExportType.SelectionChanged
-        If AniControlEnabled <> 0 Then Exit Sub
-        Type = If(sender.SelectedIndex = 0, ModpackType.Compressed, ModpackType.Modrinth)
-        Select Case Type
-            Case ModpackType.Modrinth
-                If GridCompressed IsNot Nothing Then GridCompressed.Visibility = Visibility.Collapsed
-                If GridModrinth IsNot Nothing Then GridModrinth.Visibility = Visibility.Visible
-            Case ModpackType.Compressed
-                If GridCompressed IsNot Nothing Then GridCompressed.Visibility = Visibility.Visible
-                If GridModrinth IsNot Nothing Then GridModrinth.Visibility = Visibility.Collapsed
-        End Select
-        CardExport.TriggerForceResize()
-    End Sub
 
-    Private Sub BtnExportExport_Click() Handles BtnExportExport.Click
-        If Type = ModpackType.Compressed AndAlso Val(VersionBranchCode) <> 50 Then
-            If MyMsgBox("你当前的 PCL 不是正式版，有二次分发（制作压缩包）的限制。" & vbCrLf &
-                     "请使用正式版再次尝试该操作！" & vbCrLf &
-                     "其他类型的整合包（例如 Modrinth 整合包）没有该限制。", Button1:="下载正式版", Button2:="取消") = 1 Then
-                OpenWebsite("https://afdian.net/p/0164034c016c11ebafcb52540025c377")
-            End If
-            Exit Sub
-        End If
-        Dim savePath As String = SelectAs(
-            "选择导出位置", $"整合包 - {If(String.IsNullOrWhiteSpace(TbExportName.Text), CurrentVersion.Name, TbExportName.Text)}" & If(Type = ModpackType.Modrinth, ".mrpack", ".zip"),
-            If(Type = ModpackType.Modrinth, "Modrinth 整合包(*.mrpack)|*.mrpack", "整合包文件(*.zip)|*.zip"))
-        If String.IsNullOrEmpty(savePath) Then Exit Sub
-        ModpackExport(New ExportOptions(CurrentVersion, savePath, Type, {TbExportSave.Text},
-                                        PCLSetupGlobal:=CheckExportGlobal.Checked,
-                                        PCLSetupVer:=CheckExportVersion.Checked, Name:=TbExportName.Text,
-                                        VerID:=TbExportVersion.Text))
-    End Sub
+
+
 
 #End Region
 

From 465a38163b61c5cdf61fd9bdb9e1744d731f1555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 09:30:12 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=9C=A8=E5=9F=BA=E7=A1=80=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E9=87=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=96=87=E4=BB=B6=E7=9A=84=E9=80=89=E6=8B=A9=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=9F=BA=E7=A1=80=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionExport.xaml  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index 6408ab1..d8b552d 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -59,13 +59,14 @@
 
             <local:MyCard x:Name="CardSwitch" Margin="0,0,0,15" Title="基础选择">
                 <StackPanel Margin="25,38,15,15">
-                    <TextBlock Margin="0,1,0,1" Text="你可以在此处勾选需要包含进整合包的文件夹，其他文件夹请前往高级选项添加。" TextWrapping="Wrap" />
+                    <TextBlock Margin="0,1,0,1" Text="你可以在此处勾选需要包含进整合包的文件或者文件夹，其他文件夹请前往高级选项添加。" TextWrapping="Wrap" />
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="18" />
+                            <ColumnDefinition Width="1.4*" />
+                            <ColumnDefinition Width="1.6*" />
                             <ColumnDefinition Width="1.0*" />
-                            <ColumnDefinition Width="1.2*" />
                             <ColumnDefinition Width="1.0*" />
                             <ColumnDefinition Width="1.0*" />
                             <ColumnDefinition Width="1.0*" />
@@ -73,15 +74,19 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="4" />
                             <RowDefinition Height="30" />
+                            <RowDefinition Height="30" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="包含启动器" />
                         <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="启动器全局配置" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="配置" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="存档" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="材质包" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="光影包" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="光影配置" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="光影配置" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="服务器文件" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="配置" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="存档" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="材质包" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="7" Text="光影包" />
+
+
                     </Grid>
                 </StackPanel>
                 

From c4974bbf5a0141dd102688fceede44d0ed023ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 09:31:03 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index d8b552d..a43888a 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -85,8 +85,6 @@
                         <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="存档" />
                         <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="材质包" />
                         <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="7" Text="光影包" />
-
-
                     </Grid>
                 </StackPanel>
                 

From 82c398dee0f0fc37a7d3e160abddf363bd6a3662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 10:30:57 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionExport.xaml  | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index a43888a..72513c7 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -28,6 +28,7 @@
                             <RowDefinition Height="9" />
                             <RowDefinition Height="28" />
                             <RowDefinition Height="9" />
+                            <RowDefinition Height="6" />
                         </Grid.RowDefinitions>
                         <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="整合包名称" Margin="0,0,25,0" />
                         <local:MyTextBox Grid.Row="0" x:Name="TbExportName" Grid.ColumnSpan="2" Tag="VersionArgumentTitle" Grid.Column="1" MaxLength="100" />
@@ -57,7 +58,7 @@
                 </StackPanel>
             </local:MyCard>
 
-            <local:MyCard x:Name="CardSwitch" Margin="0,0,0,15" Title="基础选择">
+            <local:MyCard x:Name="CardSwitch" Margin="0,0,0,15" Title="基础选项">
                 <StackPanel Margin="25,38,15,15">
                     <TextBlock Margin="0,1,0,1" Text="你可以在此处勾选需要包含进整合包的文件或者文件夹，其他文件夹请前往高级选项添加。" TextWrapping="Wrap" />
                     <Grid>
@@ -65,8 +66,8 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="18" />
                             <ColumnDefinition Width="1.4*" />
-                            <ColumnDefinition Width="1.6*" />
-                            <ColumnDefinition Width="1.0*" />
+                            <ColumnDefinition Width="1.7*" />
+                            <ColumnDefinition Width="1.3*" />
                             <ColumnDefinition Width="1.0*" />
                             <ColumnDefinition Width="1.0*" />
                             <ColumnDefinition Width="1.0*" />
@@ -77,22 +78,29 @@
                             <RowDefinition Height="30" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="包含启动器" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="启动器全局配置" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="光影配置" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="服务器文件" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="配置" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="存档" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="材质包" />
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="7" Text="光影包" />
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="包含启动器"
+                                          ToolTip="勾选将pcl2包含在整合包内"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="启动器全局配置"
+                                          ToolTip="勾选将启动器的全局配置包含在整合包内"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="服务器文件"
+                                          ToolTip="server.dat文件"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="模组配置"
+                                          ToolTip="config文件夹"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="游戏配置"
+                                          ToolTip="options.txt文件"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="存档"
+                                          ToolTip="默认包含整个存档文件夹"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="材质包"
+                                          ToolTip="默认包含整个材质包文件夹"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="7" Text="光影包"
+                                          ToolTip="默认包含整个光影包文件夹"/>
                     </Grid>
                 </StackPanel>
                 
             </local:MyCard>
             <local:MyCard Title="高级选项" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
                 <StackPanel Margin="25,40,23,15">
-                    <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
-                    Text="空白填充" />
+                    <TextBlock TextWrapping="Wrap" Margin="0,0,0,4" Text="空白填充" />
                 </StackPanel>
             </local:MyCard>
 

From bc5b37cce5f8fd4fa3bf74108b7f4d09f1cac0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 10:43:58 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index 72513c7..f20bd32 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -60,7 +60,7 @@
 
             <local:MyCard x:Name="CardSwitch" Margin="0,0,0,15" Title="基础选项">
                 <StackPanel Margin="25,38,15,15">
-                    <TextBlock Margin="0,1,0,1" Text="你可以在此处勾选需要包含进整合包的文件或者文件夹，其他文件夹请前往高级选项添加。" TextWrapping="Wrap" />
+                    <TextBlock Margin="0,1,0,1" Text="你可以在此勾选需要包含进整合包的文件或者文件夹，其他文件或者文件夹在高级选项添加。" TextWrapping="Wrap" />
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />

From 1284f464c10955b35db651d17793a4cc74d4a4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 10:56:23 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B4=E5=90=88=E5=8C=85=E2=80=9D=E7=9A=84?=
 =?UTF-8?q?=E5=92=8C=E8=BE=B9=E7=95=8C=E7=9A=84=E8=B7=9D=E7=A6=BB=EF=BC=8C?=
 =?UTF-8?q?21=E6=94=B9=E4=B8=BA20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index f20bd32..56cea77 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -14,7 +14,7 @@
             </local:MyCard>
 
             <local:MyCard x:Name="CardExport" Margin="0,0,0,15" Title="整合包信息">
-                <StackPanel Margin="25,40,25,21">
+                <StackPanel Margin="25,40,25,20">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />

From a1b98308d4608e663f1ef71f088ffd6c4e035ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 11:11:19 +0800
Subject: [PATCH 7/8] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E2=80=9C=E5=AF=BC=E5=87=BA=E6=95=B4=E5=90=88=E5=8C=85=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E5=92=8C=E8=BE=B9=E7=95=8C=E7=9A=84=E8=B7=9D=E7=A6=BB?=
 =?UTF-8?q?=EF=BC=8C21=E6=94=B9=E4=B8=BA20"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1284f464c10955b35db651d17793a4cc74d4a4aa.
---
 Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index 56cea77..f20bd32 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -14,7 +14,7 @@
             </local:MyCard>
 
             <local:MyCard x:Name="CardExport" Margin="0,0,0,15" Title="整合包信息">
-                <StackPanel Margin="25,40,25,20">
+                <StackPanel Margin="25,40,25,21">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />

From 6850cd6764f74be61619051391e0c7e514615ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=8B=E6=B7=8B=20=E8=90=BD?= <luolinlin736@outlook.com>
Date: Fri, 12 Jul 2024 13:17:33 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9C?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=90=AF=E5=8A=A8=E5=99=A8=E2=80=9D=E5=92=8C?=
 =?UTF-8?q?=E2=80=9C=E5=90=AF=E5=8A=A8=E5=99=A8=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E2=80=9D=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionExport.xaml  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index f20bd32..1951ffe 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -78,22 +78,22 @@
                             <RowDefinition Height="30" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="包含启动器"
-                                          ToolTip="勾选将pcl2包含在整合包内"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="启动器全局配置"
-                                          ToolTip="勾选将启动器的全局配置包含在整合包内"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="服务器文件"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" Text="服务器文件"
                                           ToolTip="server.dat文件"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="模组配置"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="3" Text="模组配置"
                                           ToolTip="config文件夹"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="4" Text="游戏配置"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="4" Text="游戏配置"
                                           ToolTip="options.txt文件"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="5" Text="存档"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="5" Text="存档"
                                           ToolTip="默认包含整个存档文件夹"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="6" Text="材质包"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="6" Text="材质包"
                                           ToolTip="默认包含整个材质包文件夹"/>
-                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="7" Text="光影包"
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="1" Grid.Column="7" Text="光影包"
                                           ToolTip="默认包含整个光影包文件夹"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="2" Text="包含启动器"
+                                          ToolTip="勾选将pcl2包含在整合包内"/>
+                        <local:MyCheckBox Height="22" VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" Text="启动器全局配置"
+                                          ToolTip="勾选将启动器的全局配置包含在整合包内"/>
                     </Grid>
                 </StackPanel>