diff options
| author | leo78913 <leo3758@riseup.net> | 2022-10-28 15:46:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 15:46:02 -0300 |
| commit | 4500e345b37f007f9e6311637db9df0351a57dfb (patch) | |
| tree | c523d60512749da628e822b579b47dda898782bc /program_info | |
| parent | 43bf601f120c9b1eac1c73feb31c67df54955b6d (diff) | |
| parent | e885f3c26a030d093e2c7e60770c069e4d958cff (diff) | |
| download | PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.tar.gz PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.tar.bz2 PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.zip | |
Merge branch 'PrismLauncher:develop' into toolbar-icons
Diffstat (limited to 'program_info')
| -rw-r--r-- | program_info/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | program_info/prismlauncher.6.scd | 3 | ||||
| -rw-r--r-- | program_info/prismlauncher.manifest.in | 2 | ||||
| -rw-r--r-- | program_info/win_install.nsi.in | 4 |
4 files changed, 7 insertions, 3 deletions
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt index f6e2ea84..61949e13 100644 --- a/program_info/CMakeLists.txt +++ b/program_info/CMakeLists.txt @@ -15,6 +15,7 @@ set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors") +set(Launcher_Copyright_Mac "Prism Launcher Contributors, © 2021-2022 PolyMC Contributors and © 2012-2021 MultiMC Contributors" PARENT_SCOPE) set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE) set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE) set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE) diff --git a/program_info/prismlauncher.6.scd b/program_info/prismlauncher.6.scd index e3c7de86..f979e457 100644 --- a/program_info/prismlauncher.6.scd +++ b/program_info/prismlauncher.6.scd @@ -26,6 +26,9 @@ Here are the current features of Prism Launcher. *-l, --launch*=INSTANCE_ID Launch the instance specified by INSTANCE_ID. +*--show*=INSTANCE_ID + Show the configuration window of the instance specified by INSTANCE_ID. + *--alive* Write a small 'live.check' file after Prism Launcher starts. diff --git a/program_info/prismlauncher.manifest.in b/program_info/prismlauncher.manifest.in index 1d764445..6f4467c7 100644 --- a/program_info/prismlauncher.manifest.in +++ b/program_info/prismlauncher.manifest.in @@ -10,7 +10,7 @@ </trustInfo> <dependency> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/> </dependentAssembly> </dependency> <description>Custom Minecraft launcher for managing multiple installs.</description> diff --git a/program_info/win_install.nsi.in b/program_info/win_install.nsi.in index 1c1f29da..0cd7ea11 100644 --- a/program_info/win_install.nsi.in +++ b/program_info/win_install.nsi.in @@ -4,7 +4,7 @@ Unicode true -Name "@Launcher_CommonName@" +Name "@Launcher_DisplayName@" InstallDir "$LOCALAPPDATA\Programs\@Launcher_CommonName@" InstallDirRegKey HKCU "Software\@Launcher_CommonName@" "InstallDir" RequestExecutionLevel user @@ -113,7 +113,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@ ;-------------------------------- ; The stuff to install -Section "@Launcher_CommonName@" +Section "@Launcher_DisplayName@" SectionIn RO |