diff --git a/Branding/WabbajackGraphics/Other/FestiveAvatars/augspeed-festive.psd b/Branding/WabbajackGraphics/Other/FestiveAvatars/augspeed-festive.psd new file mode 100644 index 00000000..6a58caa3 Binary files /dev/null and b/Branding/WabbajackGraphics/Other/FestiveAvatars/augspeed-festive.psd differ diff --git a/Branding/WabbajackGraphics/Other/FestiveAvatars/om3n1r-festive.psd b/Branding/WabbajackGraphics/Other/FestiveAvatars/om3n1r-festive.psd new file mode 100644 index 00000000..a678f9c2 Binary files /dev/null and b/Branding/WabbajackGraphics/Other/FestiveAvatars/om3n1r-festive.psd differ diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs index df88d02b..6862545a 100644 --- a/Wabbajack.Lib/MO2Installer.cs +++ b/Wabbajack.Lib/MO2Installer.cs @@ -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."); } } diff --git a/Wabbajack/Views/MainWindow.xaml.cs b/Wabbajack/Views/MainWindow.xaml.cs index b05bc691..64d7e27b 100644 --- a/Wabbajack/Views/MainWindow.xaml.cs +++ b/Wabbajack/Views/MainWindow.xaml.cs @@ -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 () =>