diff --git a/FCLauncher.old/app-icon.png b/FCLauncher.old/app-icon.png deleted file mode 100644 index 7aeb08d..0000000 Binary files a/FCLauncher.old/app-icon.png and /dev/null differ diff --git a/fclauncher/app.go b/fclauncher/app.go index b7d996e..bbcbee2 100644 --- a/fclauncher/app.go +++ b/fclauncher/app.go @@ -17,7 +17,7 @@ import ( ) const client_id string = "9305aeb8-5ecb-4e7a-b28f-c33aefcfbd8d" -const client_version string = "0.0.5" +const client_version string = "0.0.7" type LauncherMetadata struct { Schema_Version string diff --git a/fclauncher/build/appicon.png b/fclauncher/build/appicon.png index 63617fe..7aeb08d 100644 Binary files a/fclauncher/build/appicon.png and b/fclauncher/build/appicon.png differ diff --git a/fclauncher/build/windows/icon.ico b/fclauncher/build/windows/icon.ico index f334798..de1b43a 100644 Binary files a/fclauncher/build/windows/icon.ico and b/fclauncher/build/windows/icon.ico differ diff --git a/fclauncher/build/windows/installer/project.nsi b/fclauncher/build/windows/installer/project.nsi index 654ae2e..a326b08 100644 --- a/fclauncher/build/windows/installer/project.nsi +++ b/fclauncher/build/windows/installer/project.nsi @@ -95,6 +95,7 @@ Section !insertmacro wails.associateCustomProtocols !insertmacro wails.writeUninstaller + AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess" SectionEnd Section "uninstall" diff --git a/fclauncher/build/windows/installer/tmp/MicrosoftEdgeWebview2Setup.exe b/fclauncher/build/windows/installer/tmp/MicrosoftEdgeWebview2Setup.exe new file mode 100644 index 0000000..89a56ec Binary files /dev/null and b/fclauncher/build/windows/installer/tmp/MicrosoftEdgeWebview2Setup.exe differ diff --git a/fclauncher/build/windows/installer/wails_tools.nsh b/fclauncher/build/windows/installer/wails_tools.nsh index f9c0f88..52c7688 100644 --- a/fclauncher/build/windows/installer/wails_tools.nsh +++ b/fclauncher/build/windows/installer/wails_tools.nsh @@ -5,19 +5,19 @@ !include "FileFunc.nsh" !ifndef INFO_PROJECTNAME - !define INFO_PROJECTNAME "{{.Name}}" + !define INFO_PROJECTNAME "fclauncher" !endif !ifndef INFO_COMPANYNAME - !define INFO_COMPANYNAME "{{.Info.CompanyName}}" + !define INFO_COMPANYNAME "fclauncher" !endif !ifndef INFO_PRODUCTNAME - !define INFO_PRODUCTNAME "{{.Info.ProductName}}" + !define INFO_PRODUCTNAME "fclauncher" !endif !ifndef INFO_PRODUCTVERSION - !define INFO_PRODUCTVERSION "{{.Info.ProductVersion}}" + !define INFO_PRODUCTVERSION "1.0.0" !endif !ifndef INFO_COPYRIGHT - !define INFO_COPYRIGHT "{{.Info.Copyright}}" + !define INFO_COPYRIGHT "Copyright........." !endif !ifndef PRODUCT_EXECUTABLE !define PRODUCT_EXECUTABLE "${INFO_PROJECTNAME}.exe" @@ -203,20 +203,12 @@ RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}" !macro wails.associateFiles ; Create file associations - {{range .Info.FileAssociations}} - !insertmacro APP_ASSOCIATE "{{.Ext}}" "{{.Name}}" "{{.Description}}" "$INSTDIR\{{.IconName}}.ico" "Open with ${INFO_PRODUCTNAME}" "$INSTDIR\${PRODUCT_EXECUTABLE} $\"%1$\"" - - File "..\{{.IconName}}.ico" - {{end}} + !macroend !macro wails.unassociateFiles ; Delete app associations - {{range .Info.FileAssociations}} - !insertmacro APP_UNASSOCIATE "{{.Ext}}" "{{.Name}}" - - Delete "$INSTDIR\{{.IconName}}.ico" - {{end}} + !macroend !macro CUSTOM_PROTOCOL_ASSOCIATE PROTOCOL DESCRIPTION ICON COMMAND @@ -235,15 +227,10 @@ RequestExecutionLevel "${REQUEST_EXECUTION_LEVEL}" !macro wails.associateCustomProtocols ; Create custom protocols associations - {{range .Info.Protocols}} - !insertmacro CUSTOM_PROTOCOL_ASSOCIATE "{{.Scheme}}" "{{.Description}}" "$INSTDIR\${PRODUCT_EXECUTABLE},0" "$INSTDIR\${PRODUCT_EXECUTABLE} $\"%1$\"" - - {{end}} + !macroend !macro wails.unassociateCustomProtocols ; Delete app custom protocol associations - {{range .Info.Protocols}} - !insertmacro CUSTOM_PROTOCOL_UNASSOCIATE "{{.Scheme}}" - {{end}} + !macroend diff --git a/fclauncher/frontend/package.json.md5 b/fclauncher/frontend/package.json.md5 index b063894..20dd88f 100755 --- a/fclauncher/frontend/package.json.md5 +++ b/fclauncher/frontend/package.json.md5 @@ -1 +1 @@ -ad9da3c17151b053a4d2fda8e3578901 \ No newline at end of file +48cb20b8d107dab0a7876a449352234a \ No newline at end of file diff --git a/fclauncher/frontend/src/AdminSettings.svelte b/fclauncher/frontend/src/AdminSettings.svelte index f5cee54..88330ec 100644 --- a/fclauncher/frontend/src/AdminSettings.svelte +++ b/fclauncher/frontend/src/AdminSettings.svelte @@ -9,7 +9,7 @@ QuerryModpacks().then(() => { GetModpacks().then((result) => { modpacks = result - pack = modpacks[0] + selectedPack = modpacks[0] }) }) })