From 9b0fcd995cdd5132cc20a562fd679380f9f7b3f3 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Mon, 22 Jul 2024 19:32:06 -0400
Subject: [PATCH 01/11] Tangent/Binormal calculation fixes, + Bubbling up
 various model flags.

---
 .../ViewModels/ImportModelEditViewModel.cs    | 161 ++++++++++++-
 .../ModPack/Wizard/WizardPageControl.xaml.cs  |   1 +
 .../Views/Models/ImportModelEditView.xaml     | 227 +++++++++++++-----
 3 files changed, 328 insertions(+), 61 deletions(-)

diff --git a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
index 223112ca..505f6ede 100644
--- a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
@@ -27,7 +27,7 @@
 
 namespace FFXIV_TexTools.ViewModels
 {
-    public class ImportModelEditViewModel
+    public class ImportModelEditViewModel : INotifyPropertyChanged
     {
 
 
@@ -60,6 +60,163 @@ public class ImportModelEditViewModel
 
         private XivDependencyRoot _root;
 
+
+        public bool DisableShadows
+        {
+            get {
+                return (_newModel.Flags & EMeshFlags1.ShadowDisabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.ShadowDisabled;
+                } else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.ShadowDisabled;
+                }
+            }
+        }
+        public bool DisableLightShadow
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.LightShadowDisabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.LightShadowDisabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.LightShadowDisabled;
+                }
+            }
+        }
+        public bool EnableAnisotropy
+        {
+            get
+            {
+                return _newModel.AnisotropicLightingEnabled;
+            }
+            set
+            {
+
+                _newModel.AnisotropicLightingEnabled = value;
+            }
+        }
+        public bool DisableWavingAnimation
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.WavingAnimationDisabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.WavingAnimationDisabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.WavingAnimationDisabled;
+                }
+            }
+        }
+        public bool EnableLightingReflection
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.LightingReflectionEnabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.LightingReflectionEnabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.LightingReflectionEnabled;
+                }
+            }
+        }
+        public bool UnknownFlag
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.Unknown10) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.Unknown10;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.Unknown10;
+                }
+            }
+        }
+        public bool OccludeRain
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.RainOcclusionEnabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.RainOcclusionEnabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.RainOcclusionEnabled;
+                }
+            }
+        }
+        public bool OccludeSnow
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.SnowOcclusionEnabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.SnowOcclusionEnabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.SnowOcclusionEnabled;
+                }
+            }
+        }
+        public bool OccludeDust
+        {
+            get
+            {
+                return (_newModel.Flags & EMeshFlags1.DustOcclusionEnabled) != 0;
+            }
+            set
+            {
+                if (value)
+                {
+                    _newModel.Flags |= EMeshFlags1.DustOcclusionEnabled;
+                }
+                else
+                {
+                    _newModel.Flags &= ~EMeshFlags1.DustOcclusionEnabled;
+                }
+            }
+        }
+
+
         private TTMeshGroup GetGroup()
         {
             if (_view.MeshNumberBox.SelectedValue == null)
@@ -1009,5 +1166,7 @@ private void MaterialPathTextBox_KeyDown(object sender, System.Windows.Input.Key
             { "shp_nse_d", "Nose d" },
             { "shp_nse_e", "Nose e" },
         };
+
+        public event PropertyChangedEventHandler PropertyChanged;
     }
 }
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/WizardPageControl.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/WizardPageControl.xaml.cs
index 6b81e646..66bfd045 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/WizardPageControl.xaml.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/WizardPageControl.xaml.cs
@@ -111,6 +111,7 @@ private void SetupUi()
             var options = new List<WizardOptionEntry>();
             foreach (var g in Data.Groups)
             {
+                if (g == null) continue;
                 options.AddRange(g.Options);
             }
             OptionsList.ItemsSource = options;
diff --git a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
index dc4142c7..2768b43a 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
+++ b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
@@ -8,14 +8,15 @@
         resx:Localization.Enabled="True"                     
         mc:Ignorable="d"
         Title="Model Editor" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" ResizeMode="NoResize"
-                 Width="640"
-                 Height="680">
+                 Width="860"
+                 Height="610">
     <Grid x:Name="MainGrid">
         
         <!-- Main Grid Definitions -->
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -24,40 +25,181 @@
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
 
-        <Grid x:Name="HeaderGrid" Grid.Row="0" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
-            </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="40"/>
-                <RowDefinition Height="10" />
+                <RowDefinition Height="45"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <Grid Grid.Column="0" Margin="5">
+            <Label Content="Model Settings" Margin="0" VerticalAlignment="Center" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
+
+            <Grid Grid.Row="1" Margin="5">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="35"/>
+                    <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>
+                
+                <Grid Grid.Row="0">
+                    <Grid.ToolTip>You probably shouldn't change this unless you really know what you're doing.</Grid.ToolTip>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Label Grid.Column="0" Content="Mdl Version:" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                    <ComboBox Grid.Column="1"  x:Name="MdlVersionComboBox" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
+                </Grid>
+
+
+                <CheckBox Grid.Row="1" Content="Enable Anistropic Lighting (Hair Only)" Margin="10,0" IsChecked="{Binding Path=EnableAnisotropy}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            <Run>Determines if hair materials should show anisotropic specular highlights.</Run>
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run>This will make the hair 'shinier', and the specular highlights will be skewed based on UV orientation.</Run>
+                            <LineBreak/>
+                            <Run>Hair strand UVs should be laid out from Top-Left to Bottom-Right for correct lighting effects with this on.</Run>
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run>Turning this off on a hair which is already using it will make the lighting significantly more matte.</Run>
+                            <LineBreak/>
+                            <Run>Has no effect on non-hair meshes/materials.</Run>
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+
+                <CheckBox Grid.Row="2" Content="Disable Shadow Casting" Margin="10,0" IsChecked="{Binding Path=DisableShadows}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Globally disabled shadows for this model.
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+
+                <CheckBox Grid.Row="3" Content="Disable Light Shadow (?)" Margin="10,0" IsChecked="{Binding Path=DisableLightShadow}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Disable shadow receiving maybe?
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                <CheckBox Grid.Row="4" Content="Enable Lighting Reflection (?)" Margin="10,0" IsChecked="{Binding Path=EnableLightingReflection}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Some kind of reflection thing?
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                <CheckBox Grid.Row="5" Content="Disable Waving Animation (?)" Margin="10,0" IsChecked="{Binding Path=DisableWavingAnimation}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Water wave effect possibly?
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                
+                <CheckBox Grid.Row="6" Content="Unknown Flag (?)" Margin="10,0" IsChecked="{Binding Path=UnknownFlag}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Maybe does something.  Maybe does nothing.
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                <CheckBox Grid.Row="7" Content="Block Rain" Margin="10,0" IsChecked="{Binding Path=OccludeRain}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Determines if the model occludes/blocks rain effects.
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                <CheckBox Grid.Row="8" Content="Block Snow" Margin="10,0" IsChecked="{Binding Path=OccludeSnow}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Determines if the model occludes/blocks snow effects.
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+                <CheckBox Grid.Row="9" Content="Block Dust" Margin="10,0" IsChecked="{Binding Path=OccludeDust}">
+                    <CheckBox.ToolTip>
+                        <TextBlock>
+                            Determines if the model occludes/blocks dust effects.
+                        </TextBlock>
+                    </CheckBox.ToolTip>
+                </CheckBox>
+            </Grid>
+
+            <Grid Grid.Row="2" Margin="5, 0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <Label Grid.Row="0" Grid.Column="0" Content="Mesh Group:" HorizontalAlignment="Right" VerticalContentAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
-                <ComboBox Grid.Row="0" Grid.Column="1"  x:Name="MeshNumberBox"  VerticalContentAlignment="Center" VerticalAlignment="Center" />
-            </Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40"/>
+                    <RowDefinition Height="100"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0"  Content="Model Scale:" HorizontalAlignment="Right" VerticalAlignment="Center" />
+                <ComboBox Grid.Row="0" Grid.Column="1"  x:Name="ScaleComboBox" VerticalContentAlignment="Top" VerticalAlignment="Center" />
+
+                <Grid x:Name="SizeInfo" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="20"></RowDefinition>
+                        <RowDefinition Height="20"></RowDefinition>
+                        <RowDefinition></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"></ColumnDefinition>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Grid.Column="0"  FontStyle="Italic" FontSize="11" Content="Old Model Size:" HorizontalContentAlignment="Right" Height="24" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                    <Label Grid.Column="0" Grid.Row="1" FontStyle="Italic" FontSize="11" Content="New Model Size:" HorizontalContentAlignment="Right" Height="24" VerticalAlignment="Center" HorizontalAlignment="Right"/>
 
