Merge remote-tracking branch 'origin/main' into dev

test

Author: EmeraldLoc

CurVer

@@ -1 +1 @@
-v1.2.7.2
+v1.2.8

README.md

@@ -2,7 +2,7 @@
 # sm_osx
 
 ## About Me
-I am a swift programmer who enjoys playing video games. I started when I was very young, and since then have learned the swift programming language, and I have loved it ever since I started programming in swift. I also program in lua, c, c++, c#, and have done a little bit of js
+I am a swift programmer who enjoys playing video games. I started when I was very young, and since then have learned the swift programming language, and I have loved it ever since I started programming in swift. I also program in lua, c, c++, c#, and have done a little bit of js.
 
 ## How this project got started
 Super Mario 64 was one of the first  of 3 games I played, however I forgot about it for a couple of years until I learned about decomp and the sm64 pc port. Ever since I heard about it, I wanted to play the game in what was promised to be a wonderful 60fps, however with no easy way to do it, I realized I would have to make my own way. So after collecting a lot of knowledge about c and Makefiles and compilers, I was able to tinker up a small, but usable app, I then released the first version of sm_osx. Only including a couple of repos, it was the start of a wonderful project.
@@ -28,12 +28,12 @@ Make sure the format is .z64, if it is .n64, you can use the byteswapper [here](
 
 If it's still failing, try renaming the file to something simple, if its still broken, please make a issue.
 ### The repos are failing to compile
-Make sure you have Homebrew installed, if it is installed, please make an issue and send the log created.
+Make sure you have Homebrew installed, if it is, please make an issue and send the log created.
 ### Where are the repos stored
 The repos are stored in a folder called SM64Repos in your home folder.
 ### I have compiled a repo manually from source, but it does not compile with sm_osx
 Make sure you have Homebrew installed, if it is installed, please make an issue and send the log created.
 ### I downloaded sm_osx, but it crashes on bootup
 Please create an issue in the Issues page.
 ### My notifications are not working
-Make sure you accepted them. You can check in *Notification & Focus* in the System Preferences App.
+Make sure you accepted them. You can check in the *Notifications* section in the System Settings App, find sm_osx, and turn notifications on.

sm_osx.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		96CF3D4227DBD8C7008A26F5 /* CompilationSpeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */; };
 		96DE71D327EB9C170090E7A0 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE71D227EB9C170090E7A0 /* SettingsView.swift */; };
 		96E529D729C511F000E8E14D /* InternetChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E529D629C511F000E8E14D /* InternetChecker.swift */; };
+		96E96D8629CE3E96009CAF74 /* export.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96E96D8529CE3E96009CAF74 /* export.plist */; };
 		96EBED1329BA51970033771E /* UpdatesSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96EBED1229BA51970033771E /* UpdatesSettingsView.swift */; };
 /* End PBXBuildFile section */
 
@@ -69,6 +70,7 @@
 		96DE71D227EB9C170090E7A0 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		96DE71D427EB9C7D0090E7A0 /* sm-osx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "sm-osx-Info.plist"; sourceTree = SOURCE_ROOT; };
 		96E529D629C511F000E8E14D /* InternetChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternetChecker.swift; sourceTree = "<group>"; };
+		96E96D8529CE3E96009CAF74 /* export.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = export.plist; sourceTree = "<group>"; };
 		96EBED1229BA51970033771E /* UpdatesSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdatesSettingsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -104,6 +106,7 @@
 		9669DC5A27D5565000DE5FAB /* sm_osx */ = {
 			isa = PBXGroup;
 			children = (
+				96E96D8429CE3E80009CAF74 /* Config */,
 				96DE71D427EB9C7D0090E7A0 /* sm-osx-Info.plist */,
 				9669DC5B27D5565000DE5FAB /* sm_osxApp.swift */,
 				9669DC5F27D5565100DE5FAB /* Assets.xcassets */,
@@ -145,6 +148,14 @@
 			path = "Preview Content";
 			sourceTree = "<group>";
 		};
+		96E96D8429CE3E80009CAF74 /* Config */ = {
+			isa = PBXGroup;
+			children = (
+				96E96D8529CE3E96009CAF74 /* export.plist */,
+			);
+			path = Config;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -209,6 +220,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				96E96D8629CE3E96009CAF74 /* export.plist in Resources */,
 				9669DC6327D5565100DE5FAB /* Preview Assets.xcassets in Resources */,
 				9697DF5B29C3883D008FD602 /* sm_osx_updater.app in Resources */,
 				9669DC6027D5565100DE5FAB /* Assets.xcassets in Resources */,
@@ -383,7 +395,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
@@ -398,7 +410,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -416,7 +428,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
 				DEVELOPMENT_TEAM = 25RK3JMVLT;
@@ -431,7 +443,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.2.9;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

sm_osx/Config/export.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+   export.plist
+   sm_osx
+
+   Created by Caleb Elmasri on 3/24/23.
+   Copyright (c) 2023 ___ORGANIZATIONNAME___. All rights reserved.
+-->
+<plist version="1.0">
+<dict/>
+</plist>

sm_osx/GeneralView.swift

@@ -74,8 +74,10 @@ struct GeneralView: View {
                         Text("Keep Previously Compiled Repo By Default")
                     }
 
-                    Toggle(isOn: $showMenuExtra) {
-                        Text("Show in Menu Bar")
+                    if #available(macOS 13.0, *) {
+                        Toggle(isOn: $showMenuExtra) {
+                            Text("Show in Menu Bar")
+                        }
                     }
 
                     Picker("Default Speed", selection: $compilationSpeed) {