From b18c6d5714983140351b7fbaf80b6e65544f07e6 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 4 Jul 2024 03:04:56 -0400
Subject: [PATCH 01/13] bump

---
 FFXIV_TexTools/FFXIV_TexTools.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index 36356759..4de0f8a4 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,8 +23,8 @@
     <AssemblyTitle>FFXIV_TexTools</AssemblyTitle>
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>3.0.2.7</AssemblyVersion>
-    <FileVersion>3.0.2.7</FileVersion>
+    <AssemblyVersion>3.0.2.8</AssemblyVersion>
+    <FileVersion>3.0.2.8</FileVersion>
     <LangVersion>9.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>

From bd7147a9c2498cbcd2ec294f3d84ee6741e3e2c1 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 4 Jul 2024 18:35:57 -0400
Subject: [PATCH 02/13] Change "Material Set" to "Material Version" in all
 cases for clarity.

---
 FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml            | 4 ++--
 FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml.cs         | 4 ++--
 FFXIV_TexTools/Views/Controls/ItemSelectControl.xaml.cs       | 1 -
 FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs | 2 +-
 FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs             | 2 +-
 .../Views/MaterialEditor/MaterialEditorHelpView.xaml          | 4 ++--
 FFXIV_TexTools/Views/Metadata/ImcControl.xaml                 | 2 +-
 FFXIV_TexTools/Views/Metadata/ImcVariantEditor.xaml           | 2 +-
 lib/xivModdingFramework                                       | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml b/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml
index 57825ed1..76ad153e 100644
--- a/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml
+++ b/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml
@@ -29,7 +29,7 @@
             <TextBlock x:Name="SetLabel" Text="Set: e0123" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             <TextBlock x:Name="SlotLabel" Text="Slot: Head(met)" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             <TextBlock x:Name="VariantLabel" Text="Variant: 5" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            <TextBlock x:Name="MaterialSetLabel" Text="Material Set: 3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <TextBlock x:Name="MaterialSetLabel" Text="Material Version: 3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </UniformGrid>
         <GroupBox Grid.Row="2" Grid.RowSpan="3" Header="Race Information">
             <Grid x:Name="RacialGrid">
@@ -51,7 +51,7 @@
         <GroupBox Grid.Column="1" Grid.Row="2" Header="Items in Variant (Identical Items)">
             <ListBox x:Name="SameVariantBox"></ListBox>
         </GroupBox>
-        <GroupBox Grid.Column="1" Grid.Row="3" Header="Items with same Material Set">
+        <GroupBox Grid.Column="1" Grid.Row="3" Header="Items with same Material Version">
             <ListBox x:Name="SameMaterialBox"></ListBox>
         </GroupBox>
         <GroupBox Grid.Column="1" Grid.Row="4" Header="Items with same Model">
diff --git a/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml.cs b/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml.cs
index 04a23a63..e42508eb 100644
--- a/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml.cs
+++ b/FFXIV_TexTools/Views/Controls/ItemInfoDisplay.xaml.cs
@@ -128,10 +128,10 @@ public async Task AsyncInit()
             var mSet = await Imc.GetMaterialSetId(_item, false, tx);
             if (mSet > 0)
             {
-                MaterialSetLabel.Text = $"Material Set: {mSet._()}".L();
+                MaterialSetLabel.Text = $"Material Version: {mSet._()}".L();
             } else
             {
-                MaterialSetLabel.Text = $"Material Set: --".L();
+                MaterialSetLabel.Text = $"Material Version: --".L();
             }
 
             var races = XivRaces.PlayableRaces;
diff --git a/FFXIV_TexTools/Views/Controls/ItemSelectControl.xaml.cs b/FFXIV_TexTools/Views/Controls/ItemSelectControl.xaml.cs
index aaf4519e..cd42c442 100644
--- a/FFXIV_TexTools/Views/Controls/ItemSelectControl.xaml.cs
+++ b/FFXIV_TexTools/Views/Controls/ItemSelectControl.xaml.cs
@@ -648,7 +648,6 @@ private void CategoryTree_Selected(object sender, System.Windows.RoutedPropertyC
                 return;
             }
 
-
             if (RawItemSelected != null) {
                 RawItemSelected.Invoke(item, element.Root);
             }
diff --git a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
index 056632c1..33142635 100644
--- a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
@@ -814,7 +814,7 @@ public override bool HasAdditionalSaveFunctions()
                 enabled = true;
             }
 
-            list.Add(("Save to all Material Sets".L(), SaveAllVersions, enabled));
+            list.Add(("Save to all Material Versions".L(), SaveAllVersions, enabled));
 
             return list;
         }
diff --git a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
index 4e364b6f..df74b1f9 100644
--- a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
+++ b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
@@ -699,7 +699,7 @@ private async Task SetItemName(ModTransaction tx)
                 var mSetId = await Imc.GetMaterialSetId(asIm, false, tx);
                 if (mSetId >= 0)
                 {
-                    variantString += "/Material Set " + mSetId;
+                    variantString += "/Material Version " + mSetId;
                 }
             }
 
diff --git a/FFXIV_TexTools/Views/MaterialEditor/MaterialEditorHelpView.xaml b/FFXIV_TexTools/Views/MaterialEditor/MaterialEditorHelpView.xaml
index 03df00ab..85398968 100644
--- a/FFXIV_TexTools/Views/MaterialEditor/MaterialEditorHelpView.xaml
+++ b/FFXIV_TexTools/Views/MaterialEditor/MaterialEditorHelpView.xaml
@@ -38,9 +38,9 @@
             <TextBlock Text="{}{shared_folder}" TextAlignment="Right" FontWeight="Bold" FontSize="14" FontStyle="Italic" />
         </Label>
         <TextBlock Margin="10" Grid.Row="4" TextWrapping="Wrap" Grid.Column="1"><Run Text="The common folder shared "/><Run FontStyle="Italic" Text="by ALL"/><Run Text=" items in FFXIV."/></TextBlock>
-        <TextBlock Margin="10" Grid.Row="5" TextWrapping="Wrap" Text="The item's Material Set/Version #, ex [v01, v05, v12]" Grid.Column="1" />
+        <TextBlock Margin="10" Grid.Row="5" TextWrapping="Wrap" Text="The item's Material Version #, ex [v01, v05, v12]" Grid.Column="1" />
         <Label Margin="10" Grid.Row="5" HorizontalContentAlignment="Right" FontSize="12" VerticalContentAlignment="Center">