-            <Button x:Name="DeleteMeshGroupButton" Grid.Column="1" Content="Delete Mesh Group" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,5,5" Click="DeleteMeshGroup_Click"></Button>
+                    <Label Grid.Column="1" x:Name="OldModelSizeBox"  FontStyle="Italic" FontSize="11" Content="11 Meters" Height="24" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <Label Grid.Column="1" Grid.Row="1" x:Name="NewModelSizeBox"  FontStyle="Italic" FontSize="11" Content="11 Meters"  Height="24" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
-            <Separator BorderBrush="{DynamicResource NormalBorderBrush}" Background="{DynamicResource NormalBorderBrush}" BorderThickness="8" Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom"/>
+
+                    <TextBlock x:Name="ScaleWarningBox" Grid.Row="2" FontStyle="Italic" FontSize="12" Text="Warning Text Goes Here" Grid.Column="0" Grid.ColumnSpan="2" TextAlignment="Center" Height="20" VerticalAlignment="Top" TextWrapping="Wrap"/>
+                </Grid>
+            </Grid>
 
         </Grid>
 
-        <Grid x:Name="MeshGroupGrid" Grid.Row="1" Grid.Column="0">
+
+        <Grid x:Name="MeshGroupGrid" Grid.Row="1" Grid.Column="1">
             <!-- Mesh Group Grid Definitions -->
             <Grid.RowDefinitions>
+                <RowDefinition Height="45"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="125"/>
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Grid x:Name="MeshGroupSettings" Margin="5">
+
+            <Grid Grid.Row="0" Margin="5">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="50"></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition Width="100"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Label Grid.Row="0" Grid.Column="0" Content="Mesh:" HorizontalAlignment="Right" VerticalContentAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+                <ComboBox Grid.Row="0" Grid.Column="1"  x:Name="MeshNumberBox"  VerticalContentAlignment="Center" VerticalAlignment="Center" />
+                <Button x:Name="DeleteMeshGroupButton" Grid.Column="2" Content="Delete Mesh" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,5,5,5" Click="DeleteMeshGroup_Click"></Button>
+            </Grid>
+
+
+
+            <Grid x:Name="MeshGroupSettings" Margin="5" Grid.Row="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"></ColumnDefinition>
                     <ColumnDefinition></ColumnDefinition>
@@ -70,7 +212,7 @@
 
             </Grid>
 
-            <Border Grid.Row="1" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
+            <Border Grid.Row="2" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
                 <Grid>
                     <Label Content="Material" Margin="0" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
                     <ComboBox x:Name="MaterialSelectorBox" Margin="10,40,10,40" VerticalAlignment="Top" Height="26"/>
@@ -78,7 +220,7 @@
                 </Grid>
             </Border>
 
-            <Border Grid.Row="2" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
+            <Border Grid.Row="3" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
                 <Grid>
                     <Label Content="Shapes" Margin="0,0,0,0" Grid.Row="0" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
                     <ListBox x:Name="ShapesListBox" Margin="10,40,10,50" Grid.Row="0" Style="{DynamicResource SimpleListBox}" MinHeight="100"/>
@@ -90,7 +232,7 @@
 
         </Grid>
         
-        <Grid x:Name="MeshPartGrid" Grid.Row="1" Grid.Column="1">
+        <Grid x:Name="MeshPartGrid" Grid.Row="1" Grid.Column="2">
             <!-- Mesh Part Grid Definitions -->
             <Grid.RowDefinitions>
                 <RowDefinition Height="45"/>
@@ -129,6 +271,8 @@
 
         <Rectangle Stroke="Transparent" Fill="{DynamicResource NormalBorderBrush}" Width="2" Grid.Row="1" Grid.RowSpan="1" Grid.ColumnSpan="2" />
 
+        <Rectangle Stroke="Transparent" Fill="{DynamicResource NormalBorderBrush}" Width="2" Grid.Row="1" Grid.RowSpan="1" Grid.Column="1" Grid.ColumnSpan="2" />
+
 
         <Grid Grid.Row="2" Grid.ColumnSpan="2" x:Name="MeshInfoGrid">
             <Grid.RowDefinitions>
@@ -138,47 +282,10 @@
                 <ColumnDefinition></ColumnDefinition>
             </Grid.ColumnDefinitions>
 
-            <Grid x:Name="SizeInfo" Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                    <RowDefinition></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-
-                <Label Grid.Column="0"  FontStyle="Italic" FontSize="11" Content="Old Model Size:" HorizontalContentAlignment="Right" Height="24" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                <Label Grid.Column="0" Grid.Row="1" FontStyle="Italic" FontSize="11" Content="New Model Size:" HorizontalContentAlignment="Right" Height="24" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-
-                <Label Grid.Column="1" x:Name="OldModelSizeBox"  FontStyle="Italic" FontSize="11" Content="11 Meters" Height="24" HorizontalAlignment="Left" VerticalAlignment="Center" Width="56"/>
-                <Label Grid.Column="1" Grid.Row="1" x:Name="NewModelSizeBox"  FontStyle="Italic" FontSize="11" Content="11 Meters"  Height="24" HorizontalAlignment="Left" VerticalAlignment="Center" Width="56"/>
-
-
-                <TextBlock x:Name="ScaleWarningBox" Grid.Row="2" FontStyle="Italic" FontSize="12" Text="Warning Text Goes Here" Grid.Column="0" Grid.ColumnSpan="2" TextAlignment="Center" Height="20" VerticalAlignment="Center" />
-            </Grid>
-
-            <Grid x:Name="MeshSettingsGrid" Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="40"></RowDefinition>
-                    <RowDefinition Height="40"></RowDefinition>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-
-                <Label Grid.Row="0" Grid.Column="0"  Content="Model Scale:" HorizontalAlignment="Right" VerticalAlignment="Center" />
-                <ComboBox Grid.Row="0" Grid.Column="1"  x:Name="ScaleComboBox" VerticalContentAlignment="Top" VerticalAlignment="Center" />
-
-                <Label Grid.Row="1" Grid.Column="0" Content="Mdl Version:" HorizontalAlignment="Right" Width="98" VerticalAlignment="Center"/>
-                <ComboBox Grid.Row="1" Grid.Column="1"  x:Name="MdlVersionComboBox" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
-            </Grid>
         </Grid>
 
 
-        <Grid Grid.Row="3" x:Name="BottomRow" Grid.ColumnSpan="2">
+        <Grid Grid.Row="3" x:Name="BottomRow" Grid.ColumnSpan="3">
             <Button x:Name="CancelButton" Content="Cancel" HorizontalAlignment="Left" Width="200" Margin="5" VerticalContentAlignment="Center" Click="CancelButton_Click" VerticalAlignment="Center"/>
             <Button x:Name="ImportButton" Content="Confirm" HorizontalAlignment="Right" Width="200" Margin="5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Grid.Column="1" Click="ImportButton_Click" VerticalAlignment="Center"/>
         </Grid>

From 2af601fd8db6d59c4745bcea2c9279c834556618 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:03:01 -0400
Subject: [PATCH 02/11] Adjusted timing and tracking of UV Addressing space
 flips & Tangent calcs.

---
 .../Views/FileControls/ModelFileControl.xaml.cs          | 4 ++--
 FFXIV_TexTools/Views/Models/FullModelView.xaml.cs        | 9 +--------
 lib/xivModdingFramework                                  | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
index 55932850..f3dd38a1 100644
--- a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
@@ -415,7 +415,7 @@ protected async Task UpdateVisual()
 
                 FmvButtonEnabled = true;
                 // Disable FMV button if we're an unsupported type.
