Merge branch 'master-upstream' into fo4vr-release

squid-box · Jun 9, 2018 · f2f113b · f2f113b
2 parents f2b13ec + 2cdc2f9
commit f2f113b
Show file tree

Hide file tree

Showing 28 changed files with 512 additions and 425 deletions.
diff --git a/BreakingWheel/Properties/Resources.resx b/BreakingWheel/Properties/Resources.resx
@@ -122,6 +122,6 @@
     <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="BreakingWheel_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\BreakingWheel_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\breakingwheel_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/DarkSouls/Properties/Resources.resx b/DarkSouls/Properties/Resources.resx
@@ -119,7 +119,7 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Categories" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="darksouls_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\darksouls_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/DarkSouls2/Properties/Resources.resx b/DarkSouls2/Properties/Resources.resx
@@ -119,9 +119,9 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Categories" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="DarkSouls2_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DarkSouls2_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\darksouls2_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/DragonsDogma/Properties/Resources.resx b/DragonsDogma/Properties/Resources.resx
@@ -122,6 +122,6 @@
     <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="DragonsDogma_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DragonsDogma_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\dragonsdogma_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/Fallout4/Properties/Resources.resx b/Fallout4/Properties/Resources.resx
@@ -125,6 +125,6 @@
     <value>..\Resources\fallout4_base.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="Fallout4_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Fallout4_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\fallout4_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/GamebryoBase/GamebryoBase.csproj b/GamebryoBase/GamebryoBase.csproj
@@ -49,7 +49,7 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
@@ -201,4 +201,4 @@
     <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(SolutionDir)$(OutDir)GameModes\" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(DataFilesToCopy)" DestinationFolder="$(SolutionDir)$(OutDir)GameModes\data\" SkipUnchangedFiles="true" />
   </Target>
-</Project>
+</Project>
diff --git a/NexusClient.Interface/ProgrammeMetadata.cs b/NexusClient.Interface/ProgrammeMetadata.cs
@@ -24,7 +24,7 @@ public static class ProgrammeMetadata
 		/// (c) should change when there is a minor alteration to the programme.
 		/// Something akin to a minor bug fix, or a typo correction.
 		/// </remarks>
-		public const string VersionString = "0.65.5";
+		public const string VersionString = "0.65.6";
 
 		/// <summary>
 		/// Gets the full name of the mod manager.

diff --git a/NexusClient/NexusClient.csproj b/NexusClient/NexusClient.csproj
@@ -373,7 +373,7 @@
     <None Include="data\Nexus Mod Manager Licence.rtf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="data\Licence.rtf">
+    <None Include="data\LICENCE.rtf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="Resources\down.png" />
@@ -485,7 +485,7 @@
     <Compile Include="DownloadMonitoring\UI\DownloadMonitorControl.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DownloadMonitoring\UI\DownloadMonitorControl.designer.cs">
+    <Compile Include="DownloadMonitoring\UI\DownloadMonitorControl.Designer.cs">
       <DependentUpon>DownloadMonitorControl.cs</DependentUpon>
     </Compile>
     <Compile Include="DownloadMonitoring\UI\DownloadMonitorVM.cs" />
@@ -523,7 +523,7 @@
     <Compile Include="UI\Controls\CustomizableToolStripProgressBar.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="UI\Controls\CustomizableToolStripProgressBar.designer.cs">
+    <Compile Include="UI\Controls\CustomizableToolStripProgressBar.Designer.cs">
       <DependentUpon>CustomizableToolStripProgressBar.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\GameModeListViewItem.cs">
@@ -692,29 +692,29 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.ServiceModel.Web">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="FalloutNV">
+      <HintPath>..\FalloutNV\obj\Debug\FalloutNV.dll</HintPath>
+    </Reference>
+    <Reference Include="FalloutNV">
+      <HintPath>..\FalloutNV\obj\Debug\FalloutNV.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -762,6 +762,10 @@
       <Project>{44CAA655-38C2-4CA2-BA68-A8D5C44B169D}</Project>
       <Name>Util</Name>
     </ProjectReference>
