Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301 from tr4wzified/minor-changes

Browse Source 
Minor changes
This commit is contained in:
Timothy Baldridge 2019-12-21 14:43:40 -08:00 committed by GitHub
commit afe0d2d875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Branding/WabbajackGraphics/Other/FestiveAvatars/augspeed-festive.psd Normal file
View File

Binary file not shown.

BIN
Branding/WabbajackGraphics/Other/FestiveAvatars/om3n1r-festive.psd Normal file
View File

Binary file not shown.

6
Wabbajack.Lib/MO2Installer.cs
View File

@ -73,7 +73,7 @@ namespace Wabbajack.Lib
{
if ((await Utils.Log(new ConfirmUpdateOfExistingInstall { ModListName = ModList.Name, OutputFolder = OutputFolder }).Task) == ConfirmUpdateOfExistingInstall.Choice.Abort)
{
Utils.Log("Existing installation at the request of the user, existing mods folder found.");
Utils.Log("Exiting installation at the request of the user, existing mods folder found.");
return false;
}
}
@ -270,7 +270,7 @@ namespace Wabbajack.Lib
var sha = gameFile.FileHash();
if (sha != directive.SourceESMHash)
throw new InvalidDataException(
$"Cannot patch {filename} from the game folder hashes don't match have you already cleaned the file?");
$"Cannot patch {filename} from the game folder because the hashes do not match. Have you already cleaned the file?");
var patchData = LoadBytesFromPath(directive.SourceDataID);
var toFile = Path.Combine(OutputFolder, directive.To);
@ -332,7 +332,7 @@ namespace Wabbajack.Lib
if (!File.Exists(file)) continue;
if (System.IO.Path.GetExtension(file).Equals(ExtensionManager.Extension))
{
return ErrorResponse.Fail($"Cannot install into a folder with a wabbajack modlist inside of it.");
return ErrorResponse.Fail($"Cannot install into a folder with a Wabbajack modlist inside of it.");
}
}

4
Wabbajack/Views/MainWindow.xaml.cs
View File

@ -24,10 +24,10 @@ namespace Wabbajack
AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
{
// Don't do any special logging side effects
Wabbajack.Common.Utils.Error(((Exception)e.ExceptionObject), "Uncaught error");
Utils.Error(((Exception)e.ExceptionObject), "Uncaught error");
};
Wabbajack.Common.Utils.Log($"Wabbajack Build - {ThisAssembly.Git.Sha}");
Utils.Log($"Wabbajack Build - {ThisAssembly.Git.Sha}");
// Run some init tasks in background
Task.Run(async () =>