-                if (Model.IsInternal)
+                if (Model.HasPath)
                 {
                     var modelRoot = await XivCache.GetFirstRoot(Model.Source);
                     if (modelRoot == null ||
@@ -699,7 +699,7 @@ protected override KeyValuePair<string, string> GetDefaultExtension()
 
         private void FullModel_Click(object sender, RoutedEventArgs e)
         {
-            if (Model == null || !Model.IsInternal) return;
+            if (Model == null || !Model.HasPath) return;
             try
             {
                 // Load a clean copy of the model.
diff --git a/FFXIV_TexTools/Views/Models/FullModelView.xaml.cs b/FFXIV_TexTools/Views/Models/FullModelView.xaml.cs
index 1e701892..ea92b25b 100644
--- a/FFXIV_TexTools/Views/Models/FullModelView.xaml.cs
+++ b/FFXIV_TexTools/Views/Models/FullModelView.xaml.cs
@@ -250,19 +250,12 @@ private async Task Export(string fullModelName)
             foreach(var mdl in fmViewPortVM.shownModels.Select(x => x.Value.TtModel))
             {
                 var m = (TTModel) mdl.Clone();
-
-                if (Settings.Default.ShiftExportUV)
-                {
-                    // This is not a typo.  Because we haven't flipped the UV yet, we need to -1, not +1.
-                    ModelModifiers.ShiftImportUV(m);
-                }
-                
                 models.Add(m);
             }
 
             
 
-            TTModel.SaveFullToFile(dbPath, _fmvm.SelectedSkeleton.XivRace, models, null, MainWindow.DefaultTransaction);
+            TTModel.SaveFullToFile(dbPath, _fmvm.SelectedSkeleton.XivRace, models, null, MainWindow.DefaultTransaction, Settings.Default.ShiftExportUV);
 
             var proc = new Process
             {
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index d2de105b..659840a7 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit d2de105b17e19d2ead10fbf2f78a8191c5556374
+Subproject commit 659840a79d206e2c7677a38058ceb098feb78fb7

From eb6d423076557f1b90ac592ae2497e13f262256d Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 02:24:46 -0400
Subject: [PATCH 03/11] Flow Data Fiesta

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

diff --git a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
index f3dd38a1..d29f5d17 100644
--- a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
@@ -150,7 +150,7 @@ protected override async Task<bool> INTERNAL_LoadFile(byte[] data, string path,
             // The data coming in here is an uncompressed .mdl file.
             return await Task.Run(async () =>
             {
-                return await LoadModel(Mdl.GetTTModel(data, path));
+                return await LoadModel(await Mdl.GetTTModel(data, path));
             });
         }
         protected async Task<bool> LoadModel(TTModel model) {
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 659840a7..b14e51f4 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 659840a79d206e2c7677a38058ceb098feb78fb7
+Subproject commit b14e51f457e039d2e882943ec099c6ef24303e7e

From 2ccfb2273fcf6d4b91ece8209932019432f460e4 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 03:00:25 -0400
Subject: [PATCH 04/11] ref

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

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index b14e51f4..d611d614 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit b14e51f457e039d2e882943ec099c6ef24303e7e
+Subproject commit d611d614868e27153b755d91e03cd07dfe0f2137

From 0305b4d0d0dd4fef0fee9bbfaefcf15b2a3379c8 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 12:41:36 -0400
Subject: [PATCH 05/11] wrap some sus ui error

---
 FFXIV_TexTools/Views/ViewHelpers.cs | 35 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/FFXIV_TexTools/Views/ViewHelpers.cs b/FFXIV_TexTools/Views/ViewHelpers.cs
index 5a3b3aa6..e11dd5d0 100644
--- a/FFXIV_TexTools/Views/ViewHelpers.cs
+++ b/FFXIV_TexTools/Views/ViewHelpers.cs
@@ -92,23 +92,26 @@ public static WindowWrapper GetWin32Window(this UserControl control)
         public static bool ConfirmDiscardChanges(this UserControl control, string filePath)
         {
 
-            WindowWrapper win32Window = null;
-            var wind = Window.GetWindow(control);
-            if (!IsWindowOpen(wind))
-            {
-                wind = null;
-            }
-            else
+            return Application.Current.Dispatcher.Invoke(() =>
             {
-                win32Window = new WindowWrapper(new WindowInteropHelper(wind).Handle);
-            }
-            var fileName = Path.GetFileName(filePath);
-            var res = FlexibleMessageBox.Show(win32Window, "You have unsaved changes to the file: " + fileName +  "\nThey will be lost if you continue.\n\nAre you sure you wish to continue and discard these changes?", "Discard Changes Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
-            if(res == DialogResult.Yes || res == DialogResult.OK)
-            {
-                return true;
-            }
-            return false;
+                WindowWrapper win32Window = null;
+                var wind = Window.GetWindow(control);
+                if (!IsWindowOpen(wind))
+                {
+                    wind = null;
+                }
+                else
+                {
+                    win32Window = new WindowWrapper(new WindowInteropHelper(wind).Handle);
+                }
+                var fileName = Path.GetFileName(filePath);
+                var res = FlexibleMessageBox.Show(win32Window, "You have unsaved changes to the file: " + fileName + "\nThey will be lost if you continue.\n\nAre you sure you wish to continue and discard these changes?", "Discard Changes Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+                if (res == DialogResult.Yes || res == DialogResult.OK)
+                {
+                    return true;
+                }
+                return false;
+            });
         }
 
 

From 0e23ee654f1bc6fd02eec853997132894adca5bf Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:49:27 -0400
Subject: [PATCH 06/11] Model Import cleanup and additions.

---
 FFXIV_TexTools/App.xaml                       |   1 +
 .../ViewModels/ImportModelEditViewModel.cs    |  15 +-
 .../ViewModels/ImportModelViewModel.cs        |  22 +-
 .../Views/Models/ImportModelEditView.xaml     |  23 +-
 .../Views/Models/ImportModelEditView.xaml.cs  |  39 ++-
 .../Views/Models/ImportModelView.xaml         |  58 ++--
 .../Views/Models/ImportModelView.xaml.cs      |   6 -
 .../Views/Models/ModifyPartWindow.xaml        |  33 --
 .../Views/Models/ModifyPartWindow.xaml.cs     | 101 ------
 .../Views/Models/ModifyVerticesWindow.xaml    | 140 +++++++++
 .../Views/Models/ModifyVerticesWindow.xaml.cs | 295 ++++++++++++++++++
 .../Transactions/TransactionStatusWindow.xaml |   5 +-
 12 files changed, 540 insertions(+), 198 deletions(-)
 delete mode 100644 FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml
 delete mode 100644 FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml.cs
 create mode 100644 FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml
 create mode 100644 FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml.cs

diff --git a/FFXIV_TexTools/App.xaml b/FFXIV_TexTools/App.xaml
index fbb2bce8..ff1e5e7e 100644
--- a/FFXIV_TexTools/App.xaml
+++ b/FFXIV_TexTools/App.xaml
@@ -12,6 +12,7 @@
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+
                 <ResourceDictionary Source="Simple Styles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
index 505f6ede..a2ccdf1c 100644
--- a/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/ImportModelEditViewModel.cs
@@ -60,6 +60,11 @@ public class ImportModelEditViewModel : INotifyPropertyChanged
 
         private XivDependencyRoot _root;
 
+        public void UpdateFlow()
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(EnableAnisotropy)));
+        }
+
 
         public bool DisableShadows
         {
@@ -75,6 +80,7 @@ public bool DisableShadows
                 {
                     _newModel.Flags &= ~EMeshFlags1.ShadowDisabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DisableShadows)));
             }
         }
         public bool DisableLightShadow
@@ -93,6 +99,7 @@ public bool DisableLightShadow
                 {
                     _newModel.Flags &= ~EMeshFlags1.LightShadowDisabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DisableLightShadow)));
             }
         }
         public bool EnableAnisotropy
@@ -103,8 +110,8 @@ public bool EnableAnisotropy
             }
             set
             {
-
                 _newModel.AnisotropicLightingEnabled = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(EnableAnisotropy)));
             }
         }
         public bool DisableWavingAnimation
@@ -123,6 +130,7 @@ public bool DisableWavingAnimation
                 {
                     _newModel.Flags &= ~EMeshFlags1.WavingAnimationDisabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DisableWavingAnimation)));
             }
         }
         public bool EnableLightingReflection
@@ -141,6 +149,7 @@ public bool EnableLightingReflection
                 {
                     _newModel.Flags &= ~EMeshFlags1.LightingReflectionEnabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(EnableLightingReflection)));
             }
         }
         public bool UnknownFlag
@@ -159,6 +168,7 @@ public bool UnknownFlag
                 {
                     _newModel.Flags &= ~EMeshFlags1.Unknown10;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(UnknownFlag)));
             }
         }
         public bool OccludeRain
@@ -177,6 +187,7 @@ public bool OccludeRain
                 {
                     _newModel.Flags &= ~EMeshFlags1.RainOcclusionEnabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OccludeRain)));
             }
         }
         public bool OccludeSnow
@@ -195,6 +206,7 @@ public bool OccludeSnow
                 {
                     _newModel.Flags &= ~EMeshFlags1.SnowOcclusionEnabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OccludeSnow)));
             }
         }
         public bool OccludeDust
@@ -213,6 +225,7 @@ public bool OccludeDust
                 {
                     _newModel.Flags &= ~EMeshFlags1.DustOcclusionEnabled;
                 }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OccludeDust)));
             }
         }
 
