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 remote-tracking branch 'origin/blocking_fixes' into pre-release

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
EzioTheDeadPoet 2023-08-24 21:19:21 +02:00
commit 30adcc96dd
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -1,13 +1,12 @@
### Changelog
### Version - 3.3.0.0-Pre - 08/22/2023
* Fixed some UI issues arising from 3.2.0.0 changes - more informative error text, drive space checking, wiki link button
* Added optional JSON flag for `DisplayVersionOnlyInInstallerView` to enable the installer image to only show version number.
* Fixed manual downloader downloading in the OS's "Downloads" folder
* Added RAM Limit setting for downloads
<<<<<<<<< Temporary merge branch 1
### Version - TBA
* Fixed some UI issues arising from 3.2.0.0 changes - more informative error text, drive space checking, wiki link button
=========
#### Version - 3.2.0.1 - 7/23/2023
* Code cleanup: re-added some network and diagnostic code missing since 2.5
* Code cleanup: re-added some network and diagnostic code missing since 2.5
>>>>>>>>> Temporary merge branch 2
#### Version - 3.2.0.0 - 7/16/2023
* Fixed issues related to high RAM usage

4
Wabbajack.App.Wpf/View Models/Installers/InstallerVM.cs
View File

@ -336,7 +336,7 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
if (KnownFolders.IsInSpecialFolder(installPath) || KnownFolders.IsInSpecialFolder(downloadPath))
{
yield return ErrorResponse.Fail("Can't install a modlist into Windows protected locations - such as Downloads,Documents etc, please make a new folder for the modlist.");
yield return ErrorResponse.Fail("Can't install into Windows locations such as Documents etc, please make a new folder for the modlist - C:\\ModList\\ for example.");
}
if (installPath.ToString().Length > 0 && downloadPath.ToString().Length > 0 && !HasEnoughSpace(installPath, downloadPath)){
@ -602,4 +602,4 @@ public class InstallerVM : BackNavigatingVM, IBackNavigatingVM, ICpuStatusVM
}
}
}
}

2
Wabbajack.Launcher/ViewModels/MainWindowViewModel.cs
View File

@ -231,7 +231,7 @@ public class MainWindowViewModel : ViewModelBase
ShowInCenter = true,
ContentTitle = "Wabbajack Launcher: Bad startup path",
ContentMessage =
"Cannot start in the root of a drive, or protected folder locations such as Downloads, Desktop etc.\nPlease move Wabbajack to another folder, creating a new folder if necessary ( example : C:\\Wabbajack\\, outside of these locations."
"Cannot start in the root of a drive, or protected folder locations such as Downloads, Desktop etc.\nPlease move Wabbajack to another folder, creating a new folder if necessary ( example : C:\\Wabbajack\\), outside of these locations."
});
var result = await msg.Show();
Environment.Exit(1);