-            <TextBlock Text="{}{variant}" TextAlignment="Right" FontWeight="Bold" FontSize="14" FontStyle="Italic" />
+            <TextBlock Text="{}{version}" TextAlignment="Right" FontWeight="Bold" FontSize="14" FontStyle="Italic" />
         </Label>
         <TextBlock Margin="10" Grid.Row="6" TextWrapping="Wrap" Text="Paths may only contain lowercase characters, numbers, tokens and &#xA;the following special characters: /.-_" Grid.ColumnSpan="2" TextAlignment="Center"/>
     </Grid>
diff --git a/FFXIV_TexTools/Views/Metadata/ImcControl.xaml b/FFXIV_TexTools/Views/Metadata/ImcControl.xaml
index ad4c5636..4f5e4a45 100644
--- a/FFXIV_TexTools/Views/Metadata/ImcControl.xaml
+++ b/FFXIV_TexTools/Views/Metadata/ImcControl.xaml
@@ -51,7 +51,7 @@
                     <ColumnDefinition Width="1*"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
-                <Label Content="Material Set:" Margin="0" FontSize="16" Grid.Row="0" HorizontalContentAlignment="Right" VerticalContentAlignment="Center"/>
+                <Label Content="Material Ver:" Margin="0" FontSize="16" Grid.Row="0" HorizontalContentAlignment="Right" VerticalContentAlignment="Center"/>
                 <ComboBox x:Name="MaterialSetBox" Grid.Row="0" Grid.Column="1" Margin="5" />
                 <Button Grid.Row="0" x:Name="AddMaterialSetButton" Margin="0" VerticalAlignment="Center" Click="AddMaterialSetButton_Click" Grid.Column="2" HorizontalAlignment="Left" FontSize="10" Panel.ZIndex="100">
                     <iconPacks:PackIconFontAwesome  Kind="PlusSolid" Height="12"/>
diff --git a/FFXIV_TexTools/Views/Metadata/ImcVariantEditor.xaml b/FFXIV_TexTools/Views/Metadata/ImcVariantEditor.xaml
index 5341d5e3..e7b1d977 100644
--- a/FFXIV_TexTools/Views/Metadata/ImcVariantEditor.xaml
+++ b/FFXIV_TexTools/Views/Metadata/ImcVariantEditor.xaml
@@ -22,7 +22,7 @@
             <ColumnDefinition Width="200"/>
         </Grid.ColumnDefinitions>
 
-        <Label Grid.Row="0" Grid.Column="0" Content="Material Set:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
+        <Label Grid.Row="0" Grid.Column="0" Content="Material Ver:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
         <Label Grid.Row="1" Grid.Column="0" Content="Decal ID:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
         <Label Grid.Row="2" Grid.Column="0" Content="Sound ID:" HorizontalAlignment="Right" VerticalAlignment="Center"></Label>
 
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 3d1cbde6..82d8aa1b 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 3d1cbde65307c22ecb7df6a5b0da40f8a7eecd6d
+Subproject commit 82d8aa1b220ea31692fb6877d449fc0c5d0514fe

From 07e0972f3a3ffff1af0eb07e73d5aa72467e013b Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 4 Jul 2024 19:27:12 -0400
Subject: [PATCH 03/13] Add dawntrail upgrade help info.

---
 FFXIV_TexTools/MainWindow.xaml                |   1 +
 FFXIV_TexTools/MainWindow.xaml.cs             |   7 +
 .../Controls/DawntTrailUpgradeDisclaimer.xaml | 154 ++++++++++++++++++
 .../DawntTrailUpgradeDisclaimer.xaml.cs       |  28 ++++
 .../Upgrades/DawntrailUpgradeHelpWindow.xaml  |  15 ++
 .../DawntrailUpgradeHelpWindow.xaml.cs        |  27 +++
 lib/xivModdingFramework                       |   2 +-
 7 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml
 create mode 100644 FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml.cs
 create mode 100644 FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml
 create mode 100644 FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml.cs

diff --git a/FFXIV_TexTools/MainWindow.xaml b/FFXIV_TexTools/MainWindow.xaml
index 734d5d12..6b113c44 100644
--- a/FFXIV_TexTools/MainWindow.xaml
+++ b/FFXIV_TexTools/MainWindow.xaml
@@ -92,6 +92,7 @@
                 </MenuItem>
 
                 <MenuItem Header="Dawntrail Upgrades">
+                    <MenuItem Header="About Upgrades" Click="AboutUpgrades_Click"/>
                     <MenuItem Header="Upgrade Modpack" Click="UpdateModpack_Click"/>
                     <MenuItem Header="Index Texture Creator" Click="IndexTextureCreator_Click"/>
                     <MenuItem Header="Hair Texture Converter" Click="HairTextureConverter_Click"/>
diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
index d55fbf35..adf416e8 100644
--- a/FFXIV_TexTools/MainWindow.xaml.cs
+++ b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -28,6 +28,7 @@
 using FFXIV_TexTools.Views.Simple;
 using FFXIV_TexTools.Views.Textures;
 using FFXIV_TexTools.Views.Transactions;
+using FFXIV_TexTools.Views.Upgrades;
 using FFXIV_TexTools.Views.Wizard;
 using FolderSelect;
 using ForceUpdateAssembly;
@@ -2097,5 +2098,11 @@ private void IrisDiffuseCreator_Click(object sender, RoutedEventArgs e)
             EyeDiffuseCreator.ShowWindow(this);
 
         }
+
+        private void AboutUpgrades_Click(object sender, RoutedEventArgs e)
+        {
+            var wind = new DawntrailUpgradeHelpWindow() { Owner = this };
+            wind.Show();
+        }
     }
 }
