From 33b001b5dc6f00868ee3c70272dd4f4195474b54 Mon Sep 17 00:00:00 2001 From: Jeremy Gonyea Date: Sat, 18 Mar 2023 12:52:32 -0400 Subject: [PATCH] Removed x86 version. Updated to upstream 4.5.9 --- App/AppInfo/Launcher/UnCivPortable.ini | 4 ++-- App/AppInfo/appinfo.ini | 4 ++-- App/AppInfo/installer.ini | 20 ++++---------------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/App/AppInfo/Launcher/UnCivPortable.ini b/App/AppInfo/Launcher/UnCivPortable.ini index c2e36f5..b81ff5f 100644 --- a/App/AppInfo/Launcher/UnCivPortable.ini +++ b/App/AppInfo/Launcher/UnCivPortable.ini @@ -7,9 +7,9 @@ [Launch] ;This section details how an app is started and where it works ;ProgramExecutable is the EXE to run to start the app relative to the UncivPortable\App directory -ProgramExecutable=Unciv\x86\Unciv.exe +ProgramExecutable=Unciv\x64\Unciv.exe ;ProgramExecutable64 is an optional EXE to run if running on Windows 64-bit -ProgramExecutable64=Unciv\x64\Unciv.exe +;ProgramExecutable64=Unciv\x64\Unciv.exe ;CommandLineArguments is an optional setting that will cause the above EXE to be launched with this string passed ;CommandLineArguments=-settings=%PAL:DataDir%\ ;WorkingDirectory is the directory that will be used when launching which other items will be relative to. Use should be avoided when possible as it will prevent passing multiple relative file locations via command line diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini index 1e9d6b0..12ab867 100644 --- a/App/AppInfo/appinfo.ini +++ b/App/AppInfo/appinfo.ini @@ -48,9 +48,9 @@ UsesJava=yes [Version] ;PackageVersion is used by the installer and the updater. It must be in dotted quad X.X.X.X format for use by Windows. You must ensure that each successive version has a higher package version than the previous or it will not be treated as a newer version by the platform's updater. Generally, the PackageVersion is based on the DisplayVersion. So an app with version 3.5 will have a package version of 3.5.0.0. -PackageVersion=4.1.6.0 +PackageVersion=4.5.9.0 ;DisplayVersion is displayed to the user and used in naming the installer -DisplayVersion=4.1.6 +DisplayVersion=4.5.9 ;Some example Display and Package versions ;3.5 would be 3.5.0.0 ;4.5a would be 4.5.1.0 diff --git a/App/AppInfo/installer.ini b/App/AppInfo/installer.ini index 4eb2b71..e1dd4a8 100644 --- a/App/AppInfo/installer.ini +++ b/App/AppInfo/installer.ini @@ -9,9 +9,6 @@ [DirectoriesToPreserve] ;This indicates to the installer that these files will be preserved. We do this so that the fictitious portable configuration directory we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. -PreserveDirectory1=App\Unciv\x86\SaveFiles -PreserveDirectory2=App\Unciv\x86\mods -PreserveDirectory3=App\Unciv\x86\music PreserveDirectory4=App\Unciv\x64\SaveFiles PreserveDirectory5=App\Unciv\x64\mods PreserveDirectory6=App\Unciv\x64\music @@ -19,9 +16,7 @@ PreserveDirectory6=App\Unciv\x64\music [FilesToPreserve] ;This indicates to the installer that these files will be preserved. Wildcards are supported. We do this so that the fictitious portable configuration file we handle in the example AppNamePortable.ini isn't lost if a crash and the upgrade occurs. PreserveFile1=App\Unciv\x86\GameSettings.json -PreserveFile2=App\Unciv\x86\mods\* -PreserveFile3=App\Unciv\x86\music\* -PreserveFile4=App\Unciv\x86\SaveFiles\* + PreserveFile5=App\Unciv\x64\GameSettings.json PreserveFile6=App\Unciv\x64\mods\* PreserveFile7=App\Unciv\x64\music\* @@ -33,16 +28,9 @@ CloseEXE=Unciv.exe [DownloadFiles] AdditionalInstallSize=200M -DownloadURL=https://github.com/yairm210/Unciv/releases/download/4.1.6/Unciv-Windows64.zip +DownloadURL=https://github.com/yairm210/Unciv/releases/download/4.5.9/Unciv-Windows64.zip DownloadName=Unciv-Windows64.zip DownloadFilename=Unciv-Windows64.zip -DownloadMD5=7dacd24fa5c7409f944443f7aa19f434 +DownloadMD5=690a203ef872faddaa8a6e32457948fb AdvancedExtract1To=App\Unciv\x64\ -AdvancedExtract1Filter=** - -Download2URL=https://github.com/yairm210/Unciv/releases/download/4.1.6/Unciv-Windows32.zip -Download2Name=Unciv-Windows32.zip -Download2Filename=Unciv-Windows32.zip -DownloadMD5=1fd5565b0a7bc2ce9d5184d201e6915d -AdvancedExtract2To=App\Unciv\x86\ -AdvancedExtract2Filter=** \ No newline at end of file +AdvancedExtract1Filter=** \ No newline at end of file