mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-13 05:48:35 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
69290ea9e5
@ -34,6 +34,7 @@ namespace Artemis
|
||||
DllManager.RestoreLogitechDll();
|
||||
// Check compatibility before trying to boot further
|
||||
CompatibilityService.CheckRivaTuner();
|
||||
Updater.CleanSquirrel();
|
||||
|
||||
Initialize();
|
||||
BindSpecialValues();
|
||||
|
||||
@ -147,7 +147,7 @@ namespace Artemis.Utilities
|
||||
|
||||
private static object ConvertBytesToMegabytes(long bytes)
|
||||
{
|
||||
return Math.Round((bytes / 1024f) / 1024f, 2);
|
||||
return Math.Round(bytes / 1024f / 1024f, 2);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -189,6 +189,29 @@ namespace Artemis.Utilities
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Removes the old Squirrel-based version of Artemis if present
|
||||
/// </summary>
|
||||
public static void CleanSquirrel()
|
||||
{
|
||||
var squirrelPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\Artemis";
|
||||
if (!Directory.Exists(squirrelPath))
|
||||
return;
|
||||
|
||||
var psi = new ProcessStartInfo
|
||||
{
|
||||
FileName = squirrelPath + "\\Update.exe",
|
||||
Arguments = "--uninstall",
|
||||
Verb = "runas"
|
||||
};
|
||||
|
||||
var process = new System.Diagnostics.Process {StartInfo = psi};
|
||||
process.Start();
|
||||
process.WaitForExit();
|
||||
|
||||
Directory.Delete(squirrelPath, true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// JSON default value handling can only go so far, so the update will take care of defaults
|
||||
/// on the offsets if they are null
|
||||
@ -217,4 +240,4 @@ namespace Artemis.Utilities
|
||||
offsetSettings.Save();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +1,3 @@
|
||||
# State of the project
|
||||
Currently I'm in an extremely busy period of my student life (final year) and even when I have some spare time it's hard for me to spend it on Artemis. I'll try to put out releases for app-breaking bugs but new features are very hard for me to implement right now.
|
||||
|
||||
I do not consider Artemis done, I don't think I'll ever do so because it is something that can always use new features and improvements. If I have the time again I'd love to make a 2.0 with the same features but implemented in a much neater way.
|
||||
|
||||
If anyone with sufficient skill in C# would like to be a maintainer alongside me, drop me a message at ```spoinky.nl@gmail.com```. It could be that at some point in the near future I'll put out a bunch of updates again but any help is appreciated :).
|
||||
|
||||
PS: There are some device issues currently that I'll try to get fixed soon, I already have a few few fixes in the dev branch and a great WoW module
|
||||
|
||||
# Artemis
|
||||
[]()
|
||||
[]()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user