diff --git a/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml b/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml
new file mode 100644
index 00000000..b297d1d9
--- /dev/null
+++ b/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml
@@ -0,0 +1,154 @@
+<UserControl x:Class="FFXIV_TexTools.Views.Controls.DawntTrailUpgradeDisclaimer"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:FFXIV_TexTools.Views.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="80"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+
+            <Label HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" FontStyle="Italic">
+                Dawntrail Upgrade Disclaimer
+            </Label>
+            
+            <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontStyle="Italic" TextAlignment="Center">
+                Dawntrail upgrades are not perfect 1:1 translations, and do not affect all mod types.
+                <LineBreak/>The following is a list of different mod types, and how they will be affected.
+            </TextBlock>
+            
+            <Grid x:Name="TypesGrid" Grid.Row="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                    <RowDefinition Height="35"/>
+                </Grid.RowDefinitions>
+
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="0" HorizontalAlignment="Center" FontWeight="Bold">Mod Type</Label>
+                        <Label Grid.Column="1" Grid.Row="0" HorizontalAlignment="Center" FontWeight="Bold">Estimated Success</Label>
+                        <Label Grid.Column="2" Grid.Row="0" HorizontalAlignment="Center" FontWeight="Bold">Notes</Label>
+                    </Grid>
+                </Border>
+
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="1">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right">Monster/Minion/Mount:</Label>
+                        <Label Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" Foreground="Green">~99%+</Label>
+                        <Label Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic"></Label>
+                    </Grid>
+                </Border>
+
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="2">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="1" HorizontalAlignment="Right">Equipment:</Label>
+                        <Label Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" Foreground="Green">~90-95%</Label>
+                        <Label Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Texture-only mods are not upgraded, but may still work in some cases.</Label>
+                    </Grid>
+                </Border>
+                
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="3">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right">Hair:</Label>
+                        <Label Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Foreground="Green">~90%+</Label>
+                        <Label Grid.Column="2" Grid.Row="2" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Single-texture mods are not upgraded.</Label>
+
+                    </Grid>
+                </Border>
+                
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="4">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="3" HorizontalAlignment="Right">Iris/Eyes:</Label>
+                        <Label Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" Foreground="DarkOrange">~60-75%</Label>
+                        <Label Grid.Column="2" Grid.Row="3" HorizontalAlignment="Left" Foreground="DarkOrange" FontStyle="Italic">ALUM and Catchlight Mods cannot be upgraded.</Label>
+
+                    </Grid>
+                </Border>
+                
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="5">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right">Faces:</Label>
+                        <Label Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red">0%</Label>
+                        <Label Grid.Column="2" Grid.Row="4" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">Must be manually updated.</Label>
+
+                    </Grid>
+                </Border>
+
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="5" HorizontalAlignment="Right">Body Textures:</Label>
+                        <Label Grid.Column="1" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red">0%</Label>
+                        <Label Grid.Column="2" Grid.Row="5" HorizontalAlignment="Left" Foreground="Red" FontStyle="Italic">Must be manually updated. *Tattoo mods may be OK in some cases.</Label>
+
+                    </Grid>
+                </Border>
+
+                <Border BorderBrush="Gray" BorderThickness="1" Margin="2" Padding="2" Grid.Row="7">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right">Other Mods:</Label>
+                        <Label Grid.Column="1" Grid.Row="6" HorizontalAlignment="Left" Foreground="Gray">N/A</Label>
+                        <Label Grid.Column="2" Grid.Row="6" HorizontalAlignment="Left" Foreground="Gray" FontStyle="Italic">Other mods do not need to use this tool.</Label>
+
+                    </Grid>
+                </Border>
+            </Grid>
+
+
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml.cs b/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml.cs
new file mode 100644
index 00000000..a19710e5
--- /dev/null
+++ b/FFXIV_TexTools/Views/Controls/DawntTrailUpgradeDisclaimer.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace FFXIV_TexTools.Views.Controls
+{
+    /// <summary>
+    /// Interaction logic for DawntTrailUpgradeDisclaimer.xaml
+    /// </summary>
+    public partial class DawntTrailUpgradeDisclaimer : UserControl
+    {
+        public DawntTrailUpgradeDisclaimer()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml b/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml
new file mode 100644
index 00000000..4ff34993
--- /dev/null
+++ b/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml
@@ -0,0 +1,15 @@
+<Window x:Class="FFXIV_TexTools.Views.Upgrades.DawntrailUpgradeHelpWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:FFXIV_TexTools.Views.Upgrades"
+        xmlns:controls="clr-namespace:FFXIV_TexTools.Views.Controls"
+        mc:Ignorable="d"
+        Title="Dawntrail Upgrade Disclaimer" Height="450" Width="800">
+    <Grid>
+        <controls:DawntTrailUpgradeDisclaimer>
+            
+        </controls:DawntTrailUpgradeDisclaimer>
+    </Grid>
+</Window>
diff --git a/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml.cs
new file mode 100644
index 00000000..f0335226
--- /dev/null
+++ b/FFXIV_TexTools/Views/Upgrades/DawntrailUpgradeHelpWindow.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace FFXIV_TexTools.Views.Upgrades
+{
+    /// <summary>
+    /// Interaction logic for DawntrailUpgradeHelpWindow.xaml
+    /// </summary>
+    public partial class DawntrailUpgradeHelpWindow : Window
+    {
+        public DawntrailUpgradeHelpWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 82d8aa1b..00e487fe 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 82d8aa1b220ea31692fb6877d449fc0c5d0514fe
+Subproject commit 00e487fe1345d15eca096feab20ab4293b69292e

From b5d5959a1b784fa04e6ccf3ec4b8210ce389f425 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:23:11 -0400
Subject: [PATCH 04/13] Update Framework Reference to Update v3.0.2.9

---
 lib/xivModdingFramework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 00e487fe..affad45c 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 00e487fe1345d15eca096feab20ab4293b69292e
+Subproject commit affad45c6a367780784650802225bfb2318c583c

From 101b2dc0f9b36f5c46f63bac425a900e828e286f Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:23:19 -0400
Subject: [PATCH 05/13] bump

---
 FFXIV_TexTools/FFXIV_TexTools.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index 4de0f8a4..2ef38ae8 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,8 +23,8 @@
     <AssemblyTitle>FFXIV_TexTools</AssemblyTitle>
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>3.0.2.8</AssemblyVersion>
-    <FileVersion>3.0.2.8</FileVersion>
+    <AssemblyVersion>3.0.2.9</AssemblyVersion>
+    <FileVersion>3.0.2.9</FileVersion>
     <LangVersion>9.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>

From 46199c889ee6ed8a3e2801c77c4a706e0c5c3182 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 02:40:16 -0400
Subject: [PATCH 06/13] Initial Penumbra Library update tool test & misc
 bugfixes in pmp loading.

---
 FFXIV_TexTools/Helpers/ModpackUpgrader.cs     |   5 +
 FFXIV_TexTools/MainWindow.xaml                |   1 +
 FFXIV_TexTools/MainWindow.xaml.cs             |  11 +
 .../Models/PenumbraUpgradeStatus.cs           |  58 +++
 .../Views/ModPack/Wizard/WizardData.cs        |  24 +-
 .../PenumbraLibraryUpgradeWindow.xaml         |  70 ++++
 .../PenumbraLibraryUpgradeWindow.xaml.cs      | 344 ++++++++++++++++++
 lib/xivModdingFramework                       |   2 +-
 8 files changed, 510 insertions(+), 5 deletions(-)
 create mode 100644 FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
 create mode 100644 FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
 create mode 100644 FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs

diff --git a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
index 8bc8ab37..197014b5 100644
--- a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
+++ b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
@@ -84,6 +84,10 @@ public static async Task UpgradeModpackPrompted(bool includePartials = true)
 
         public static async Task<WizardData> UpgradeModpack(string path, bool includePartials = true)
         {
+            if (Directory.Exists(path))
+            {
+                path = Path.GetFullPath(Path.Combine(path, "meta.json"));
+            }
 
             var data = await WizardData.FromModpack(path);
             var textureUpgradeTargets = new Dictionary<string, EndwalkerUpgrade.UpgradeInfo>();
@@ -96,6 +100,7 @@ public static async Task<WizardData> UpgradeModpack(string path, bool includePar
             {
                 foreach (var g in p.Groups)
                 {
+                    if (g == null) continue;
                     foreach (var o in g.Options)
                     {
                         if (o.StandardData != null)
diff --git a/FFXIV_TexTools/MainWindow.xaml b/FFXIV_TexTools/MainWindow.xaml
index 6b113c44..89e3f906 100644
--- a/FFXIV_TexTools/MainWindow.xaml
+++ b/FFXIV_TexTools/MainWindow.xaml
@@ -94,6 +94,7 @@
                 <MenuItem Header="Dawntrail Upgrades">
                     <MenuItem Header="About Upgrades" Click="AboutUpgrades_Click"/>
                     <MenuItem Header="Upgrade Modpack" Click="UpdateModpack_Click"/>
+                    <MenuItem x:Name="PenumbraUpgradeButton" Header="Upgrade Penumbra Library" Click="UpdatePenumbra_Click"/>
                     <MenuItem Header="Index Texture Creator" Click="IndexTextureCreator_Click"/>
                     <MenuItem Header="Hair Texture Converter" Click="HairTextureConverter_Click"/>
                     <MenuItem Header="Eye Diffuse Creator" Click="IrisDiffuseCreator_Click"/>
diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
index adf416e8..2a090278 100644
--- a/FFXIV_TexTools/MainWindow.xaml.cs
+++ b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -351,6 +351,11 @@ public MainWindow(string[] args)
             this.DataContext = mainViewModel;
             InitializeComponent();
 
+#if !DEBUG
+            PenumbraUpgradeButton.IsEnabled = false;
+#endif
+
+
             var fileVersion = FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion;
 
             // Clear out the debug message shown in the xaml designer.
@@ -2104,5 +2109,11 @@ private void AboutUpgrades_Click(object sender, RoutedEventArgs e)
             var wind = new DawntrailUpgradeHelpWindow() { Owner = this };
             wind.Show();
         }
+
+        private void UpdatePenumbra_Click(object sender, RoutedEventArgs e)
+        {
+            var wind = new PenumbraLibraryUpgradeWindow() { Owner = this };
+            wind.ShowDialog();
+        }
     }
 }
diff --git a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
new file mode 100644
index 00000000..b0492290
--- /dev/null
+++ b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
@@ -0,0 +1,58 @@
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using xivModdingFramework.Helpers;
+using FFXIV_TexTools.Helpers;
+using System.Diagnostics;
+
+namespace FFXIV_TexTools.Models
+{
+    public class PenumbraUpgradeStatus
+    {
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum EUpgradeResult
+        {
+            NotStarted,
+            InProgress,
+            Failure,
+            Success,
+        }
+
+        public Dictionary<string, EUpgradeResult> Upgrades = new Dictionary<string, EUpgradeResult>();
+
+        public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, string mod)
+        {
+            var source = Path.GetFullPath(Path.Combine(baseDir, mod));
+            var target = Path.GetFullPath(Path.Combine(targetDir, mod));
+
+            if (source != target) {
+                IOUtil.RecursiveDeleteDirectory(target);
+            }
+
+            Directory.CreateDirectory(target);
+
+            var res = EUpgradeResult.Failure;
+            try
+            {
+                await ModpackUpgrader.UpgradeModpack(source, target);
+                res = EUpgradeResult.Success;
+            } catch (Exception ex)
+            {
+                res = EUpgradeResult.Failure;
+                Trace.WriteLine("Modpack Upgrade Failure for Penumbra Mod: " + mod);
+                Trace.WriteLine(ex);
+            }
+
+            if (Upgrades.ContainsKey(mod))
+            {
+                Upgrades[mod] = res;
+            }
+            return res;
+        }
+    }
+}
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
index 6bcbc4c9..8fe6b57f 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
@@ -1063,7 +1063,7 @@ public static async Task<WizardData> FromPmp(PMPJson pmp, string unzipPath)
             data.ModPack = mp;
             data.RawSource = pmp;
 
-            if (pmp.Groups.Count > 0)
+            if (pmp.Groups.Count > 0 && pmp.Groups.Any(x => x.Options.Count > 0))
             {
                 // Create sufficient pages.
                 var pageMax = pmp.Groups.Max(x => x.Page);
@@ -1224,10 +1224,18 @@ public async Task WriteModpack(string targetPath)
             {
                 await WritePmp(targetPath);
             }
-            else
+            else if(targetPath.ToLower().EndsWith(".ttmp2"))
             {
                 await WriteWizardPack(targetPath);
             }
+            else if (Directory.Exists(targetPath))
+            {
+                await WritePmp(targetPath, false);
+            }
+            else
+            {
+                throw new ArgumentException("Invalid Modpack Path: " + targetPath);
+            }
         }
         public async Task WriteWizardPack(string targetPath)
         {
@@ -1300,7 +1308,7 @@ internal static string MakeOptionPrefix(string groupPrefix, WizardGroupEntry gro
             }
         }
 
-        public async Task WritePmp(string targetPath)
+        public async Task WritePmp(string targetPath, bool zip = true)
         {
             ClearEmpties();
 
@@ -1387,7 +1395,15 @@ public async Task WritePmp(string targetPath)
 
 
                 // This performs the final json serialization/writing and zipping.
-                await PMP.WritePmp(pmp, tempFolder, targetPath);
+                if (zip)
+                {
+                    await PMP.WritePmp(pmp, tempFolder, targetPath);
+                } else
+                {
+                    await PMP.WritePmp(pmp, tempFolder);
+                    Directory.CreateDirectory(targetPath);
+                    IOUtil.CopyFolder(tempFolder, targetPath);
+                }
             }
             finally
             {
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
new file mode 100644
index 00000000..826d8ef6
--- /dev/null
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
@@ -0,0 +1,70 @@
+<Window x:Class="FFXIV_TexTools.Views.Upgrades.PenumbraLibraryUpgradeWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:FFXIV_TexTools.Views.Upgrades"
+        mc:Ignorable="d"
+        Title="Penumbra Library Update Tool" Height="450" Width="800">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+            <RowDefinition Height="40"/>
+        </Grid.RowDefinitions>
+        
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="200"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+            </Grid.RowDefinitions>
+            <Button Grid.Row="0" Grid.Column="0" Content="Select Penumbra Library" Margin="5" Click="SelectPenumbraPath_Click" IsEnabled="{Binding Path=PathEnabled}"/>
+            <TextBox IsEnabled="False" Grid.Row="0" Grid.Column="1" Text="{Binding Path=PenumbraPath}" Margin="5"/>
+
+            <Button Grid.Row="1" Grid.Column="0" Content="Select Destination Folder" Margin="5" Click="SelectDestinationPath_Click" IsEnabled="{Binding Path=PathEnabled}"/>
+            <TextBox IsEnabled="False" Grid.Row="1" Grid.Column="1" Text="{Binding Path=DestinationPath}" Margin="5"/>
+        </Grid>
+
+
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.Column="0" Margin="10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Label HorizontalAlignment="Center" Content="Remaining Mods" VerticalAlignment="Center" FontStyle="Italic"/>
+                <ListBox Grid.Row="1" ItemsSource="{Binding Path=RemainingMods}" DisplayMemberPath="Key" SelectedValuePath="Value" BorderBrush="Gray" BorderThickness="1"></ListBox>
+
+            </Grid>
+
+            <Grid Grid.Column="1" Margin="10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Label HorizontalAlignment="Center" Content="Processed Mods" VerticalAlignment="Center" FontStyle="Italic"/>
+                <ListBox Grid.Row="1" ItemsSource="{Binding Path=ProcessedMods}" DisplayMemberPath="Key" SelectedValuePath="Value"  BorderBrush="Gray" BorderThickness="1"></ListBox>
+
+            </Grid>
+        </Grid>
+
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="150"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBox Margin="5" IsEnabled="False" Text="{Binding Path=StatusText}"/>
+            <Button Grid.Column="1" Margin="5" Content="{Binding Path=ContinuePauseText}" Click="ContinuePause_Click" IsEnabled="{Binding Path=ContinuePauseEnabled}"/>
+        </Grid>
+    </Grid>
+</Window>
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
new file mode 100644
index 00000000..2eaf0388
--- /dev/null
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -0,0 +1,344 @@
+using FFXIV_TexTools.Models;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using WK.Libraries.BetterFolderBrowserNS;
+using xivModdingFramework.Mods.DataContainers;
+
+namespace FFXIV_TexTools.Views.Upgrades
+{
+    /// <summary>
+    /// Interaction logic for PenumbraLibraryUpgradeWindow.xaml
+    /// </summary>
+    public partial class PenumbraLibraryUpgradeWindow : Window, INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private string _PenumbraPath;
+        public string PenumbraPath
+        {
+            get => _PenumbraPath;
+            set
+            {
+                _PenumbraPath = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PenumbraPath)));
+            }
+        }
+
+        private string _DestinationPath;
+        public string DestinationPath
+        {
+            get => _DestinationPath;
+            set
+            {
+                _DestinationPath = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DestinationPath)));
+            }
+        }
+
+        private string _ContinuePauseText;
+        public string ContinuePauseText
+        {
+            get => _ContinuePauseText;
+            set
+            {
+                _ContinuePauseText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ContinuePauseText)));
+            }
+        }
+
+        private string _StatusText;
+        public string StatusText
+        {
+            get => _StatusText;
+            set
+            {
+                _StatusText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StatusText)));
+            }
+        }
+        private bool _PathEnabled;
+        public bool PathEnabled
+        {
+            get => _PathEnabled;
+            set
+            {
+                _PathEnabled = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PathEnabled)));
+            }
+        }
+        private bool _ContinuePauseEnabled;
+        public bool ContinuePauseEnabled
+        {
+            get => _ContinuePauseEnabled;
+            set
+            {
+                _ContinuePauseEnabled = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ContinuePauseEnabled)));
+            }
+        }
+
+        PenumbraUpgradeStatus Results;
+
+
+        const string _JsonName = "upgrade_status.json";
+        string JsonPath {
+            get
+            {
+                if (string.IsNullOrEmpty(DestinationPath)) return "";
+                return Path.GetFullPath(Path.Combine(DestinationPath, _JsonName));
+            }
+        }
+
+        public ObservableCollection<KeyValuePair<string, string>> RemainingMods { get; set; } = new ObservableCollection<KeyValuePair<string, string>>();
+        public ObservableCollection<KeyValuePair<string, string>> ProcessedMods { get; set; } = new ObservableCollection<KeyValuePair<string, string>>();
+
+        public enum UpgradeState
+        {
+            Stopped,
+            Working,
+            Paused,
+            Completed
+        };
+
+
+        private UpgradeState _State;
+        public UpgradeState State {
+            get => _State;
+            set
+            {
+                _State = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
+
+                if(State == UpgradeState.Stopped)
+                {
+                    ContinuePauseText = "Start";
+                    PathEnabled = true;
+                } else if(State == UpgradeState.Paused)
+                {
+                    ContinuePauseText = "Resume";
+                    PathEnabled = true;
+                }
+                else if (State == UpgradeState.Working)
+                {
+                    ContinuePauseText = "Pause";
+                    PathEnabled = false;
+                }
+                else if (State == UpgradeState.Completed)
+                {
+                    ContinuePauseText = "Complete";
+                    ContinuePauseEnabled = false;
+                    PathEnabled = false;
+                }
+            }
+        }
+
+        public PenumbraLibraryUpgradeWindow()
+        {
+            DataContext = this;
+            InitializeComponent();
+
+            State = UpgradeState.Stopped;
+            Closing += PenumbraLibraryUpgradeWindow_Closing;
+            CheckPaths();
+        }
+
+        private void PenumbraLibraryUpgradeWindow_Closing(object sender, CancelEventArgs e)
+        {
+            Owner?.Activate();
+        }
+
+        private async void ContinuePause_Click(object sender, RoutedEventArgs e)
+        {
+            if(State == UpgradeState.Working)
+            {
+                await Stop();
+            } else if (State == UpgradeState.Stopped || State == UpgradeState.Paused)
+            {
+                await Start();
+            }
+        }
+
+        private void SelectPenumbraPath_Click(object sender, RoutedEventArgs e)
+        {
+            var bfb = new BetterFolderBrowser() { Title = "Select Penumbra Library..." };
+            if(bfb.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+            {
+                return;
+            }
+
+            PenumbraPath = bfb.SelectedFolder;
+            CheckPaths();
+        }
+
+        private void SelectDestinationPath_Click(object sender, RoutedEventArgs e)
+        {
+            var bfb = new BetterFolderBrowser() { Title = "Select Destination Folder..." };
+            if (bfb.ShowDialog() != System.Windows.Forms.DialogResult.OK)
+            {
+                return;
+            }
+
+            DestinationPath = bfb.SelectedFolder;
+            CheckPaths();
+        }
+
+        private void CheckPaths()
+        {
+            if (string.IsNullOrWhiteSpace(PenumbraPath) || string.IsNullOrWhiteSpace(DestinationPath)
+                || PenumbraPath.Contains(DestinationPath + Path.DirectorySeparatorChar) || DestinationPath.Contains(PenumbraPath + Path.DirectorySeparatorChar)
+                || DestinationPath == PenumbraPath || !Directory.Exists(PenumbraPath))
+            {
+                ContinuePauseEnabled = false;
+                Results = null;
+                return;
+            }
+
+            ContinuePauseEnabled = true;
+
+            Directory.CreateDirectory(DestinationPath);
+
+            LoadOrCreateJson();
+            UpdateLists();
+        }
+
+        private void LoadOrCreateJson()
+        {
+
+            if (File.Exists(JsonPath))
+            {
+                try
+                {
+                    Results = JsonConvert.DeserializeObject<PenumbraUpgradeStatus>(File.ReadAllText(JsonPath));
+                }
+                catch
+                {
+                    Results = new PenumbraUpgradeStatus();
+                }
+            }
+            else
+            {
+                Results = new PenumbraUpgradeStatus();
+            }
+
+            var di = new DirectoryInfo(PenumbraPath);
+            var children = di.EnumerateDirectories().ToList();
+
+            foreach(var c in children)
+            {
+                if (!Results.Upgrades.ContainsKey(c.Name))
+                {
+                    var metaPath = Path.GetFullPath(Path.Combine(c.FullName, "meta.json"));
+                    if (File.Exists(metaPath))
+                    {
+                        Results.Upgrades.Add(c.Name, PenumbraUpgradeStatus.EUpgradeResult.NotStarted);
+                    }
+                }
+            }
+
+            if (Results.Upgrades.Any(x => x.Value != PenumbraUpgradeStatus.EUpgradeResult.NotStarted))
+            {
+                State = UpgradeState.Paused;
+            } else
+            {
+                State = UpgradeState.Stopped;
+            }
+
+            File.WriteAllText(JsonPath, JsonConvert.SerializeObject(Results));
+        }
+
+        private void SaveJson()
+        {
+            if (Results == null || string.IsNullOrEmpty(DestinationPath)) return;
+            File.WriteAllText(JsonPath, JsonConvert.SerializeObject(Results));
+        }
+        private void UpdateLists()
+        {
+            RemainingMods.Clear();
+            ProcessedMods.Clear();
+
+            if (Results == null) return;
+
+            foreach(var m in Results.Upgrades)
+            {
+                if(m.Value == PenumbraUpgradeStatus.EUpgradeResult.NotStarted
+                    || m.Value == PenumbraUpgradeStatus.EUpgradeResult.InProgress)
+                {
+                    RemainingMods.Add(new KeyValuePair<string, string>(m.Key, m.Key));
+                } else if (m.Value == PenumbraUpgradeStatus.EUpgradeResult.Success)
+                {
+                    ProcessedMods.Add(new KeyValuePair<string, string>("✓ " + m.Key, m.Key));
+                } else if(m.Value == PenumbraUpgradeStatus.EUpgradeResult.Failure)
+                {
+                    ProcessedMods.Add(new KeyValuePair<string, string>("𝑿 " + m.Key, m.Key));
+                }
+            }
+
+            Trace.WriteLine("ASDF");
+        }
+
+
+        private bool _RequestStop = false;
+        private async Task Start()
+        {
+            if (Results == null) return;
+            State = UpgradeState.Working;
+            _RequestStop = false;
+            ContinuePauseEnabled = true;
+
+            await Task.Run(async () =>
+            {
+                var nextMod = Results.Upgrades.FirstOrDefault(x => x.Value == PenumbraUpgradeStatus.EUpgradeResult.NotStarted);
+                while (!string.IsNullOrWhiteSpace(nextMod.Key) && !_RequestStop)
+                {
+                    var mod = nextMod.Key;
+                    Dispatcher.Invoke(() =>
+                    {
+                        StatusText = "Processing Mod: " + mod;
+                    });
+
+                    var res = await Results.ProcessMod(PenumbraPath, DestinationPath, mod);
+                    SaveJson();
+
+                    Dispatcher.Invoke(() =>
+                    {
+                        UpdateLists();
+                    });
+                    nextMod = Results.Upgrades.FirstOrDefault(x => x.Value == PenumbraUpgradeStatus.EUpgradeResult.NotStarted);
+                }
+
+                if (_RequestStop)
+                {
+                    State = UpgradeState.Paused;
+                    ContinuePauseEnabled = true;
+                } else
+                {
+                    State = UpgradeState.Completed;
+                }
+            });
+        }
+        private async Task Stop()
+        {
+            if (Results == null) return;
+            _RequestStop = true;
+            ContinuePauseEnabled = false;
+        }
+
+
+    }
+}
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index affad45c..7e3257b8 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit affad45c6a367780784650802225bfb2318c583c
+Subproject commit 7e3257b87c85f9e1a28bdcc63bca8086e8650b0f

