diff --git a/.gitignore b/.gitignore index 3fa1ad0..0aeeaca 100644 --- a/.gitignore +++ b/.gitignore @@ -399,3 +399,5 @@ FodyWeavers.xsd App/Assets/installer_deps.zip App/meloninstaller.keystore App/keystore-pass.txt +/.idea +.DS_Store diff --git a/App/MelonLoader.Installer.App.csproj b/App/MelonLoader.Installer.App.csproj index c430be7..f93348c 100644 --- a/App/MelonLoader.Installer.App.csproj +++ b/App/MelonLoader.Installer.App.csproj @@ -1,9 +1,10 @@  - net8.0-android - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net9.0-android + $(TargetFrameworks);net9.0-windows10.0.19041.0 Exe + true MelonLoader.Installer.App true true @@ -30,25 +31,25 @@ meloninstaller.keystore - + MelonLoader Installer com.lavagang.melonloader.installer 1.0.0 - True + False 27.0 - False + True env:LEMON_KEYSTORE_PASS melon env:LEMON_KEYSTORE_PASS - + MelonLoader Installer com.lavagang.melonloader.installer 1.0.0 - + MelonLoader Installer com.lavagang.melonloader.installer 1.0.0 @@ -61,7 +62,7 @@ env:LEMON_KEYSTORE_PASS - + MelonLoader Installer com.lavagang.melonloader.installer 1.0.0 diff --git a/App/Utils/PatchRunner.cs b/App/Utils/PatchRunner.cs index 0533b54..d23074a 100644 --- a/App/Utils/PatchRunner.cs +++ b/App/Utils/PatchRunner.cs @@ -204,7 +204,7 @@ private static async Task PrepareAssets(string? localUnityDepsPath) private static async Task DownloadMelonData(string destination) { -#if DEBUG + if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "melon_data/melon_data.zip"))) { _logger?.Log("Using local melon data"); @@ -220,7 +220,7 @@ private static async Task DownloadMelonData(string destination) File.Copy(@"/sdcard/Download/melon_data.zip", destination); return true; } -#endif + _logger?.Log("Retrieving release info from GitHub"); diff --git a/Core/MelonLoader.Installer.Core.csproj b/Core/MelonLoader.Installer.Core.csproj index ace6e52..498417e 100644 --- a/Core/MelonLoader.Installer.Core.csproj +++ b/Core/MelonLoader.Installer.Core.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable MelonLoader.Installer.Core