+    <ProjectReference Include="..\AntlrUtil\AntlrUtil.csproj">
+      <Project>{8B2AD10B-4E22-4559-A784-648179225ADC}</Project>
+      <Name>AntlrUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -806,4 +810,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/NexusClient/Program.cs b/NexusClient/Program.cs
@@ -70,9 +70,13 @@ static void Main(string[] p_strArgs)
 
 				UpgradeSettings(Properties.Settings.Default);
 				EnvironmentInfo = new EnvironmentInfo(Properties.Settings.Default);
-				if (!Directory.Exists(EnvironmentInfo.ApplicationPersonalDataFolderPath))
-					Directory.CreateDirectory(EnvironmentInfo.ApplicationPersonalDataFolderPath);
-				EnableTracing(EnvironmentInfo, booTrace);
+
+                if (!Directory.Exists(EnvironmentInfo.ApplicationPersonalDataFolderPath))
+                {
+                    Directory.CreateDirectory(EnvironmentInfo.ApplicationPersonalDataFolderPath);
+                }
+
+                EnableTracing(EnvironmentInfo, booTrace);
 
 #if !DEBUG
 				try
@@ -196,10 +200,16 @@ private static void EnableTracing(IEnvironmentInfo p_eifEnvironmentInfo, bool p_
 			Trace.AutoFlush = true;
 			string strTraceFile = "TraceLog" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".txt";
 			TextWriterTraceListener ttlTraceFile = null;
-			if (p_booForceTrace)
-				ttlTraceFile = new HeaderlessTextWriterTraceListener(Path.Combine(String.IsNullOrEmpty(p_eifEnvironmentInfo.Settings.TraceLogFolder) ? p_eifEnvironmentInfo.ApplicationPersonalDataFolderPath : p_eifEnvironmentInfo.Settings.TraceLogFolder, strTraceFile));
-			else
-				ttlTraceFile = new HeaderlessTextWriterTraceListener(new MemoryStream(), Path.Combine(String.IsNullOrEmpty(p_eifEnvironmentInfo.Settings.TraceLogFolder) ? p_eifEnvironmentInfo.ApplicationPersonalDataFolderPath : p_eifEnvironmentInfo.Settings.TraceLogFolder, strTraceFile));
+
+            if (p_booForceTrace)
+            {
+                ttlTraceFile = new HeaderlessTextWriterTraceListener(Path.Combine(String.IsNullOrEmpty(p_eifEnvironmentInfo.Settings.TraceLogFolder) ? p_eifEnvironmentInfo.ApplicationPersonalDataFolderPath : p_eifEnvironmentInfo.Settings.TraceLogFolder, strTraceFile));
+            }
+            else
+            {
+                ttlTraceFile = new HeaderlessTextWriterTraceListener(new MemoryStream(), Path.Combine(String.IsNullOrEmpty(p_eifEnvironmentInfo.Settings.TraceLogFolder) ? p_eifEnvironmentInfo.ApplicationPersonalDataFolderPath : p_eifEnvironmentInfo.Settings.TraceLogFolder, strTraceFile));
+            }
+
 			ttlTraceFile.Name = "DefaultListener";
 			Trace.Listeners.Add(ttlTraceFile);
 			Trace.TraceInformation("Trace file has been created: " + strTraceFile);
@@ -219,11 +229,15 @@ private static void EnableTracing(IEnvironmentInfo p_eifEnvironmentInfo, bool p_
 
 			using (RegistryKey ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey("SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full\\"))
 			{
-				int releaseKey = Convert.ToInt32(ndpKey.GetValue("Release"));
-				if (true)
-				{
-					stbStatus.AppendFormat("\tv4.5: {0}", CheckFor45DotVersion(releaseKey)).AppendLine();
-				}
+                if (ndpKey != null)
+                {
+                    int releaseKey = Convert.ToInt32(ndpKey.GetValue("Release"));
+                    stbStatus.AppendFormat("\tv4.5: {0}", CheckFor45DotVersion(releaseKey)).AppendLine();
+                }
+				else
+                {
+                    stbStatus.AppendLine("\tv4.5: Not found.");
+                }
 			}
 
 			stbStatus.AppendFormat("Tracing is forced: {0}", p_booForceTrace).AppendLine();

diff --git a/NexusClient/Properties/Resources.resx b/NexusClient/Properties/Resources.resx
@@ -410,10 +410,10 @@
     <value>..\Resources\backup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="deleteProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deleteprofile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\deleteProfile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="renameProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renameprofile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\renameProfile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="share" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/NexusClient/Settings.cs b/NexusClient/Settings.cs
@@ -1,16 +1,18 @@
-using Nexus.Client.Settings;
-
-namespace Nexus.Client.Properties
+namespace Nexus.Client.Properties
 {
-	/// <summary>
-	/// This class adds the <see cref="ISettings"/> to the project's <see cref="Properties.Settings"/>
-	/// class.
-	/// </summary>
-	/// <remarks>
-	/// This file should not contain any memebers or properties.
-	/// </remarks>
-	internal sealed partial class Settings : ISettings
+    using Nexus.Client.Settings;
+
+    /// <summary>
+    /// This class adds the <see cref="ISettings"/> to the project's <see cref="Properties.Settings"/>
+    /// class.
+    /// </summary>
+    /// <remarks>
+    /// This file should not contain any memebers or properties.
+    /// </remarks>
+    internal sealed partial class Settings : ISettings
 	{
+        private static object _settingsFileLock = new object();
+
 		/// <summary>
 		/// Gets the full name of the mod manager.
 		/// </summary>
@@ -22,5 +24,16 @@ public string ModManagerName
 				return ProgrammeMetadata.ModManagerName;
 			}
 		}
+
+        /// <summary>
+        /// A thread-safe call to save the current settings to file.
+        /// </summary>
+        public override void Save()
+        {
+            lock(_settingsFileLock)
+            {
+                base.Save();
+            }
+        }
 	}
 }