From e0fc6931419f2629819c978103572fe4a90ec640 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 02:42:34 -0400
Subject: [PATCH 07/13] Pause worker during penumbra stuff, and clear temp
 folder after every mod transfer.

---
 .../Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index 2eaf0388..055fc90c 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -18,6 +18,8 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using WK.Libraries.BetterFolderBrowserNS;
+using xivModdingFramework.Cache;
+using xivModdingFramework.Helpers;
 using xivModdingFramework.Mods.DataContainers;
 
 namespace FFXIV_TexTools.Views.Upgrades
@@ -303,6 +305,8 @@ private async Task Start()
 
             await Task.Run(async () =>
             {
+                var workerState = XivCache.CacheWorkerEnabled;
+                await XivCache.SetCacheWorkerState(false);
                 var nextMod = Results.Upgrades.FirstOrDefault(x => x.Value == PenumbraUpgradeStatus.EUpgradeResult.NotStarted);
                 while (!string.IsNullOrWhiteSpace(nextMod.Key) && !_RequestStop)
                 {
@@ -313,6 +317,10 @@ await Task.Run(async () =>
                     });
 
                     var res = await Results.ProcessMod(PenumbraPath, DestinationPath, mod);
+
+                    // Always clear the temp folder between actions.
+                    IOUtil.ClearTempFolder();
+
                     SaveJson();
 
                     Dispatcher.Invoke(() =>
@@ -330,6 +338,8 @@ await Task.Run(async () =>
                 {
                     State = UpgradeState.Completed;
                 }
+
+                await XivCache.SetCacheWorkerState(workerState);
             });
         }
         private async Task Stop()

From 7b7dc8fa77eb77c74d42dc3f10f21afb416fdd37 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:26:37 -0400
Subject: [PATCH 08/13] Various additional catches/handling for weird PMP stuff
 and compression on converted folders.

---
 FFXIV_TexTools/Helpers/ModpackUpgrader.cs            |  1 +
 FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs       |  9 +++++++++
 FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs    | 12 +++++++++++-
 .../Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs    |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
index 197014b5..b28889a7 100644
--- a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
+++ b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
@@ -135,6 +135,7 @@ public static async Task<WizardData> UpgradeModpack(string path, bool includePar
             {
                 foreach (var g in p.Groups)
                 {
+                    if (g == null) continue;
                     foreach (var o in g.Options)
                     {
                         if (o.StandardData != null)
diff --git a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
index b0492290..9e9b45fd 100644
--- a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
+++ b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
@@ -35,6 +35,7 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
             }
 
             Directory.CreateDirectory(target);
+            IOUtil.CompressWindowsDirectory(target);
 
             var res = EUpgradeResult.Failure;
             try
@@ -43,11 +44,19 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
                 res = EUpgradeResult.Success;
             } catch (Exception ex)
             {
+                if (source != target)
+                {
+                    IOUtil.RecursiveDeleteDirectory(target);
+                    IOUtil.CompressWindowsDirectory(target);
+                    IOUtil.CopyFolder(source, target);
+                }
+
                 res = EUpgradeResult.Failure;
                 Trace.WriteLine("Modpack Upgrade Failure for Penumbra Mod: " + mod);
                 Trace.WriteLine(ex);
             }
 
+
             if (Upgrades.ContainsKey(mod))
             {
                 Upgrades[mod] = res;
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
index 8fe6b57f..1eba5161 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
@@ -1363,7 +1363,17 @@ public async Task WritePmp(string targetPath, bool zip = true)
 
                             var optionPrefix = MakeOptionPrefix(p, g, o);
 
-                            allFiles.Add(optionPrefix, files);
+                            if (allFiles.ContainsKey(optionPrefix))
+                            {
+                                foreach(var f in files)
+                                {
+                                    allFiles[optionPrefix].Add(f.Key, f.Value);
+                                }
+                            }
+                            else
+                            {
+                                allFiles.Add(optionPrefix, files);
+                            }
                         }
                     }
                     pIdx++;
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index 055fc90c..b565cbc9 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -215,6 +215,8 @@ private void CheckPaths()
 
             Directory.CreateDirectory(DestinationPath);
 
+            var di = new DirectoryInfo(DestinationPath);
+
             LoadOrCreateJson();
             UpdateLists();
         }

From 208a779bdbabbf898737cc03a60885789207e89f Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:04:46 -0400
Subject: [PATCH 09/13] Bugfix on wetness not saving without row swapping.

---
 FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs | 2 +-
 lib/xivModdingFramework                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
index 4ccea078..a01e8fca 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
@@ -217,7 +217,7 @@ public ColorsetFileControl()
             TileUnknownBox.TextChanged += ValueChanged;
             AnisotropyBlendingBox.TextChanged += ValueChanged;
             ShaderTemplateBox.TextChanged += ValueChanged;
-
+            WetnessBox.TextChanged += ValueChanged;
 
             FresnelAlbedoBox.TextChanged += ValueChanged;
             FresnelUnknownBox.TextChanged += ValueChanged;
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 7e3257b8..fc4954ba 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 7e3257b87c85f9e1a28bdcc63bca8086e8650b0f
+Subproject commit fc4954baaa409273e75b08272623c5161d21284b

From 7a7ba367127242c64890a87ab18f21897fd613c5 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 15:22:45 -0400
Subject: [PATCH 10/13] More penumbra reading fixes.

---
 FFXIV_TexTools/Helpers/ModpackUpgrader.cs     |  1 +
 .../Models/PenumbraUpgradeStatus.cs           |  3 +-
 .../Views/ModPack/Wizard/WizardData.cs        |  2 +-
 .../PenumbraLibraryUpgradeWindow.xaml         |  4 +--
 .../PenumbraLibraryUpgradeWindow.xaml.cs      | 31 ++++++++++++++++++-
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
index b28889a7..e3eb5c75 100644
--- a/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
+++ b/FFXIV_TexTools/Helpers/ModpackUpgrader.cs
@@ -171,6 +171,7 @@ public static async Task<WizardData> UpgradeModpack(string path, bool includePar
                 {
                     foreach (var g in p.Groups)
                     {
+                        if (g == null) continue;
                         foreach (var o in g.Options)
                         {
                             if (o.StandardData != null)
diff --git a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
index 9e9b45fd..9227c8be 100644
--- a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
+++ b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
@@ -35,7 +35,6 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
             }
 
             Directory.CreateDirectory(target);
-            IOUtil.CompressWindowsDirectory(target);
 
             var res = EUpgradeResult.Failure;
             try
@@ -47,7 +46,6 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
                 if (source != target)
                 {
                     IOUtil.RecursiveDeleteDirectory(target);
-                    IOUtil.CompressWindowsDirectory(target);
                     IOUtil.CopyFolder(source, target);
                 }
 
@@ -56,6 +54,7 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
                 Trace.WriteLine(ex);
             }
 
+            await IOUtil.CompressWindowsDirectory(target);
 
             if (Upgrades.ContainsKey(mod))
             {
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
index 1eba5161..2987260f 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/WizardData.cs
@@ -1191,7 +1191,7 @@ public void ClearEmpties()
                 var groups = p.Groups.ToList();
                 foreach(var g in groups)
                 {
-                    if (!g.HasData)
+                    if (g == null || !g.HasData)
                     {
                         p.Groups.Remove(g);
                         continue;
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
index 826d8ef6..42a83906 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml
@@ -41,7 +41,7 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <Label HorizontalAlignment="Center" Content="Remaining Mods" VerticalAlignment="Center" FontStyle="Italic"/>
+                <Label HorizontalAlignment="Center" Content="{Binding Path=RemainingText}" VerticalAlignment="Center" FontStyle="Italic"/>
                 <ListBox Grid.Row="1" ItemsSource="{Binding Path=RemainingMods}" DisplayMemberPath="Key" SelectedValuePath="Value" BorderBrush="Gray" BorderThickness="1"></ListBox>
 
             </Grid>
@@ -51,7 +51,7 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <Label HorizontalAlignment="Center" Content="Processed Mods" VerticalAlignment="Center" FontStyle="Italic"/>
+                <Label HorizontalAlignment="Center" Content="{Binding Path=ProcessedText}" VerticalAlignment="Center" FontStyle="Italic"/>
                 <ListBox Grid.Row="1" ItemsSource="{Binding Path=ProcessedMods}" DisplayMemberPath="Key" SelectedValuePath="Value"  BorderBrush="Gray" BorderThickness="1"></ListBox>
 
             </Grid>
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index b565cbc9..2bc998eb 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -64,6 +64,28 @@ public string ContinuePauseText
             }
         }
 
+        private string _RemainingText;
+        public string RemainingText
+        {
+            get => _RemainingText;
+            set
+            {
+                _RemainingText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RemainingText)));
+            }
+        }
+        private string _ProcessedText;
+        public string ProcessedText
+        {
+            get => _ProcessedText;
+            set
+            {
+                _ProcessedText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ProcessedText)));
+            }
+        }
+
+
         private string _StatusText;
         public string StatusText
         {
@@ -278,22 +300,29 @@ private void UpdateLists()
 
             if (Results == null) return;
 
+            var proc = 0;
+            var rem = 0;
             foreach(var m in Results.Upgrades)
             {
                 if(m.Value == PenumbraUpgradeStatus.EUpgradeResult.NotStarted
                     || m.Value == PenumbraUpgradeStatus.EUpgradeResult.InProgress)
                 {
+                    rem++;
                     RemainingMods.Add(new KeyValuePair<string, string>(m.Key, m.Key));
                 } else if (m.Value == PenumbraUpgradeStatus.EUpgradeResult.Success)
                 {
+                    proc++;
                     ProcessedMods.Add(new KeyValuePair<string, string>("✓ " + m.Key, m.Key));
                 } else if(m.Value == PenumbraUpgradeStatus.EUpgradeResult.Failure)
                 {
+                    proc++;
                     ProcessedMods.Add(new KeyValuePair<string, string>("𝑿 " + m.Key, m.Key));
                 }
             }
 
-            Trace.WriteLine("ASDF");
+            ProcessedText = "Processed Mods: " + proc.ToString();
+            RemainingText = "Remaining Mods: " + rem.ToString();
+
         }
 
 

