Merge tag '9.1' into evan-goode/merge-9.0
This commit is contained in:
commit
95af313f49
@ -181,7 +181,7 @@ set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE S
|
|||||||
|
|
||||||
######## Set version numbers ########
|
######## Set version numbers ########
|
||||||
set(Launcher_VERSION_MAJOR 9)
|
set(Launcher_VERSION_MAJOR 9)
|
||||||
set(Launcher_VERSION_MINOR 0)
|
set(Launcher_VERSION_MINOR 1)
|
||||||
set(Launcher_VERSION_PATCH 0)
|
set(Launcher_VERSION_PATCH 0)
|
||||||
|
|
||||||
set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}")
|
set(Launcher_VERSION_NAME "${Launcher_VERSION_MAJOR}.${Launcher_VERSION_MINOR}.${Launcher_VERSION_PATCH}")
|
||||||
|
@ -57,7 +57,7 @@ Section "Visual Studio Runtime"
|
|||||||
Pop $0
|
Pop $0
|
||||||
${If} $0 == "OK"
|
${If} $0 == "OK"
|
||||||
DetailPrint "Download successful"
|
DetailPrint "Download successful"
|
||||||
ExecWait "$INSTDIR\vc_redist\$vc_redist_exe /install /passive /norestart\"
|
ExecWait "$INSTDIR\vc_redist\$vc_redist_exe /install /passive /norestart"
|
||||||
${Else}
|
${Else}
|
||||||
DetailPrint "Download failed with error $0"
|
DetailPrint "Download failed with error $0"
|
||||||
${EndIf}
|
${EndIf}
|
||||||
|
Loading…
Reference in New Issue
Block a user