diff --git a/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs
index ac55a633..8d43292e 100644
--- a/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs
@@ -29,7 +29,6 @@ namespace FFXIV_TexTools.ViewModels
 {
     public class ImportModelViewModel : INotifyPropertyChanged
     {
-        private const int ExpandedHeight = 680;
         private const double CloseDelay = 3000f;
 
         private ImportModelView _view;
@@ -213,28 +212,23 @@ public ImportModelViewModel(ImportModelView view, string internalPath, IItem ref
             // Default Settings for specific categories, event handlers are added to allow users to opt out of these defaults
             if (referenceItem != null)
             {
-                if (referenceItem.SecondaryCategory == XivStrings.Face && ComplexOptionsEnabled)
-                {
-                    _view.UseOriginalShapeDataButton.IsChecked = Settings.Default.UseOriginalShapeDataForFace;
-                }
                 if (referenceItem.SecondaryCategory == XivStrings.Hair)
                 {
                     _view.CloneUV1Button.IsChecked = Settings.Default.CloneUV1toUV2ForHair;
                 }
             }
 
-            _view.UseOriginalShapeDataButton.Click += UseOriginalShapeDataButton_Clicked;
             _view.CloneUV1Button.Click += CloneUV1Button_Clicked;
             _view.ShiftUVsButton.Click += ForceUVsButton_Clicked;
             _view.UseImportedTangentButton.Click += UseExternalTangents_Clicked;
-        }
 
-        private void UseOriginalShapeDataButton_Clicked(object sender, RoutedEventArgs e)
-        {
-            Settings.Default.UseOriginalShapeDataForFace = _view.UseOriginalShapeDataButton.IsChecked == true;
-            Settings.Default.Save();
+            if (!string.IsNullOrWhiteSpace(startingFilePath))
+            {
+                SetRaceOverrideByFileName();
+            }
         }
 
+
         private void CloneUV1Button_Clicked(object sender, RoutedEventArgs e)
         {
             Settings.Default.CloneUV1toUV2ForHair = _view.CloneUV1Button.IsChecked == true;
@@ -331,7 +325,7 @@ private async Task DoImport(bool showEditor)
                 }
             }
 
-            _view.Height = ExpandedHeight;
+            _view.LogGrid.Height = 400;
             _view.EnableAll(false);
 
             // Clear log.
@@ -339,12 +333,8 @@ private async Task DoImport(bool showEditor)
             _view.LogTextBox.AppendText("");
 
             var options = new ModelImportOptions();
-            options.UseOriginalShapeData = _view.UseOriginalShapeDataButton.IsChecked == true ? true : false;
             options.ShiftImportUV = _view.ShiftUVsButton.IsChecked == true ? true : false;
-            options.ClearUV2 = _view.ClearUV2Button.IsChecked == true ? true : false;
             options.CloneUV2 = _view.CloneUV1Button.IsChecked == true ? true : false;
-            options.ClearVAlpha = _view.ClearVAlphaButton.IsChecked == true ? true : false;
-            options.ClearVColor = _view.ClearVColorButton.IsChecked == true ? true : false;
             options.AutoScale = _view.AutoScaleButton.IsChecked == true ? true : false;
             options.UseImportedTangents = _view.UseImportedTangentButton.IsChecked == true ? true : false;
 
diff --git a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
index 2768b43a..5be6d5a2 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
+++ b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
@@ -9,7 +9,7 @@
         mc:Ignorable="d"
         Title="Model Editor" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" ResizeMode="NoResize"
                  Width="860"
-                 Height="610">
+                 Height="660">
     <Grid x:Name="MainGrid">
         
         <!-- Main Grid Definitions -->
@@ -27,6 +27,7 @@
 
         <Grid Grid.Column="0" Grid.Row="1">
             <Grid.RowDefinitions>
+                <RowDefinition Height="45"/>
                 <RowDefinition Height="45"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
@@ -35,7 +36,11 @@
 
             <Label Content="Model Settings" Margin="0" VerticalAlignment="Center" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
 
-            <Grid Grid.Row="1" Margin="5">
+            <Grid Grid.Row="1">
+                <Button Margin="10,0" Content="Modify Model Vertices" Click="ModifyModel_Click" VerticalAlignment="Center"></Button>
+            </Grid>
+            
+            <Grid Grid.Row="2" Margin="5">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"/>
                     <RowDefinition Height="35"/>
@@ -138,7 +143,7 @@
                 </CheckBox>
             </Grid>
 
-            <Grid Grid.Row="2" Margin="5, 0">
+            <Grid Grid.Row="3" Margin="5, 0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
                     <ColumnDefinition/>
@@ -179,12 +184,14 @@
         <Grid x:Name="MeshGroupGrid" Grid.Row="1" Grid.Column="1">
             <!-- Mesh Group Grid Definitions -->
             <Grid.RowDefinitions>
+                <RowDefinition Height="45"/>
                 <RowDefinition Height="45"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="125"/>
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
+            <Button Grid.Row="1" Margin="10,0" Content="Modify Mesh Vertices" Click="ModifyMesh_Click" VerticalAlignment="Center"></Button>
 
             <Grid Grid.Row="0" Margin="5">
                 <Grid.ColumnDefinitions>
@@ -198,8 +205,7 @@
             </Grid>
 
 
-
-            <Grid x:Name="MeshGroupSettings" Margin="5" Grid.Row="1">
+            <Grid x:Name="MeshGroupSettings" Margin="5" Grid.Row="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"></ColumnDefinition>
                     <ColumnDefinition></ColumnDefinition>
@@ -212,7 +218,8 @@
 
             </Grid>
 
-            <Border Grid.Row="2" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
+
+            <Border Grid.Row="3" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
                 <Grid>
                     <Label Content="Material" Margin="0" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
                     <ComboBox x:Name="MaterialSelectorBox" Margin="10,40,10,40" VerticalAlignment="Top" Height="26"/>
@@ -220,7 +227,7 @@
                 </Grid>
             </Border>
 
-            <Border Grid.Row="3" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
+            <Border Grid.Row="4" BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1" Margin="10,5,10,10">
                 <Grid>
                     <Label Content="Shapes" Margin="0,0,0,0" Grid.Row="0" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
                     <ListBox x:Name="ShapesListBox" Margin="10,40,10,50" Grid.Row="0" Style="{DynamicResource SimpleListBox}" MinHeight="100"/>
@@ -252,7 +259,7 @@
                 <Button x:Name="DeletePartButton" Content="Delete Part" Grid.Row="0" VerticalAlignment="Center" Grid.Column="2" Margin="5" Click="DeletePart_Click"/>
             </Grid>
 
-            <Button Grid.Row="1" Margin="10,0" Content="Modify Part Vertices" Click="ModifyPart_Click" HorizontalAlignment="Left" Width="150" VerticalAlignment="Center"></Button>
+            <Button Grid.Row="1" Margin="10,0" Content="Modify Part Vertices" Click="ModifyPart_Click" VerticalAlignment="Center"></Button>
 
             <Label Content="Attributes" Margin="10,10,10,0" Grid.Row="2" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34" Grid.Column="1"/>
 
diff --git a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml.cs b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml.cs
index 2f16f0e6..b87bd610 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml.cs
+++ b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml.cs
@@ -30,6 +30,8 @@ public partial class ImportModelEditView
         public ObservableCollection<KeyValuePair<double, string>> SizeMultiplierSource = new ObservableCollection<KeyValuePair<double, string>>();
         public ObservableCollection<KeyValuePair<int, string>> MdlVersionSource = new ObservableCollection<KeyValuePair<int, string>>();
 
+        private bool _CloseConfirmed = false;
+
         public ImportModelEditView(TTModel newModel, TTModel oldModel)
         {
             InitializeComponent();
@@ -124,6 +126,18 @@ public ImportModelEditView(TTModel newModel, TTModel oldModel)
 
         private void ImportModelEditView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            if (!_CloseConfirmed)
+            {
+                if (!this.ShowConfirmation("Model Editor Cancel Confirmation", "Any changes you made in the model editor will be lost.\n\nAre you sure you wish to cancel these changes?"))
+                {
+                    e.Cancel = true;
+                    return;
+                } else
+                {
+                    _CloseConfirmed = true;
+                }
+            }
+
             if (null != Owner)
             {
                 Owner.Activate();
@@ -162,11 +176,14 @@ private void ImportButton_Click(object sender, RoutedEventArgs e)
             }
             var val = (int)MdlVersionComboBox.SelectedValue;
             _newModel.MdlVersion = (ushort)val;
+
+            _CloseConfirmed = true;
             DialogResult = true;
         }
 
         private void CancelButton_Click(object sender, RoutedEventArgs e)
         {
+            _CloseConfirmed = true;
             DialogResult = false;
         }
 
@@ -253,7 +270,27 @@ private void ModifyPart_Click(object sender, RoutedEventArgs e)
             {
                 return;
             }
-            ModifyPartWindow.ShowPartModifier(mg.Parts[part], this);
+            ModifyVerticesWindow.ShowVertexModifier(mg.Parts[part], _newModel, this);
+            _viewModel.UpdateFlow();
+        }
+
+        private void ModifyMesh_Click(object sender, RoutedEventArgs e)
+        {
+            var mesh = (int)MeshNumberBox.SelectedValue;
+            if (_newModel.MeshGroups.Count <= mesh || mesh < 0)
+            {
+                return;
+            }
+            var mg = _newModel.MeshGroups[mesh];
+
+            ModifyVerticesWindow.ShowVertexModifier(mg, _newModel, this);
+            _viewModel.UpdateFlow();
+        }
+
+        private void ModifyModel_Click(object sender, RoutedEventArgs e)
+        {
+            ModifyVerticesWindow.ShowVertexModifier(_newModel, _newModel, this);
+            _viewModel.UpdateFlow();
         }
     }
 }