From 8526da37c28db995a24aa39f9fd364334178b908 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 16:26:50 -0400
Subject: [PATCH 11/13] Auto-select penumbra library path.

---
 .../Views/Transactions/TransactionStatusWindow.xaml.cs     | 5 +++++
 .../Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs    | 7 +++++++
 lib/xivModdingFramework                                    | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
index 6fea76a2..843b799a 100644
--- a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
@@ -687,6 +687,11 @@ private async Task BeginPenumbraAttach()
 
             PenumbraAttachDialog.Title = "Select Penumbra Mod Folder...";
 
+            if (string.IsNullOrEmpty(PenumbraAttachDialog.RootFolder))
+            {
+                PenumbraAttachDialog.RootFolder = IOUtil.GetPenumbraDirectory();
+            }
+
             var res = PenumbraAttachDialog.ShowDialog();
             if (res != System.Windows.Forms.DialogResult.OK)
             {
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index 2bc998eb..0da1697c 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -180,6 +180,11 @@ public PenumbraLibraryUpgradeWindow()
             State = UpgradeState.Stopped;
             Closing += PenumbraLibraryUpgradeWindow_Closing;
             CheckPaths();
+
+            var p = IOUtil.GetPenumbraDirectory();
+            if (!string.IsNullOrWhiteSpace(p)) {
+                PenumbraPath = p;
+            }
         }
 
         private void PenumbraLibraryUpgradeWindow_Closing(object sender, CancelEventArgs e)
