diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj
index acbf8918..1bd0d770 100644
--- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj
+++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj
@@ -55,9 +55,8 @@
True
..\Emerald.App\Emerald.App.csproj
False
- 9CBDFA6FDB25BE48AA09759C40DFAB769CF9740A
SHA256
- True
+ False
True
x86|x64|arm64
D:\Projects\Emerald\Emerald.App\Emerald.App.Package\AppPackages\
@@ -66,31 +65,31 @@
Package.WinUI_TemporaryKey.pfx
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
- Auto
+ Always
diff --git a/Emerald.App/Emerald.App.Package/Package.appxmanifest b/Emerald.App/Emerald.App.Package/Package.appxmanifest
index 6fcfd00a..0297724c 100644
--- a/Emerald.App/Emerald.App.Package/Package.appxmanifest
+++ b/Emerald.App/Emerald.App.Package/Package.appxmanifest
@@ -11,7 +11,7 @@
+ Version="0.7.9.0" />
Emerald
diff --git a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs
index 593bc3e4..dcb5ebae 100644
--- a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs
+++ b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs
@@ -51,6 +51,7 @@ public ObservableCollection CreateVersions()
Collection.Add(LoadCustomVers());
}
+ AddItem("1.21");
AddItem("1.20");
AddItem("1.19");
AddItem("1.18");
diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs
index e62f920c..246642bb 100644
--- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs
+++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs
@@ -81,14 +81,18 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
if (!rel.Assets.Any(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower())))
{
TasksHelper.CompleteTask(id, false, "NoMsixUpdate");
- goto Return;
+
+ if (!OnlyInformifHigherAvailable)
+ MessageBox.Show("Error".Localize(), "NoMsixUpdate".Localize(), Enums.MessageBoxButtons.Ok);
+
+ goto Return;
}
var asset = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower()));
if (ver > currentver)
{
TasksHelper.CompleteTask(id, true, "UpdateAvailable");
- var msg = await MessageBox.Show("UpdateAvailable".Localize(), "##ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize());
+ var msg = await MessageBox.Show("UpdateAvailable".Localize(), "## Version: " + ver.ToString() + "\n\n###ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize());
if(msg == Enums.MessageBoxResults.Cancel)
goto Return;
@@ -100,8 +104,7 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
if(OnlyInformifHigherAvailable)
goto Return;
- var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.CustomWithCancel,"Downgrade".Localize());
- if (msg == Enums.MessageBoxResults.Cancel)
+ var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.Ok);
goto Return;
@@ -117,6 +120,8 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false)
goto Return;
}
var a = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower()));
+ if(a == null)
+ goto Return ;
DownloadQAndInstallUpdate(a.BrowserDownloadUrl,a.Name);
Return:
diff --git a/Emerald.App/Emerald.App/MainWindow.xaml.cs b/Emerald.App/Emerald.App/MainWindow.xaml.cs
index 7d2efe89..7147aef9 100644
--- a/Emerald.App/Emerald.App/MainWindow.xaml.cs
+++ b/Emerald.App/Emerald.App/MainWindow.xaml.cs
@@ -210,7 +210,7 @@ void TintColor()
};
if (SS.Settings.App.Updates.CheckAtStartup)
- App.Current.Updater.CheckForUpdates();
+ App.Current.Updater.CheckForUpdates(true);
(Content as FrameworkElement).Loaded -= Initialize;
}
private static void UpdateUI()
diff --git a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw
index 2c910bf2..54116319 100644
--- a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw
+++ b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw
@@ -271,7 +271,7 @@
Load Mod
- Failed to load the app settings accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings
+ Failed to load the app settings and accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings
Login
@@ -710,7 +710,7 @@
Downgrade Available
- The current version is higher than the latest version in the servers. You must be using a private beta. Do you want to downgrade?
+ The current version is higher than the latest version in the servers. You must be using a private beta. Please wait until a higher stable version be available
Download Update
@@ -719,7 +719,7 @@
Install Update
- Failed to find the installer package in the release
+ Failed to find the installer package in the release for this architecture
You are on the latest version
@@ -752,6 +752,6 @@
Updates
- Automatically update, include prerelease etc..
+ Auto update, include prerelease etc..
\ No newline at end of file