diff --git a/FFXIV_TexTools/Views/Models/ImportModelView.xaml b/FFXIV_TexTools/Views/Models/ImportModelView.xaml
index 8e28098d..9b16e5b3 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelView.xaml
+++ b/FFXIV_TexTools/Views/Models/ImportModelView.xaml
@@ -7,56 +7,54 @@
         xmlns:resx="clr-namespace:FFXIV_TexTools.Resources"
         resx:Localization.Enabled="True"                     
         mc:Ignorable="d"
-        Title="Model Importer" Height="290" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" Width="640" ResizeMode="NoResize">
+        Title="Model Importer" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" Width="640" ResizeMode="NoResize" SizeToContent="Height">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="60"></RowDefinition>
-            <RowDefinition Height="160"></RowDefinition>
             <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="1*"></RowDefinition>
+            <RowDefinition Height="80"></RowDefinition>
+            <RowDefinition Height="40"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
-        <Grid VerticalAlignment="Top" Grid.Row="0">
+        <Grid VerticalAlignment="Center" Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="223*"/>
                 <ColumnDefinition Width="39*"/>
                 <ColumnDefinition Width="55*"/>
             </Grid.ColumnDefinitions>
-            <TextBox x:Name="FileNameTextBox" mah:TextBoxHelper.Watermark="Using existing model" Text="" Grid.ColumnSpan="1" Margin="10,14,5,14" VerticalAlignment="Center" VerticalContentAlignment="Center" FontStyle="Italic" Height="26" />
-            <Button x:Name="SelectFileButton" Content="..." Grid.ColumnSpan="1" Grid.Column="1" Margin="5,14" VerticalAlignment="Center" Height="26" />
-            <Button x:Name="UseExistingButton" Content="Use Existing" Grid.ColumnSpan="1" Margin="5,14,10,14" VerticalAlignment="Center" Grid.Column="2" Height="26" Click="UseExistingButton_Click" />
+            <TextBox x:Name="FileNameTextBox" mah:TextBoxHelper.Watermark="Using existing model" Text="" Grid.ColumnSpan="1" Margin="10,0" VerticalAlignment="Center" VerticalContentAlignment="Center" FontStyle="Italic" />
+            <Button x:Name="SelectFileButton" Content="..." Grid.ColumnSpan="1" Grid.Column="1" Margin="10,0" VerticalAlignment="Center" />
+            <Button x:Name="UseExistingButton" Content="Use Existing" Grid.ColumnSpan="1" Margin="10,0" VerticalAlignment="Center" Grid.Column="2" Click="UseExistingButton_Click" />
 
         </Grid>
-        <Grid Margin="10,10,10,10" Grid.Row="1">
+        <Grid Margin="10,0" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"></ColumnDefinition>
                 <ColumnDefinition Width="1*"></ColumnDefinition>
                 <ColumnDefinition Width="1*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height ="1*"></RowDefinition>
-                <RowDefinition Height ="1*"></RowDefinition>
-                <RowDefinition Height ="1*"></RowDefinition>
-                <RowDefinition Height ="1*"></RowDefinition>
+                <RowDefinition Height ="40"></RowDefinition>
+                <RowDefinition Height ="40"></RowDefinition>
+                <RowDefinition Height ="40"></RowDefinition>
             </Grid.RowDefinitions>
-            <CheckBox x:Name="UseOriginalShapeDataButton" Content="Use Original Shape Data" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Enable the model's original shape data. (Should be ON for Faces)"  IsEnabled="{Binding Path=ComplexOptionsEnabled}"/>
-            <CheckBox x:Name="ClearUV2Button" Content="Clear UV2" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="1"  VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Reset the second UV layer to [0,0]" />
-            <CheckBox x:Name="ClearVColorButton" Content="Clear Vertex Color" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="2"  VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Reset the Vertex Color to [255,255,255]" />
-            <CheckBox x:Name="ShiftUVsButton" Content="Shift Imported UVs" Style="{DynamicResource SimpleCheckBox}" Grid.Row="1" Grid.Column="0"  VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Shift the incoming UV by -1 V.  If you are importing an Old TT2.0 model, this should be OFF."  />
-            <CheckBox x:Name="CloneUV1Button" Content="Clone UV1 to UV2" Style="{DynamicResource SimpleCheckBox}" Grid.Row="1" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Copy UV1 into UV2. (Useful for Hair shader items)"  />
-            <CheckBox x:Name="ClearVAlphaButton" Content="Clear Vertex Alpha" Style="{DynamicResource SimpleCheckBox}" Grid.Row="1" Grid.Column="2" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Reset the Vertex Alpha to [255]" />
-            <CheckBox x:Name="AutoScaleButton" Content="Automatically Adjust Scale" Style="{DynamicResource SimpleCheckBox}" Grid.Row="2" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Automatically attempt to fix errors caused by improper unit scalings."  IsEnabled="{Binding Path=ComplexOptionsEnabled}"/>
+            <CheckBox x:Name="ShiftUVsButton" Content="Shift Imported UVs" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="0"  VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Shift the incoming UV by -1 V.  If you are importing an Old TT2.0 model, this should be OFF."  />
+            <CheckBox x:Name="CloneUV1Button" Content="Clone UV1 to UV2" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Copy UV1 into UV2. (Useful for Hair shader items)"  />
+            <CheckBox x:Name="AutoScaleButton" Content="Automatically Adjust Scale" Style="{DynamicResource SimpleCheckBox}" Grid.Row="1" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Automatically attempt to fix errors caused by improper unit scalings."  IsEnabled="{Binding Path=ComplexOptionsEnabled}"/>
+
+            <CheckBox x:Name="OverrideRaceButton" Content="Override Incoming Race:" Style="{DynamicResource SimpleCheckBox}" Grid.Row="1" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Make TexTools convert your model from a different race to appropriate one for this item." />
+            <ComboBox Grid.Row="1" Grid.Column="2" x:Name="RaceComboBox" Width="200" VerticalAlignment="Center"></ComboBox>
+
+            <CheckBox x:Name="UseImportedTangentButton" Content="Use Imported Tangents" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="2" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Use Tangent/Binormal Data from the imported file, rather than recalculating it."  />
 
-            <CheckBox x:Name="OverrideRaceButton" Content="Override Incoming Race:" Style="{DynamicResource SimpleCheckBox}" Grid.Row="2" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Make TexTools convert your model from a different race to appropriate one for this item." />
-            <ComboBox Grid.Row="2" Grid.Column="2" x:Name="RaceComboBox" Width="200" VerticalAlignment="Center"></ComboBox>
-            
-            <CheckBox x:Name="UseImportedTangentButton" Content="Use Imported Tangents" Style="{DynamicResource SimpleCheckBox}" Grid.Row="3" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Use Tangent/Binormal Data from the imported file, rather than recalculating it."  />
-            
         </Grid>
-        <UniformGrid Margin="10,5,10,5" Columns="3" Grid.Row="2">
-            <Button x:Name="CancelButton" Content="Cancel" Margin="0,0,10,0" Click="CancelButton_Click"  />
-            <Button x:Name="EditButton" Content="Open Editor" Margin="0" IsEnabled="{Binding Path=ComplexOptionsEnabled}" />
-            <Button x:Name="ImportButton" Content="{Binding Path=FinishText}" Margin="10,0,0,0" />
+        <UniformGrid Margin="10,0" Columns="3" Grid.Row="2">
+            <Button x:Name="CancelButton" Content="Cancel" Margin="10,0" Click="CancelButton_Click" VerticalAlignment="Center" />
+            <Button x:Name="EditButton" Content="Open Editor" Margin="10,0" IsEnabled="{Binding Path=ComplexOptionsEnabled}" VerticalAlignment="Center" />
+            <Button x:Name="ImportButton" Content="{Binding Path=FinishText}" Margin="10,0" VerticalAlignment="Center" />
         </UniformGrid>
