From 5b75869c0ba60e00147d723d5633c9f6a5d6304e Mon Sep 17 00:00:00 2001
From: Hibi <69405847+Hibiii@users.noreply.github.com>
Date: Fri, 21 Oct 2022 16:10:03 -0300
Subject: Add --show to manual page

---
 program_info/prismlauncher.6.scd | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'program_info')

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.
 
-- 
cgit 


From 74b98af8e5573da4ca5a311fd13cb3f455bc1b9c Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 24 Oct 2022 11:23:02 +0200
Subject: fix: use display name in NSIS

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 program_info/win_install.nsi.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program_info')

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
 
-- 
cgit 


From d9463620e601aa62342cafc3fb2fbeae5f56511c Mon Sep 17 00:00:00 2001
From: tobimori <tobias@moeritz.cc>
Date: Tue, 25 Oct 2022 09:34:07 +0200
Subject: move .app rename to packaging process, update mac copyright string

Signed-off-by: tobimori <tobias@moeritz.cc>
---
 program_info/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'program_info')

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)
-- 
cgit 


From b18466da8430ba782e59f50812f3724defa1f2a9 Mon Sep 17 00:00:00 2001
From: TheLastRar <TheLastRar@users.noreply.github.com>
Date: Thu, 27 Oct 2022 12:29:41 +0100
Subject: Fix: Don't specify x86 in manifest

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
---
 program_info/prismlauncher.manifest.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program_info')

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>
-- 
cgit