@@ -201,6 +206,7 @@ private async void ContinuePause_Click(object sender, RoutedEventArgs e)
         private void SelectPenumbraPath_Click(object sender, RoutedEventArgs e)
         {
             var bfb = new BetterFolderBrowser() { Title = "Select Penumbra Library..." };
+            bfb.RootFolder = PenumbraPath;
             if(bfb.ShowDialog() != System.Windows.Forms.DialogResult.OK)
             {
                 return;
@@ -213,6 +219,7 @@ private void SelectPenumbraPath_Click(object sender, RoutedEventArgs e)
         private void SelectDestinationPath_Click(object sender, RoutedEventArgs e)
         {
             var bfb = new BetterFolderBrowser() { Title = "Select Destination Folder..." };
+            bfb.RootFolder = DestinationPath;
             if (bfb.ShowDialog() != System.Windows.Forms.DialogResult.OK)
             {
                 return;
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index fc4954ba..7d626764 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit fc4954baaa409273e75b08272623c5161d21284b
+Subproject commit 7d6267649f17a07da5ccd11c44911697a443e212

From d663936b346c9c566d1ca54594bcf5a1391cc539 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 16:39:15 -0400
Subject: [PATCH 12/13] ver

---
 FFXIV_TexTools/FFXIV_TexTools.csproj | 4 ++--
 lib/xivModdingFramework              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index 2ef38ae8..6f04c991 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,8 +23,8 @@
     <AssemblyTitle>FFXIV_TexTools</AssemblyTitle>
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>3.0.2.9</AssemblyVersion>
-    <FileVersion>3.0.2.9</FileVersion>
+    <AssemblyVersion>3.0.3.0</AssemblyVersion>
+    <FileVersion>3.0.3.0</FileVersion>
     <LangVersion>9.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 7d626764..4be78475 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 7d6267649f17a07da5ccd11c44911697a443e212
+Subproject commit 4be78475c4d944f826f047d6dde955540af715a0

From fe521f02491d1e378de1c86651a6528bc7217685 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Fri, 5 Jul 2024 16:40:46 -0400
Subject: [PATCH 13/13] Update Framework Reference to Update v3.0.3.0

---
 lib/xivModdingFramework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 4be78475..d396acc0 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 4be78475c4d944f826f047d6dde955540af715a0
+Subproject commit d396acc062a6f42205b9c4a5c0eb0cb6aa8ce036