-        <RichTextBox x:Name="LogTextBox" Block.LineHeight="2" Height="418"  Grid.Row="3" Margin="8,0,8,0" VerticalAlignment="Top" Background="#FFE2E2E2" Foreground="Black" FontFamily="Courier New" VerticalScrollBarVisibility="Visible" Padding="5" IsUndoEnabled="True" IsReadOnly="True" mah:TextBoxHelper.WatermarkWrapping="Wrap"/>
+
+        <Grid Grid.Row="3" Height="0" x:Name="LogGrid">
+            <RichTextBox x:Name="LogTextBox" Block.LineHeight="2" Grid.Row="3" Margin="10" VerticalAlignment="Stretch" Background="#FFE2E2E2" Foreground="Black" FontFamily="Courier New" VerticalScrollBarVisibility="Visible" Padding="5" IsUndoEnabled="True" IsReadOnly="True" mah:TextBoxHelper.WatermarkWrapping="Wrap"/>
+        </Grid>
     </Grid>
 </mah:MetroWindow>
diff --git a/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs b/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs
index dca1fa96..fc395781 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs
+++ b/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs
@@ -47,8 +47,6 @@ public partial class ImportModelView
         private ImportModelViewModel _viewModel;
         private byte[] _data;
 
-        // Height to expand to when opening the log window.
-
         public ImportModelView(string internalPath, IItem referenceItem, Action<ModelImportResult> onComplete = null, string startingFilePath = null, bool simpleMode = false, bool clearEmptyMaterials = false)
         {
             InitializeComponent();
@@ -151,12 +149,8 @@ public void EnableAll(bool enabled)
             CancelButton.IsEnabled = enabled;
             ImportButton.IsEnabled = enabled;
             EditButton.IsEnabled = enabled;
-            ClearUV2Button.IsEnabled = enabled;
             CloneUV1Button.IsEnabled = enabled;
-            ClearVColorButton.IsEnabled = enabled;
-            ClearVAlphaButton.IsEnabled = enabled;
             UseImportedTangentButton.IsEnabled = enabled;
-            UseOriginalShapeDataButton.IsEnabled = enabled;
             ShiftUVsButton.IsEnabled = enabled;
             FileNameTextBox.IsEnabled = enabled;
             UseExistingButton.IsEnabled = enabled;
diff --git a/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml b/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml
deleted file mode 100644
index 8a69a8e1..00000000
--- a/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Window x:Class="FFXIV_TexTools.Views.Models.ModifyPartWindow"
-        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.Models"
-        mc:Ignorable="d"
-        Title="Modify Part" Width="400" SizeToContent="Height">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-
-        <Button Grid.Row="0" Grid.Column="0" Content="Copy UV1 to UV2" Margin="10,5" Click="CopyUv_Click"></Button>
-        <Button Grid.Row="0" Grid.Column="1" Content="Clear UV2" Margin="10,5" Click="ClearUv2_Click"></Button>
-
-        <Button Grid.Row="1" Grid.Column="0" Content="Clear Vertex Color 1" Margin="10,5" Click="ClearVColor1_Click"></Button>
-        <Button Grid.Row="1" Grid.Column="1" Content="Clear Vertex Color 2" Margin="10,5" Click="ClearVColor2_Click"></Button>
-
-        <Button Grid.Row="2" Grid.Column="0" Content="Clear Vertex Alpha" Margin="10,5" Click="ClearVAlpha_Click"></Button>
-
-        <Label x:Name="NoticeLabel" Grid.Row="10" Margin="10,5" Grid.Column="0" Content="ASDF" FontStyle="Italic" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-        <Button Grid.Row="10" Grid.Column="10" Content="Done" Margin="10,5" Click="Done_Click"></Button>
-    </Grid>
-</Window>
diff --git a/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml.cs b/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml.cs
deleted file mode 100644
index d3666e39..00000000
--- a/FFXIV_TexTools/Views/Models/ModifyPartWindow.xaml.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Timers;
-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;
-using xivModdingFramework.Models.DataContainers;
-using xivModdingFramework.Models.Helpers;
-
-namespace FFXIV_TexTools.Views.Models
-{
-    /// <summary>
-    /// Interaction logic for ModifyPartWindow.xaml
-    /// </summary>
-    public partial class ModifyPartWindow : Window
-    {
-        private TTMeshPart Part;
-        private Timer _Timer;
-        public ModifyPartWindow(TTMeshPart part)
-        {
-            Part = part;
-            InitializeComponent();
-            Closing += ModifyPartWindow_Closing;
-            NoticeLabel.Content = "";
-        }
-
-        private void ModifyPartWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            Owner?.Activate();
-        }
-
-        public static void ShowPartModifier(TTMeshPart part, Window owner)
-        {
-            var wind = new ModifyPartWindow(part);
-            wind.Owner = owner;
-            wind.ShowDialog();
-        }
-
-        private void Done_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-
-        private void SetNotice(string text)
-        {
-            if(_Timer != null)
-            {
-                _Timer.Stop();
-                _Timer.Elapsed -= _Timer_Elapsed;
-            }
-
-            NoticeLabel.Foreground = Brushes.DarkGreen;
-            NoticeLabel.Content = text;
-            _Timer = new Timer(3000);
-            _Timer.Start();
-            _Timer.Elapsed += _Timer_Elapsed;
-            
-        }
-
-        private void _Timer_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            Dispatcher.Invoke(() => { 
-                NoticeLabel.Content = "";
-            });
-        }
-
-        private void ClearUv2_Click(object sender, RoutedEventArgs e)
-        {
-            ModelModifiers.CloneUV2_Part(Part);
-            SetNotice("UV2 Cleared");
-        }
-        private void CopyUv_Click(object sender, RoutedEventArgs e)
-        {
-            ModelModifiers.CloneUV2_Part(Part);
-            SetNotice("UV1 Copied to UV2");
-        }
-        private void ClearVColor1_Click(object sender, RoutedEventArgs e)
-        {
-            ModelModifiers.ClearVColor_Part(Part);
-            SetNotice("Vertex Color 1 Cleared");
-        }
-        private void ClearVColor2_Click(object sender, RoutedEventArgs e)
-        {
-            ModelModifiers.ClearVColor2_Part(Part);
-            SetNotice("Vertex Color 2 Cleared");
-        }
-        private void ClearVAlpha_Click(object sender, RoutedEventArgs e)
-        {
-            ModelModifiers.ClearVAlpha_Part(Part);
-            SetNotice("Vertex Alpha Cleared");
-        }
-    }
-}
diff --git a/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml b/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml
new file mode 100644
index 00000000..068075f1
--- /dev/null
+++ b/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml
@@ -0,0 +1,140 @@
+<mah:MetroWindow x:Class="FFXIV_TexTools.Views.Models.ModifyVerticesWindow"
+        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.Models"
+        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+        mc:Ignorable="d"
+        Title="Modify Part" Width="500" SizeToContent="Height">
+    <Grid Margin="5">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="5"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="5"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="5"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+            <RowDefinition Height="5"></RowDefinition>
+            <RowDefinition Height="30"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+        </Grid.RowDefinitions>
+        
+        <Grid Grid.Row="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="40"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Row="0" Grid.ColumnSpan="2" Content="UV2 Alterations" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+            <TextBlock FontSize="10" FontStyle="Italic" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" TextAlignment="Center">
+                <Run>The UV2 Layer typically controls Decal/Icon placement, such as Legacy Marks or FC Crests.</Run>
+                <LineBreak/>
+                <Run>As such, it should usually either be cleared/empty, or have a specific location masked out for Decals</Run>
+                <LineBreak/>
+                <LineBreak/>
+                <Run>On hair specifically, it is instead used for checking Opacity, and should typically match UV1.</Run>
+            </TextBlock>
+
+
+            <Button Grid.Row="2" Grid.Column="0" Content="Clear UV2" Margin="10,5" Click="ClearUv2_Click"></Button>
+            <Button Grid.Row="2" Grid.Column="1" Content="Copy UV1 to UV2" Margin="10,5" Click="CopyUv_Click"></Button>
+        </Grid>
+
+        <Separator Grid.Row="1" Margin="2" VerticalAlignment="Center"></Separator>
+
+        <Grid Grid.Row="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="40"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Row="0" Grid.ColumnSpan="2" Content="Vertex Color 1 Alterations" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+            <TextBlock FontSize="10" FontStyle="Italic" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap">
+                <Run>Vertex Color 1 is typically read as per-channel mask data.</Run>
+                <LineBreak/>
+                <Run>The exact usage varies by shader.  If not specifically authored, this typically should be fully white/opaque.</Run>
+                <LineBreak/>
+                <LineBreak/>
+                <Run>Clearing this data from existing FFXIV models, such as skin or hair, make cause seems, unexpected shadows, or other issues.</Run>
+            </TextBlock>
+
+
+            <Button Grid.Row="2" Grid.Column="0" Content="Clear Vertex Color 1" Margin="10,5" Click="ClearVColor1_Click"></Button>
+            <Button Grid.Row="2" Grid.Column="1" Content="Clear Vertex Alpha 1" Margin="10,5" Click="ClearVAlpha_Click"></Button>
+        </Grid>
+        <Separator Grid.Row="3" Margin="2" VerticalAlignment="Center"></Separator>
+
+        <Grid Grid.Row="4">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="40"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Row="0" Grid.ColumnSpan="2" Content="Vertex Color 2 Alterations" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+            <TextBlock FontSize="10" FontStyle="Italic" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" TextAlignment="Center">
+                <Run>Vertex Color 2 is typically used for fake-wind Influence.</Run>
+                <LineBreak/>
+                <Run>When not specifically intended, this data should typically be fully black (Disabled).</Run>
+            </TextBlock>
+
+
+            <Button Grid.Row="2" Grid.Column="0" Content="Clear Vertex Color 2" Margin="10,5" Click="ClearVColor2_Click"></Button>
+        </Grid>
+
+        <Separator Grid.Row="5" Margin="2" VerticalAlignment="Center"></Separator>
+
+        <Grid Grid.Row="6">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="40"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Row="0" Grid.ColumnSpan="2" Content="Hair Flow Data (Vertex Color 3)" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+            <TextBlock FontSize="10" FontStyle="Italic" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" TextAlignment="Center">
+                <Run>Anisotropic Flow data affects hair lighting.  Typically, this data should be manually authored...</Run>
+                <LineBreak/>
+                <Run>However, we also provide some simplified tools for creating flow data automatically.</Run>
+                <LineBreak/>
+                <LineBreak/>
+                <Run>For automatic generation, specify the UV orientation of the hair strands in this Model/Mesh/Part.</Run>
+                <LineBreak/>
+                <Run>Clearing this data will generate a somewhat sharp generic specular highlighting effect.</Run>
+                <LineBreak/>
+                <Run>Disabling this data at the full model level will instead generate a more flat lighting effect.</Run>
+            </TextBlock>
+
+            <Button Grid.Row="2" Grid.Column="0" Content="Clear Flow Data" Margin="10,5" Click="ClearFlow_Click"></Button>
+            <Button Grid.Row="2" Grid.Column="1" Content="Disable Flow Data (Entire Model)" Margin="10,5" Click="DisableFlow_Click"></Button>
+            <Button Grid.Row="3" Grid.Column="0" Content="Generate Flow Data" Margin="10,5" Click="GenerateFlow_Click"></Button>
+            <ComboBox Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Margin="10,0" ItemsSource="{Binding Path=FlowSource}" SelectedValue="{Binding Path=FlowDataDirection}" SelectedValuePath="Value" DisplayMemberPath="Key"/>
+        </Grid>
+
+        <Separator Grid.Row="7" Margin="2" VerticalAlignment="Center"></Separator>
+        
+        <Label x:Name="NoticeLabel" Grid.Row="8" Margin="10,0" Grid.Column="0" Content="ASDF" FontStyle="Italic" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Button Grid.Row="9" Content="Done" Margin="10,5" Click="Done_Click"></Button>
+    </Grid>
+</mah:MetroWindow>
diff --git a/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml.cs b/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml.cs
new file mode 100644
index 00000000..cd97878e
--- /dev/null
+++ b/FFXIV_TexTools/Views/Models/ModifyVerticesWindow.xaml.cs
@@ -0,0 +1,295 @@
+using MahApps.Metro.Controls;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+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 xivModdingFramework.Models.DataContainers;
+using xivModdingFramework.Models.Helpers;
+using Vector2 = SharpDX.Vector2;
+
+namespace FFXIV_TexTools.Views.Models
+{
+    /// <summary>
+    /// Interaction logic for ModifyPartWindow.xaml
+    /// </summary>
+    public partial class ModifyVerticesWindow : MetroWindow, INotifyPropertyChanged
+    {
+        private object _Element;
+
+        private TTMeshPart Part
+        {
+            get => _Element as TTMeshPart;
+        }
+        private TTMeshGroup Mesh
+        {
+            get => _Element as TTMeshGroup;
+        }
+        private TTModel Model
+        {
+            get => _Element as TTModel;
+        }
+
+        private TTModel _RawModel;
+
+        private Timer _Timer;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public ObservableCollection<KeyValuePair<string, Vector2>> FlowSource { get; set; } = new ObservableCollection<KeyValuePair<string, Vector2>>()
+        {
+            new KeyValuePair<string, Vector2>("Vertical |", new Vector2(0,1)),
+            new KeyValuePair<string, Vector2>("Horizontal |", new Vector2(1,0)),
+            new KeyValuePair<string, Vector2>("Diagonal \\", new Vector2(1,1)),
+            new KeyValuePair<string, Vector2>("Diagonal /", new Vector2(1,-1)),
+        };
+
+        private Vector2 _FlowDirection = new Vector2(0,1);
+        public Vector2 FlowDataDirection
+        {
+            get
+            {
+                return _FlowDirection;
+            }
+            set
+            {
+                _FlowDirection = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(FlowDataDirection)));
+            }
+        }
+
+        public ModifyVerticesWindow(object element, TTModel model)
+        {
+            _RawModel = model;
+            DataContext = this;
+            _Element = element;
+            InitializeComponent();
+            Closing += OnClose;
+            NoticeLabel.Content = "";
+
+            if(Part != null)
+            {
+                Title = "Modify Part Vertices: " + Part.Name;
+            } else if(Mesh != null)
+            {
+                Title = "Modify Mesh Vertices: " + Mesh.Name;
+            } else if (Model != null)
+            {
+                if (string.IsNullOrWhiteSpace(Model.Source))
+                {
+                    Title = "Modify Model Vertices: Unknown Model";
+                }
+                else
+                {
+                    Title = "Modify Model Vertices: " + Path.GetFileNameWithoutExtension(Model.Source);
+                }
+            }
+            else
+            {
+                this.ShowWarning("Invalid Object", "Cannot edit invalid object: " + element);
+                this.Close();
+            }
+        }
+
+        private void OnClose(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            Owner?.Activate();
+        }
+
+        public static void ShowVertexModifier(object element, TTModel model, Window owner)
+        {
+            var wind = new ModifyVerticesWindow(element, model);
+            wind.Owner = owner;
+            wind.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            wind.ShowDialog();
+        }
+
+        private void Done_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void SetNotice(string text, bool err = false)
+        {
+            if(_Timer != null)
+            {
+                _Timer.Stop();
+                _Timer.Elapsed -= _Timer_Elapsed;
+            }
+
+            if(err)
+            {
+                NoticeLabel.Foreground = Brushes.DarkRed;
+            } else
+            {
+                NoticeLabel.Foreground = Brushes.DarkGreen;
+            }
+            NoticeLabel.Content = text;
+            _Timer = new Timer(3000);
+            _Timer.Start();
+            _Timer.Elapsed += _Timer_Elapsed;
+            
+        }
+
+        private void _Timer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            Dispatcher.Invoke(() => { 
+                NoticeLabel.Content = "";
+            });
+        }
+
+        private async void ClearUv2_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.ClearUV2_Part(p);
+                });
+                SetNotice("UV2 Cleared");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Clear UV2: " + ex.Message, true);
+            }
+        }
+        private async void CopyUv_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.CloneUV2_Part(p);
+                });
+                SetNotice("UV1 Copied to UV2");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Copy UV: " + ex.Message, true);
+            }
+        }
+        private async void ClearVColor1_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.ClearVColor_Part(p);
+                });
+                SetNotice("Vertex Color 1 Cleared");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Clear VColor1: " + ex.Message, true);
+            }
+        }
+        private async void ClearVColor2_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.ClearVColor2_Part(p);
+                });
+                SetNotice("Vertex Color 2 Cleared");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Clear VColor2: " + ex.Message, true);
+            }
+        }
+        private async void ClearVAlpha_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.ClearVAlpha_Part(p);
+                });
+                SetNotice("Vertex Alpha Cleared");
+            } catch(Exception ex)
+            {
+                SetNotice("Unable to Clear Vertex Alpha: " + ex.Message, true);
+            }
+        }
+
+
+        private async Task ForAllParts(Func<TTMeshPart, Task> act)
+        {
+            var tasks = new List<Task>();
+            if(Part != null)
+            {
+                tasks.Add(Task.Run(async() => await act(Part)));
+            } else if(Mesh != null) {
+                foreach(var p in Mesh.Parts)
+                {
+                    tasks.Add(Task.Run(async () => await act(p)));
+                }
+            } else if(Model != null)
+            {
+                foreach(var m in Model.MeshGroups)
+                {
+                    foreach(var p in m.Parts)
+                    {
+                        tasks.Add(Task.Run(async () => await act(p)));
+                    }
+                }
+            }
+
+            await Task.WhenAll(tasks);
+        }
+
+        private async void ClearFlow_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.ClearFlow_Part(p);
+                });
+                _RawModel.AnisotropicLightingEnabled = true;
+                SetNotice("Flow Data Cleared");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Clear Flow Data: " + ex.Message, true);
+            }
+        }
+
+        private async void GenerateFlow_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var dir = FlowDataDirection;
+                await ForAllParts(async (p) =>
+                {
+                    ModelModifiers.SetFlow_Part(p, dir);
+                });
+                _RawModel.AnisotropicLightingEnabled = true;
+                SetNotice("Flow Data Generated");
+            }
+            catch (Exception ex)
+            {
+                SetNotice("Unable to Generate Flow Data: " + ex.Message, true);
+            }
+        }
+
+        private void DisableFlow_Click(object sender, RoutedEventArgs e)
+        {
+            _RawModel.AnisotropicLightingEnabled = false;
+            SetNotice("Flow Data Disabled");
+        }
+    }
+}
diff --git a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml
index c3eadcaa..8f20a3e2 100644
--- a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml
+++ b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml
@@ -1,6 +1,7 @@
-<Window x:Class="FFXIV_TexTools.Views.Transactions.TransactionStatusWindow"
+<mah:MetroWindow x:Class="FFXIV_TexTools.Views.Transactions.TransactionStatusWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         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.Transactions"
@@ -107,4 +108,4 @@
             <Button Content="Commit Transaction"  Grid.Column="4"  VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Width="150" Click="Commit_Click" IsEnabled="{Binding Path=CommitEnabled}"></Button>
         </Grid>
     </Grid>
