Merge remote-tracking branch 'origin/develop' into merge-macready-805

soh/macosx/Info.plist.in

@@ -33,5 +33,10 @@
     <string>public.app-category.games</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.15</string>
+    <key>LSArchitecturePriority</key>
+    <array>
+        <string>arm64</string>
+        <string>x86_64</string>
+    </array>
 </dict>
 </plist>

soh/macosx/soh-macos.sh.in

@@ -14,11 +14,6 @@ if [ ! -e "$SHIP_HOME"/mods ]; then
 	touch "$SHIP_HOME"/mods/custom_otr_files_go_here.txt
 fi
 
-arch_name="$(uname -m)"
-launch_arch="arm64"
-if [ "${arch_name}" = "x86_64" ] && [ "$(sysctl -in sysctl.proc_translated)" != "1" ]; then
-	launch_arch="x86_64"
-fi
+"$RESPATH"/soh-macos
 
-arch -${launch_arch} "$RESPATH"/soh-macos
 exit