diff --git a/NexusClient/data/releasenotes.rtf b/NexusClient/data/releasenotes.rtf
@@ -1,19 +1,30 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1040\deflangfe1040{\fonttbl{\f0\fswiss\fprq2\fcharset0 Verdana;}{\f1\fswiss\fprq2\fcharset0 Calibri;}{\f2\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue255;\red0\green0\blue0;\red255\green0\blue0;}
 {\*\generator Riched20 10.0.17134}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
-\pard\widctlpar\qj\b\f0\fs16 Version 0.65.5f\par
+\pard\qj\b\f0\fs16 Version 0.65.6f\par
 \par
 
 \pard 
 {\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}
 \nowidctlpar\fi-360\li720\qj\cf1\lang2057 New Feature:\cf2\b0  Added Fallout 4 VR support.\par
-{\pntext\f0 2.\tab}\cf1\b New Feature:\cf2\b0  Added automatic updates (from \b neoh4xor\b0  on GitHub).\par
+
+\pard\qj\cf0\b\lang1040\par
+\par
+Version 0.65.6\par
+\par
+
+\pard 
+{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}
+\nowidctlpar\fi-360\li720\qj\cf1\lang2057 New Feature:\cf2\b0  New NMM releases are now being pulled from GitHub. (thanks to user \b neoh4x0r \b0 on Github)\par
+{\pntext\f0 2.\tab}\cf3\b Bugfix:\cf2\b0  Fixed and tweaked code to improve compatibility with Linux and Wine. (thanks to user \b neoh4x0r \b0 on Github)\par
+{\pntext\f0 3.\tab}\cf3\b Bugfix:\cf2\b0  Fixed issue when launching LOOT for SkyrimSE from whitin NMM. (thanks to user \b squid-box \b0 on Github)\par
+{\pntext\f0 4.\tab}\cf3\b Bugfix:\cf2\b0  Fixed crash issue when generating the tracelog file and .NET Framework 4.5 isn't present. (thanks to user \b squid-box \b0 on Github)\par
+{\pntext\f0 5.\tab}\cf3\b Bugfix:\cf2\b0  Fixed crash issue when trying to save a config file that is already open. (thanks to user \b squid-box \b0 on Github)\par
 
 \pard\widctlpar\qj\cf0\b\lang1040\par
 \par
 Version 0.65.5\par
 \par
-\par
 
 \pard 
 {\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}

diff --git a/NoMansSky/Properties/Resources.resx b/NoMansSky/Properties/Resources.resx
@@ -122,6 +122,6 @@
     <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="NoMansSky_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\NoMansSky_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\nomanssky_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/Setup/setup.iss b/Setup/setup.iss
@@ -8,7 +8,7 @@
 
 #define MyAppSetupName 'Nexus Mod Manager'
 #define MyExeName 'NexusClient.exe'
-#define MyAppVersion '0.65.5'
+#define MyAppVersion '0.65.6'
 #define SetupScriptVersion '0.7.1.1'
 #define MyPublisher 'Black Tree Gaming'
 [Setup]

diff --git a/Skyrim/SkyrimLauncher.cs b/Skyrim/SkyrimLauncher.cs
@@ -36,26 +36,36 @@ protected override void SetupCommands()
 
 			ClearLaunchCommands();
 
+			Image imgIcon = null;
+
 			string strCommand = GetPlainLaunchCommand();
 			Trace.TraceInformation("Plain Command: {0} (IsNull={1})", strCommand, (strCommand == null));
-			Image imgIcon = File.Exists(strCommand) ? Icon.ExtractAssociatedIcon(strCommand).ToBitmap() : null;
+			if (File.Exists(strCommand))
+			{
+				var icon = string.IsNullOrEmpty(strCommand) ? null : Icon.ExtractAssociatedIcon(strCommand);
+				imgIcon = icon == null ? null : icon.ToBitmap();
+			}
 			AddLaunchCommand(new Command("PlainLaunch", "Launch Skyrim", "Launches plain Skyrim.", imgIcon, LaunchSkyrimPlain, true));
-		
+
 			strCommand = GetSkseLaunchCommand();
 			Trace.TraceInformation("SKSE Command: {0} (IsNull={1})", strCommand, (strCommand == null));
 			if (File.Exists(strCommand))
 			{
-				imgIcon = Icon.ExtractAssociatedIcon(strCommand).ToBitmap();
-				AddLaunchCommand(new Command("SkseLaunch", "Launch SKSE", "Launches Skyrim with SKSE.", imgIcon, LaunchSkyrimSKSE, true));
+				var icon = string.IsNullOrEmpty(strCommand) ? null : Icon.ExtractAssociatedIcon(strCommand);
+				imgIcon = icon == null ? null : icon.ToBitmap();
 			}
-
+			AddLaunchCommand(new Command("SkseLaunch", "Launch SKSE", "Launches Skyrim with SKSE.", imgIcon, LaunchSkyrimSKSE, true));
+
 			strCommand = GetCustomLaunchCommand();
 			Trace.TraceInformation("Custom Command: {0} (IsNull={1})", strCommand, (strCommand == null));
-			imgIcon = File.Exists(strCommand) ? Icon.ExtractAssociatedIcon(strCommand).ToBitmap() : null;
+			if (File.Exists(strCommand))
+			{
+				var icon = string.IsNullOrEmpty(strCommand) ? null : Icon.ExtractAssociatedIcon(strCommand);
+				imgIcon = icon == null ? null : icon.ToBitmap();
+			}
 			AddLaunchCommand(new Command("CustomLaunch", "Launch Custom Skyrim", "Launches Skyrim with custom command.", imgIcon, LaunchSkyrimCustom, true));
 
 			DefaultLaunchCommand = new Command("Launch Skyrim", "Launches Skyrim.", LaunchGame);
-
 			Trace.Unindent();
 		}
 

diff --git a/SkyrimSE/Properties/Resources.resx b/SkyrimSE/Properties/Resources.resx
@@ -122,9 +122,9 @@
     <value>..\Resources\Categories.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="SkyrimSE_base" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SkyrimSE_base.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\skyrimse_base.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="SkyrimSE_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SkyrimSE_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\skyrimse_logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>