-</Window>
+</mah:MetroWindow>

From e8b1047a9cda302b48122104ddb6a549dda23c73 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:49:31 -0400
Subject: [PATCH 07/11] ref

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

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index d611d614..5f0e4aa7 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit d611d614868e27153b755d91e03cd07dfe0f2137
+Subproject commit 5f0e4aa765544419a9b9216c685a318038cd608e

From 4780d280bd35e167c0d5ea5cbf320dd4d1a3f5a0 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:09:21 -0400
Subject: [PATCH 08/11] Catches for silly things.

---
 FFXIV_TexTools/FFXIV_TexTools.csproj                       | 6 +++---
 FFXIV_TexTools/ViewModels/FullModelViewModel.cs            | 5 +++++
 .../Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs  | 7 +++++--
 FFXIV_TexTools/Views/Models/ImportModelEditView.xaml       | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index a10c5bd8..bafb0095 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
     
-    <ApplicationVersion>3.0.7.6</ApplicationVersion>
-    <AssemblyVersion>3.0.7.6</AssemblyVersion>
-    <FileVersion>3.0.7.6</FileVersion>
+    <ApplicationVersion>3.0.8.0</ApplicationVersion>
+    <AssemblyVersion>3.0.8.0</AssemblyVersion>
+    <FileVersion>3.0.8.0</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>
diff --git a/FFXIV_TexTools/ViewModels/FullModelViewModel.cs b/FFXIV_TexTools/ViewModels/FullModelViewModel.cs
index 57ec49c5..de225c76 100644
--- a/FFXIV_TexTools/ViewModels/FullModelViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/FullModelViewModel.cs
@@ -974,6 +974,11 @@ private void ReIndexMaterialDictionary(TTModel ttModel, Dictionary<int, ModelTex
         /// </summary>
         private void Remove(object obj)
         {
+            if (ModelList.Count == 0 || ModelList == null)
+            {
+                return;
+            }
+
             if (ModelList.Count == 1)
             {
                 ViewportVM.ClearAll();
diff --git a/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs b/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs
index 3a222578..cee91c21 100644
--- a/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/ModPack/Wizard/ManipulationEditorWindow.xaml.cs
@@ -159,8 +159,11 @@ private void RebuildList()
 
         private void RemoveManipulation_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            Data.Manipulations.Remove(SelectedManipulation);
-            RebuildList();
+            if (SelectedManipulation != null && Data.Manipulations != null)
+            {
+                Data.Manipulations.Remove(SelectedManipulation);
+                RebuildList();
+            }
         }
 
         private void Done_Click(object sender, System.Windows.RoutedEventArgs e)
diff --git a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
index 5be6d5a2..28de6031 100644
--- a/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
+++ b/FFXIV_TexTools/Views/Models/ImportModelEditView.xaml
@@ -37,7 +37,7 @@
             <Label Content="Model Settings" Margin="0" VerticalAlignment="Center" HorizontalContentAlignment="Center" FontSize="18" FontWeight="Bold" Height="34"/>
 
             <Grid Grid.Row="1">
-                <Button Margin="10,0" Content="Modify Model Vertices" Click="ModifyModel_Click" VerticalAlignment="Center"></Button>
+                <Button Margin="10,0" Content="Modify All Vertices" Click="ModifyModel_Click" VerticalAlignment="Center"></Button>
             </Grid>
             
             <Grid Grid.Row="2" Margin="5">

From 40135a24a52631ee152111e71d8218885a794c76 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:51:45 -0400
Subject: [PATCH 09/11] Fixing some ui buggery

---
 .../Views/Controls/ShaderKeysEditor.xaml.cs       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/FFXIV_TexTools/Views/Controls/ShaderKeysEditor.xaml.cs b/FFXIV_TexTools/Views/Controls/ShaderKeysEditor.xaml.cs
index f60e6589..29bfdc30 100644
--- a/FFXIV_TexTools/Views/Controls/ShaderKeysEditor.xaml.cs
+++ b/FFXIV_TexTools/Views/Controls/ShaderKeysEditor.xaml.cs
@@ -25,6 +25,10 @@ public WrappedKey(ShaderKeysEditor editor, ShaderKey key)
             {
                 _Editor = editor;
                 Key = key;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KnownValues)));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KeyId)));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Name)));
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
             }
 
             public event PropertyChangedEventHandler PropertyChanged;
@@ -41,10 +45,6 @@ public uint KeyId
                 set
                 {
                     Key.KeyId = value;
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KeyId)));
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Name)));
-                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KnownValues)));
-
                     var ninfo = Key.GetKeyInfo(_Editor.Material.ShaderPack);
                     if (ninfo != null)
                     {
@@ -54,6 +54,12 @@ public uint KeyId
                     {
                         Value = 0;
                     }
+
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KnownValues)));
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(KeyId)));
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Name)));
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+
                 }
             }
             public uint Value
@@ -107,6 +113,7 @@ public ObservableCollection<KeyValuePair<string, uint>> KnownValues {
                         values.Add(new KeyValuePair<string, uint>(name, val.Key));
                     }
 
+                    var asHex = Value.ToString("X8");
                     if (!values.Any(x => x.Value == Value))
                     {
                         values.Add(new KeyValuePair<string, uint>(Value.ToString("X8"), Value));

From 92e3962deb1b4c07a46a30ecc7785b7d68b3d48a Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:12:26 -0400
Subject: [PATCH 10/11] Console fix and ref

---
 ConsoleTools/Program.cs | 2 +-
 lib/xivModdingFramework | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ConsoleTools/Program.cs b/ConsoleTools/Program.cs
index cc210e29..6b9d6134 100644
--- a/ConsoleTools/Program.cs
+++ b/ConsoleTools/Program.cs
@@ -321,7 +321,7 @@ public static async Task<int> UnwrapFile()
             else if (src.EndsWith(".mdl"))
             {
                 var mdl = Mdl.GetXivMdl(data);
-                var ttm = TTModel.FromRaw(mdl);
+                var ttm = await TTModel.FromRaw(mdl);
                 ttm.Source = ffPath;
                 await Mdl.ExportTTModelToFile(ttm, ffPath, 1, null, rtx);
             }
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 5f0e4aa7..4ffda566 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 5f0e4aa765544419a9b9216c685a318038cd608e
+Subproject commit 4ffda5661baeb03e49b9e86d8e84f6e14fd52a77

From f7a42e32f2d600f9a992a58376394d8e4845ad8c Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 23 Jul 2024 17:08:08 -0400
Subject: [PATCH 11/11] ref

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

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 4ffda566..12dec77d 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 4ffda5661baeb03e49b9e86d8e84f6e14fd52a77
+Subproject commit 12dec77d1090b1922049a013c1ed1356f583998e