sys_patch_detect: Fix GVA regression

Made grammatical corrections across the docs.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -126,7 +126,7 @@ body:
     id: used-forums
     attributes:
       label: Have you already verified this is a patcher bug and not a macOS bug/user error on our discord servers?
-      description: If no, please do not use issues for this. We'd appreciate it if users check discuss with others before filing. Issues are for valid patcher issues only, not for personal troubleshooting scessions.
+      description: If no, please do not use issues for this. We'd appreciate it if users check discuss with others before filing. Issues are for valid patcher issues only, not for personal troubleshooting secessions.
       multiple: true
       options:
         - 'true'
@@ -136,7 +136,7 @@ body:
   - type: dropdown
     id: 3rd-party-application
     attributes:
-      label: Is this issue with a 3rd party application? 
+      label: Is this issue with a 3rd party application?
       description: If yes, please move discussions onto forums. We're unable to dedicate time to working on every single application that may be broken in macOS. Only file issues if you have a fix you'd like to add to our project
       multiple: true
       options:

.github/workflows/build-app-wxpython.yml

@@ -11,12 +11,12 @@ jobs:
     name: Build wxPython
     runs-on: x86_64_mojave
     env:
-      branch: ${{ github.event.ref }}
-      commiturl: ${{ github.event.head_commit.url }}
-      commitdate: ${{ github.event.head_commit.timestamp }}
+      branch: ${{ github.ref }}
+      commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
+      commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
     steps:
       - uses: actions/checkout@v3
-      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --reset_binaries --branch ${{ env.branch }} --commit ${{ env.commiturl }} --commit_date ${{ env.commitdate }}
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"
       - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
       - run: cd dist; ditto -c -k --sequesterRsrc --keepParent OpenCore-Patcher.app ../OpenCore-Patcher-wxPython.app.zip
       - run: ./../sign-wxpython.sh

.github/workflows/build-app.yml

@@ -11,12 +11,12 @@ jobs:
     name: Build TUI
     runs-on: x86_64_mojave
     env:
-      branch: ${{ github.event.ref }}
-      commiturl: ${{ github.event.head_commit.url }}
-      commitdate: ${{ github.event.head_commit.timestamp }}
+      branch: ${{ github.ref }}
+      commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
+      commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
     steps:
       - uses: actions/checkout@v3
-      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch ${{ env.branch }} --commit ${{ env.commiturl }} --commit_date ${{ env.commitdate }}
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"
       - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
       - run: cd dist; zip -r ../OpenCore-Patcher-TUI.app.zip OpenCore-Patcher.app
       - run: ./../sign-tui.sh
@@ -26,13 +26,5 @@ jobs:
           name: OpenCore-Patcher-TUI.app
           path: OpenCore-Patcher-TUI.app.zip
 
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OpenCore-Patcher-TUI.app.zip
-          tag: ${{ github.ref }}
-          file_glob: true
       - name: Validate OpenCore
         run: ./dist/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher --validate

Build-Binary.command

@@ -40,7 +40,7 @@ class create_binary:
 
     def parse_arguments(self):
         parser = argparse.ArgumentParser(description='Builds OpenCore-Patcher binary')
-        parser.add_argument('--build_tui', action='store_true', help='Builds TUI binary, if ommited GUI binary is built')
+        parser.add_argument('--build_tui', action='store_true', help='Builds TUI binary, if omitted GUI binary is built')
         parser.add_argument('--branch', type=str, help='Git branch name')
         parser.add_argument('--commit', type=str, help='Git commit URL')
         parser.add_argument('--commit_date', type=str, help='Git commit date')
@@ -56,7 +56,7 @@ class create_binary:
         # macOS (using Python installed by homebrew (e.g. brew))
         if f"/usr/local/opt/python@3." in sys.executable:
             print(f"\t* NOTE: home(brew) python3 detected; using (sys.exec_prefix, python_path) ==> {sys.exec_prefix, python_path}")
-            # - under brew, pip3 will install pyinstall at:
+            # - under brew, pip3 will install pyinstaller at:
             #   /usr/local/lib/python3.9/site-packages/pyinstaller
             #   and /usr/local/bin/pyinstaller stub to load and run.
 
@@ -77,7 +77,7 @@ class create_binary:
         self.download_resources()
         if not self.args.build_tui:
             # payloads.dmg is only needed for GUI builds
-            self.generate_paylods_dmg()
+            self.generate_payloads_dmg()
 
     def postflight_processes(self):
         print("- Starting postflight processes")
@@ -123,6 +123,9 @@ class create_binary:
             if file.name in delete_files:
                 print(f"  - Deleting {file.name}")
                 file.unlink()
+            elif (Path(file) / Path("Contents/Resources/createinstallmedia")).exists():
+                print(f"  - Deleting {file}")
+                subprocess.run(["rm", "-rf", file])
 
     def download_resources(self):
         patcher_support_pkg_version = constants.Constants().patcher_support_pkg_version
@@ -171,7 +174,7 @@ class create_binary:
                 print(mv_output.stderr.decode('utf-8'))
                 raise Exception("Move failed")
 
-    def generate_paylods_dmg(self):
+    def generate_payloads_dmg(self):
         if Path("./payloads.dmg").exists():
             if self.args.reset_binaries:
                 print("  - Removing old payloads.dmg")

CHANGELOG.md

@@ -1,5 +1,22 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.4.8
+- Ensure Apple Silicon-specific installers are not listed
+  - ie. M2 specific build (21F2092)
+- Avoid adding OpenCore icon in boot picker if Windows bootloader on same partition
+- Add error-handling to corrupt/non-standard NVRAM variables
+- Add warning prompt when using 'Allow native models'
+  - Attempt to avoid misuse of option
+- Work-around `Failed to extract AssetData` during installer creation
+  - Apple bug, resolved by using CoW into a different directory than `/Applications`
+- Avoid listing beta installers in downloader
+- Warn about downloading macOS Ventura installers, unsupported by current patcher
+- Fix AppleGVA regression introduced in 0.4.6
+  - Applicable for Ivy Bridge-only systems
+
+## 0.4.7
+- Fix crashing on defaults parsing
+
 ## 0.4.6
 - Fix Bluetooth support in 12.4 Release
   - Applicable for BCM2046 and BCM2070 chipsets
@@ -256,7 +273,7 @@
 - Allow for setting custom SIP values via TUI
 - Drop `CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE` requirement for root patching
   - Lowers default SIP Disabled value to 0xA03
-- Update Legacy GMUX patchset to latest Sierra Secuirty Update
+- Update Legacy GMUX patchset to latest Sierra security Update
   - [Source](https://github.com/HackintoshHD/mbp5x-instant-gpu-switching)
 - Fix non-Metal acceleration crashing on 12.0.1
   - Yes Apple adding a notch broke our accel patches

data/mirror_data.py

@@ -1,4 +1,4 @@
-# Mirrors of Apple's InstallAssistant.ppkg
+# Mirrors of Apple's InstallAssistant.pkg
 # Currently only listing important Installers no longer on Apple's servers
 
 Install_macOS_Big_Sur_11_2_3 = {

data/os_data.py

@@ -3,22 +3,26 @@ import enum
 
 class os_data(enum.IntEnum):
     # OS Versions, Based off Major Kernel Version
-    tiger = 8
-    leopard = 9
-    snow_leopard = 10
-    lion = 11
+    cheetah =       4 # Actually 1.3.1
+    puma =          5
+    jaguar =        6
+    panther =       7
+    tiger =         8
+    leopard =       9
+    snow_leopard =  10
+    lion =          11
     mountain_lion = 12
-    mavericks = 13
-    yosemite = 14
-    el_capitan = 15
-    sierra = 16
-    high_sierra = 17
-    mojave = 18
-    catalina = 19
-    big_sur = 20
-    monterey = 21
-    ventura = 22
-    max_os = 99
+    mavericks =     13
+    yosemite =      14
+    el_capitan =    15
+    sierra =        16
+    high_sierra =   17
+    mojave =        18
+    catalina =      19
+    big_sur =       20
+    monterey =      21
+    ventura =       22
+    max_os =        99
 
 
 class os_conversion:
@@ -45,4 +49,32 @@ class os_conversion:
             if source_minor < target_minor:
                 return True
             else:
-                return False
+                return False
+
+    def convert_kernel_to_marketing_name(kernel):
+        # Convert major XNU version to Marketing Name
+        try:
+            # Find os_data enum name
+            os_name = os_data(kernel).name
+
+            # Remove "_" from the string
+            os_name = os_name.replace("_", " ")
+
+            # Upper case the first letter of each word
+            os_name = os_name.title()
+        except ValueError:
+            # Handle cases where no enum value exists
+            # Pass kernel_to_os() as a substitute for a proper OS name
+            os_name = os_conversion.kernel_to_os(kernel)
+
+        return os_name
+
+    def convert_marketing_name_to_kernel(marketing_name):
+        # Convert Marketing Name to major XNU version
+        try:
+            # Find os_data enum value
+            os_kernel = os_data[marketing_name.lower().replace(" ", "_")]
+        except KeyError:
+            os_kernel = 0
+
+        return int(os_kernel)

data/pci_data.py

@@ -1,6 +1,6 @@
 # Array of Device IDs for different devices
 class nvidia_ids:
-    # Courteous of envytools as well as Macrumors:
+    # Courteous of envytools as well as MacRumors:
     # https://envytools.readthedocs.io/en/latest/hw/pciid.html
     # https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/
     # https://pci-ids.ucw.cz/read/PC/10de

data/sys_patch_dict.py

@@ -3,7 +3,7 @@
 
 # Schema for sys_patch_dict.py:
 # Supports 6 types of higher level keys:
-#  - OS Support:         Supported OSes by patchse   - Dictionary of Min/Max Kernel Major and Minor versions
+#  - OS Support:         Supported OSes by patches   - Dictionary of Min/Max Kernel Major and Minor versions
 #  - Install:            Install to root volume      - Dictionary of strings with string value of source
 #  - Install Non-Root:   Install to data partition   - Dictionary of strings with string value of source
 #  - Remove:             Files to remove             - Array of strings

docs/ACCEL.md

@@ -18,7 +18,7 @@ The below page is for users experiencing issues with their overall usage of macO
 
 * Intel 3rd and 4th Gen - GMA series
 
-For those unfamiliar with what is considered a non-Metal GPU, see below chart:
+For those unfamiliar with what is considered a non-Metal GPU, see the chart below:
 
 ::: details macOS GPU Chart
 
@@ -105,9 +105,9 @@ Workaround: Press some combination of Tab, or Tab and then Shift-Tab, or just Sh
 
 ## Wake from sleep heavily distorted on AMD/ATI in macOS 11.3 and newer
 
-Unfortunately a very well known issue the community is investigating, current known solution is to simply downgrade to 11.2.3 or older until a proper fix can be found. Additionally logging out and logging in can resolve the issue without requiring a reboot
+Unfortunately a very well known issue that the community is investigating. A currently known solution is to downgrade to macOS 11.2.3 or older until a proper fix can be found. Additionally logging out and logging in can resolve the issue without requiring a reboot.
 
-* Note, this issue should be exclusive to TeraScale 1 GPUs (ie. HD2000-4000). TeraScale 2 GPUs should not exhibit this issue
+* Note, this issue should be exclusive to TeraScale 1 GPUs (ie. HD2000-4000). TeraScale 2 GPUs should not exhibit this issue.
 
 In the event Apple removes 11.2.3 from their catalogue, we've provided a mirror below:
 
@@ -123,11 +123,11 @@ The best way to achieve this is to boot Recovery (or Single User Mode if the dGP
 nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00
 ```
 
-This will disable the dGPU and allow the iGPU to function in Big Sur. Note that external display outputs are directly routed to the dGPU and therefore can no longer be used. Solutions such as a [DisplayLink Adapters](https://www.displaylink.com/products/usb-adapters) can work around this limitation, however note that you'll need to use older drivers (5.2.6):
+This will disable the dGPU and allow the iGPU to function in Big Sur. Note that external display outputs are directly routed to the dGPU and therefore can no longer be used. Solutions such as [DisplayLink Adapters](https://www.displaylink.com/products/usb-adapters) can work around this limitation, however, note that you'll need to use older drivers (5.2.6):
 
 * [DisplayLink USB Graphics Software for macOS - For Mojave and Catalina - 5.2.6](https://www.synaptics.com/products/displaylink-graphics/downloads/macos-5.2.6)
 
-Note this driver only provides partial support in macOS, full graphics acceleration is not currently available on the displays driven by DisplayLink
+Note: This driver only provides partial support in macOS, full graphics acceleration is not currently available on displays driven by DisplayLink.
 
 ## Erratic Colours on ATI TeraScale 2 GPUs (HD5000/HD6000)
 
@@ -135,7 +135,7 @@ Resolved with OpenCore Legacy Patcher v0.4.2
 
 ::: details Legacy Fix (prior to 0.4.2)
 
-Due to an odd bug with ATI's TeraScale 2 GPUs, many users will experience erratic/strobing colours once finished installing and rebooting into the accelerated patches. The issue stems from an incorrect assumption in the GPU drivers where it will enforce the Billion Colour space on your display. To fix, simply force your Display into a lower color depth such as a Million Colours.
+Due to an odd bug with ATI's TeraScale 2 GPUs, many users will experience erratic/strobing colours once finished installing accelerated patches and rebooting into macOS. The issue stems from an incorrect assumption in the GPU drivers where it will enforce the Billion Colour space on your display. To fix, simply force your Display into a lower color depth such as Million Colours.
 
 Applications that can set color depth are:
 
@@ -146,15 +146,15 @@ Applications that can set color depth are:
 
 ## Unable to allow Safari Extensions
 
-Due to an bug on the legacy acceleration patches, users won't be able to enable Safari Extensions
+Due to a bug in the legacy acceleration patches, users won't be able to enable Safari Extensions.
 
-This tool can be used to work-around this issue:
+The following tool can be used to work-around this issue:
 
 * [Non-Metal Safari Extensions](https://github.com/moosethegoose2213/Non-Metal-Safari-Extensions/)
 
 ## Cannot Login on 2011 15" and 17" MacBook Pros
 
-By default OpenCore Legacy Patcher will assume MacBookPro8,2/3 have a faulty dGPU and disable acceleration. This is the safest option for most users as enabling dGPU acceleration on faulty Macs will result in failed booting.
+By default, OpenCore Legacy Patcher will assume MacBookPro8,2/3 have a faulty dGPU and disable acceleration. This is the safest option for most users as enabling dGPU acceleration on faulty Macs will result in failed booting.
 
 However if your machine does not have the dGPU disabled via NVRAM, you'll experience a login loop. To work around this is quite simple:
 
@@ -178,7 +178,7 @@ nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%00%00%00%00
 
 A somewhat strange issue on Intel HD3000-based Macs, on 3rd party displays sometimes UI elements may become black and unreadable. To resolve, select either the generic `Display` or `Display P3` Color Profiles in Display Settings.
 
-* Mainly applicable for HDMI Displays, DVI and DisplayPort are generally unaffected
+* Mainly applicable for HDMI Displays, DVI and DisplayPort are generally unaffected.
 * If you're inside Setup Assistant, press `Cmd` + `Option` + `Control` + `T` to launch Terminal. From there, run `open /System/Applications/System\ Preferences.app`
 
 

docs/BOOT.md

@@ -8,6 +8,50 @@ Reboot machine while holding `Option` to select the EFI Boot entry with the Open
 
 ![](../images/efi-boot.png)
 
+::: details Note for Mac Pros/Xserves/iMacs with unflashed GPUs
+
+(Adapted from the [OpenCore on the Mac Pro guide](https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/))
+
+For Mac Pro, Xserve and, iMac users with non-flashed GPUs, you can still easily boot OpenCore and view the entire boot process.
+
+Firstly, open the Terminal and run the following command:
+```sh
+sudo nvram "recovery-boot-mode=unused" && sudo reboot recovery
+```
+This will make your machine reboot into the Recovery Environment. Alternatively, holding Command + R when your machine is starting up will also let you enter the Recovery.
+
+Secondly, open the Recovery Environment's Terminal (Menu bar > Utilities > Terminal).
+
+Now you'll want to get a list of drive identifiers. To do so, run the following command:
+```sh
+diskutil list
+```
+The command should produce a list of drives installed in your system:
+![](../images/Unflashed-Boot-1.png)
+
+Keep track of the drive with the OCLP install. You will need the drive identifer for later.
+
+Now you'll want to mount the EFI partition (where OCLP is installed, though may differ if you've installed OCLP to a FAT-32 volume).
+
+Run the following command (Replace X with the drive number):
+```sh
+diskutil mount diskXs1
+```
+![](../images/Unflashed-Boot-2.png)
+If everything is correct, the EFI partion should be mounted.
+
+Now you'll want to use the bless command to set the default boot device:
+```sh
+bless --mount /Volumes/EFI --setBoot --file /Volumes/EFI/System/Library/CoreServices/boot.efi
+```
+Once the command is run, it should produce no output.
+![](../images/Unflashed-Boot-3.png)
+
+If the command produces an output, ensure that you've typed it in correctly.
+
+Now you can reboot your machine. OCLP is now the default boot option!
+:::
+
 Now that you've loaded OpenCore, now select Install macOS:
 
 * This will be the OpenCore Picker
@@ -23,7 +67,7 @@ If your Mac is looping back into the beginning of the setup after the first rebo
 ![](../images/oclp-stuck-firstreboot.png)
 
 
-::: warning 
+::: warning
 
 **MacBookPro11,3 Note**: When booting macOS Monterey, you'll need to boot into safe mode if acceleration patches are not installed yet. [Otherwise you'll hit a black screen due to missing NVIDIA drivers.](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/522) Safe Mode can be entered by holding Shift+Enter when selecting macOS Monterey in OCLP's Boot Menu.
 

docs/BUILD.md

@@ -18,7 +18,7 @@ Here we'll select Build and Install OpenCore and start building:
 
 Once it finishes building, you'll want to select the Install OpenCore button:
 
-* If you created a macOS USB manually and don't see it listed, make sure it's either formatted as GUID/GPT or has a FAT32 partition for OpenCore to sit on
+* If you created a macOS USB manually and don't see it listed, make sure it's either formatted as GUID/GPT or has a FAT32 partition for OpenCore to reside on.
 
 
 | Select Drive | Select Partition |

docs/DEBUG.md

@@ -1,10 +1,10 @@
 # How to debug with OpenCore
 
-For those who've hit an odd bug and unsure if it's user error or patcher, we recommend asking on the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) for help.
+For those who've hit an odd bug and unsure if it's user error or within the patcher, we recommend asking on the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) for help.
 
 ## Debugging yourself
 
-The easiest way to debug yourself is via Patcher Settings. Here there are many different settings however the 3 main options that will help are:
+The easiest way to debug yourself is via Patcher Settings. Here there are many different settings, however, the 3 main options that will help are:
 
 * "Enable Verbose Mode"
 * "Enable OpenCore DEBUG"
@@ -38,7 +38,7 @@ From there, you'll have a log on your desktop.
 Currently issues have been disabled due to [current events](ISSUES-HOLD.md). You can continue to receive support in the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN), where there are active members of the community available.
 :::
 
-Now that you have proper logs, you can now [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues). Reminder we want the following info:
+Now that you have proper logs, you can now [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues). This is a reminder to include the following info:
 
 * Model patching for (ie. MacBookPro10,1)
 * Target OS (ie. macOS 11.2.3)

docs/INSTALLER.md

@@ -28,6 +28,14 @@ For this example, we'll assume you'll need an installer. Selecting this option w
 
 Since the patcher officially supports Big Sur and newer for patching, only those entires will be shown. For ourselves, we'll select 12.1 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.
 
+::: warning
+
+With the release of the M2 MacBooks, Apple made an Apple Silicon only installer labeled "macOS 12.4 (21F2092 - 11.7GB)". Trying to boot this on Intel will not work.
+
+Instead, download "macOS 12.4 (21F79 - 12.1GB)" or newer.
+
+:::
+
 | Downloading the Installer | Requesting to install | Finished Installing |
 | :--- | :--- | :--- |
 | ![OCLP GUI Installer Download Progress](../images/OCLP-GUI-Installer-Download-Progress.png) | ![OCLP GUI Installer Needs Installing](../images/OCLP-GUI-Installer-Needs-Installing.png) | ![OCLP GUI Installer Download Finished](../images/OCLP-GUI-Installer-Download-Finished.png) |

docs/LICENSE.md

@@ -1,4 +1,4 @@
-# OpenCore Legacy Patcher Licence
+# OpenCore Legacy Patcher License
 
 This patcher is made of multiple external applications from different people and organizations. See each program for their licensing:
 

docs/MODELS.md

@@ -1,6 +1,6 @@
 # Supported Models
 
-Any hardware supporting SSE4.1 CPU and 64-Bit firmware work on this patcher. To check your hardware model, run the below command on the applicable machine in terminal:
+Any hardware supporting SSE4.1 CPU and 64-Bit firmware work on this patcher. To check your hardware model, run the following command on the applicable machine in the terminal:
 
 ```bash
 system_profiler SPHardwareDataType | grep 'Model Identifier'

docs/PATCHEXPLAIN.md

@@ -8,7 +8,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 
 ## OpenCore Settings
 
-Below is a run down of the main logic OpenCore Legacy Patcher uses to gain native support in macOS. Note OpenCore's configuration is documented within [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg) as well as an online version provided by us:
+Below is a run down of the main logic OpenCore Legacy Patcher uses to gain native support in macOS. Note that OpenCore's configuration is documented within [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg) as well as on an online version provided by us:
 
 * [OpenCorePkg Online Docs](https://dortania.github.io/docs/latest/Configuration.html)
 
@@ -17,7 +17,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
 ### ACPI -> Add
 
 * SSDT-CPBG
-  * Reason: Resolves Kernel Panic on Arrendale Macs in early Big Sur builds
+  * Reason: Resolves Kernel Panic on Arrandale Macs in early Big Sur builds
   * Logic: Disable dummy CPBG device in ACPI
   * Models: MacBookPro6,x and iMac11,x
 * SSDT-PCI
@@ -28,7 +28,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: Allows for software based deMUX disabling dGPUs in 2011 MacBook Pros
   * Logic: Sends power down request to dGPU via ACPI
   * Models: MacBookPro8,2 and MacBookPro8,3 with dead dGPUs
- 
+
 ### ACPI -> Patch
 
 * `EHCx` and `XHC1` Patches
@@ -39,13 +39,13 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: To be paired with SSDT-PCI
 * `_INI` to `XINI` Patch
   * Reason: To be paired with SSDT-DGPU
-  
+
 ### Booter -> Patch
 
 * Reroute `HW_BID` to `OC_BID`
   * Reason: Allows macOS installers to be used on unsupported models
   * Logic: Reroutes Board ID macOS checks to custom variable
-  * Models: All systems using VMM spoofing 
+  * Models: All systems using VMM spoofing
 
 ### Booter -> Quirks
 
@@ -146,7 +146,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: Used for proper output on machines with UGA firmware but GOP GPU
   * Logic: Provide GOP protocol instances on top of UGA protocol instances
   * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
-  
+
 :::
 
 ## Injected Kext
@@ -173,7 +173,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Reason: Patches BlueTool to enable bluetooth functionality on Monterey
   * Models: All models with pre-BCM94360 wireless cards or 3rd-party chipsets
 * Bluetooth-Spoof
-  * Reason: Injects extra data into certain bluetooth chipsets for recognition by the system 
+  * Reason: Injects extra data into certain bluetooth chipsets for recognition by the system
   * Models: Models with the BCM2070 or BCM2046 chipsets
 * FeatureUnlock (Night Shift)
   * Reason: Patches CoreBrightness.framework to enable Night Shift on unsupported models
@@ -195,7 +195,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Models: 2008 and older Marvel Ethernet require
 * CatalinaBCM5701Ethernet
   * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur
-  * Logic: Patch out conflicting symbols to not colide existing BCM5701Ethernet
+  * Logic: Patch out conflicting symbols to not collide existing BCM5701Ethernet
   * Models: 2011 and older Broadcom Ethernet require
 
 ### Maps
@@ -217,11 +217,11 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 
 * IO80211HighSierra
   * Reason: Re-inject Atheros wifi drivers from High Sierra
-  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
   * Models: Atheros cards
 * IO80211Mojave
   * Reason: Re-inject Broadcom wifi drivers from Mojave
-  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
   * Models: BCM94322
 
 ### Misc

docs/POST-INSTALL.md

@@ -14,7 +14,7 @@ Once you've installed macOS through OpenCore, you can boot up and go through the
 * Install OpenCore to internal drive
 * Reboot holding Option, and select the internal EFI
 
-And voila! No more USB drive required
+And voila! No more USB drive required.
 
 ## Booting seamlessly without Verbose or OpenCore Picker
 
@@ -29,13 +29,13 @@ Here you can change different patcher settings, however the main interest is:
 * Show Boot Picker (GUI)
 * Set ShowPicker Mode (TUI)
 
-Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, then you can release the "ESC" key when you see the cursor arrow at the top left.
+Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, and then you can release the "ESC" key when you see the cursor arrow at the top left.
 
 ## Enabling SIP
 
 For many users, SIP will be enabled by default on build. For Intel HD 4000 users, you may have noticed that SIP is partially disabled. This is to ensure full compatibility with macOS Monterey and allow seamless booting between it and older OSes. However for users who do not plan to boot Monterey, you can re-enable under Patcher Settings.
 
-Note: Machines with non-Metal GPUs cannot enable SIP in Big Sur either due to patched root volume
+Note: Machines with non-Metal GPUs cannot enable SIP in Big Sur either, due to having a patched root volume
 
 | SIP Enabled | SIP Lowered (Root Patching) | SIP Disabled |
 | :--- | :--- | :--- |
@@ -43,24 +43,16 @@ Note: Machines with non-Metal GPUs cannot enable SIP in Big Sur either due to pa
 
 :::warning 
 
-If you're unsure whether you should enable SIP, leave as-is. Systems where you have already ran the Post Install Root Patching cannot enable SIP without potentially breaking the current install. 
+If you're unsure whether you should enable SIP, leave it as-is. Systems where you have already ran the Post Install Root Patching cannot enable SIP without potentially breaking the current install. 
 
 :::
 
 ## Applying Post Install Volume Patches
 
-Post Install Volume Patches, sometimes also called root patches, are patches that have to be installed on disk for some older Macs to gain back functionality.
+Post Install Volume Patches, sometimes also called root patches, are patches that have to be installed to disk for some older Macs to gain back functionality.
 
 OCLP v0.4.4 and higher include an autopatcher, which will automatically root patch your system but **only if the USB install media was created within OCLP.**
 
-::: details Note for Mac Pros when swapping a GPU from non-metal to Metal
-
-If you finished installing Monterey with the original card installed (to see bootpicker for example) and swapped your GPU to a Metal supported one, you may notice that you're missing acceleration. To fix this, open OCLP and revert root patches to get your Metal-supported GPU work again.
-
-Alternatively, you can remove "AutoPkg-Assets.pkg" from /Library/Packages on the USB drive before proceeding with the installation. To see the folder, enable hidden files with `Command` + `Shift` + `.` 
-:::
-
-
 Users with OCLP v0.4.4 or higher will also be prompted to install these patches after macOS updates or whenever patches are not detected on the system. We recommend rebuilding OpenCore with the latest version of OCLP to take advantage of these new features.
 
 
@@ -77,7 +69,7 @@ In OCLP v0.4.5 a new indicator was added to help users to see if, when and on wh
 
 ### Running Post Install patches manually
 
-If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you can do so with the app. There is no harm in trying to run the Patcher, as without compatible hardware nothing will be done. You can see below on whether your hardware needs root volume patching. 
+If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you can do so with the app. There is no harm in trying to run the Patcher, as without compatible hardware, nothing will be done. You can see below on whether your hardware needs root volume patching or not. 
 
 | Listing Patches | Patching Finished |
 | :--- | :--- |
@@ -86,7 +78,7 @@ If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you
 
 :::warning
 
-With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a network connection by default to grab associated resources. If your system is having difficulties with wifi or ethernet, you can grab the newest release :
+With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a network connection by default to grab associated resources. If your system is having difficulties with Wi-Fi or ethernet, you can grab the newest release :
 
 * [OpenCore Legacy Patcher releases](https://github.com/dortania/OpenCore-Legacy-Patcher/releases/latest)
 

docs/START.md

@@ -1,15 +1,13 @@
 # What is OpenCore?
 
-This is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means we're able to get near-native experience on many unsupported Macs. 
+OpenCore is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means that we're able to achieve a near-native experience on many unsupported Macs. 
 
-* We recommend viewing the [OpenCore Patcher Terminology Page](./TERMS.md) if you have questions
-* For troubleshooting, join the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) and see our [Troubleshooting Page](./TROUBLESHOOTING.md)
+* We recommend viewing the [OpenCore Patcher Terminology Page](./TERMS.md) if you have questions.
+* For troubleshooting, join the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) and see our [Troubleshooting Page](./TROUBLESHOOTING.md).
 
 ## How do I get started?
 
-1. The first step of ensuring whether your model is supported is checking here:
-
-* [Supported Models](./MODELS.md)
+1. The first step of ensuring whether your model is supported is by checking the [Supported Models](./MODELS.md) page.
 
 2. [Download and build macOS Installer](./INSTALLER.md)
 3. [Run the `OpenCore-Patcher.app`](./BUILD.md)

docs/TERMS.md

@@ -16,14 +16,14 @@ Term | Description
 --- | ---
 **OpenCore**   | The new hotness on the scene, made with security in mind by the [Acidanthera team](https://github.com/acidanthera), has faster booting and lighter weight than previous boot managers. Supports many native Mac features such as SIP, FileVault, Secure Boot, etc
 **ACPI**   | Tables defined in your firmware defining your hardware and different methods, tied directly to how IOKit/IOService handles device setup
-**NVRAM**   | Non-volitile storage, where many variables are stored including default boot options, Hibernation keys, Secure Boot information, etc
+**NVRAM**   | Non-volatile storage, where many variables are stored including default boot options, Hibernation keys, Secure Boot information, etc
 ---
 Term | Description
 --- | ---
 **XNU**    | Also known as **X** is **N**ot **U**nix, XNU is referred to as macOS's "kernel" and the heart of what makes macOS tick
 **Kexts**   | Also known as **K**ernel **Ext**ensions, are macOS's drivers. They're used to perform different tasks like device drivers or for a different purpose (in this patcher) like patching the OS, injecting information or running tasks.
 **KernelCollection**   | Also known as the ImmutableKernel and PrelinkedKernel, this is a bundle of the kernel(XNU) and kernel extensions(Kexts) that we use to boot macOS. This is also what OpenCore patches in memory to allow us to have a seamless experience <br/>- PrelinkedKernel: Default caching system since 10.7 <br/>- ImmutableKernel: Secure Boot based caching system since 10.13 <br/>- KernelCollection: Merge of both Prelinked and ImmutableKernel's since macOS 11, Big Sur
-**IOKit**   | Backbone of how Kernel Extentions (Kexts) probe and attach onto hardware, starts quickly after kernel initates
+**IOKit**   | Backbone of how Kernel Extensions (Kexts) probe and attach onto hardware, starts quickly after kernel initiates
 **WindowServer**   | Backbone of the GUI interface in macOS, one of the first userfacing userspace programs to kick-in
 **OTA**   | Short for **O**ver **T**he **A**ir, refers to native OS updates via System Preferences like a supported Mac
 **DELTA**   | Often used with OTA, refers to OS updates that much smaller than full installers (generally ~3GB), note Deltas require the root volume to be unmodified otherwise ~12GB updates will occur.

docs/TROUBLESHOOTING.md

@@ -2,6 +2,7 @@
 
 Here are some common errors users may experience while using this patcher:
 
+* [OpenCore Legacy Patcher not launching](#opencore-legacy-patcher-not-launching)
 * [Stuck on `This version of Mac OS X is not supported on this platform`](#stuck-on-this-version-of-mac-os-x-is-not-supported-on-this-platform)
 * [Cannot boot macOS without the USB](#cannot-boot-macos-without-the-usb)
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
@@ -17,29 +18,39 @@ Here are some common errors users may experience while using this patcher:
 * [Volume Hash Mismatch Error in macOS Monterey](#volume-hash-mismatch-error-in-macos-monterey)
 * [Cannot Disable SIP in recoveryOS](#cannot-disable-sip-in-recoveryos)
 * [Stuck on "Less than a minute remaining..."](#stuck-on-less-than-a-minute-remaining)
+* [No acceleration after a Metal GPU swap on Mac Pro](#no-acceleration-after-a-metal-gpu-swap-on-mac-pro)
 
 
+
+## OpenCore Legacy Patcher not launching
+
+If the application won't launch (e.g. icon will bounce in the Dock), try launching OCLP via Terminal by typing the following command, make sure you've moved the app to `/Applications` before this.
+
+```sh
+/Applications/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher
+```
+
 ## Stuck on `This version of Mac OS X is not supported on this platform`
 
-This means macOS has detected a SMBIOS it does not support, to resolve this ensure you're booting OpenCore **before** the macOS installer in the boot picker. Reminder the option will be called `EFI Boot`
+This means macOS has detected an SMBIOS it does not support. To resolve this, ensure you're booting OpenCore **before** the macOS installer in the boot picker. Reminder that the option will be called `EFI Boot`.
 
-Once you've booted OpenCore at least once, your hardware should now auto boot it until either NVRAM reset or you remove the drive with OpenCore installed.
+Once you've booted OpenCore at least once, your hardware should now auto-boot it until either an NVRAM reset occurs, or you remove the drive with OpenCore installed.
 
 ## Cannot boot macOS without the USB
 
-By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again but select your internal drive.
+By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again and select your internal drive.
 
 Reminder that once this is done, you'll need to select OpenCore in the boot picker again for your hardware to remember this entry and auto boot from then on.
 
 ## Infinite Recovery OS Booting
 
-With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates work correctly and reliably with Big Sur. However this installs NVRAM variables that will confuse your Mac if not running with OpenCore. To resolve, simply uninstall OpenCore and [reset NVRAM](https://support.apple.com/en-mide/HT201255).
+With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates work correctly and reliably with Big Sur. However this installs NVRAM variables that will confuse your Mac if not running with OpenCore. To resolve this, simply uninstall OpenCore and [reset NVRAM](https://support.apple.com/en-mide/HT201255).
 
-* Note: Machines with modded root volumes will also result in infinite recovery until integrity is restored
+* Note: Machines with modded root volumes will also result in an infinite recovery loop until integrity is restored.
 
 ## Reboot when entering Hibernation (`Sleep Wake Failure`)
 
-[Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), temporary fix is to disable Hibernation:
+[Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), a temporary fix is to disable Hibernation by executing the following command in the terminal:
 
 ```
 sudo pmset -a hibernatemode 0
@@ -47,58 +58,57 @@ sudo pmset -a hibernatemode 0
 
 ## Booting with a non-flashed GPU
 
-For Mac Pro, Xserve and iMac users with non-flashed GPUs, you can still easily boot OpenCore and view the entire boot process. To do so, make sure SIP is disabled(to allow NVRAM write access) and run the following:
+For Mac Pro, Xserve and iMac users with non-flashed GPUs, you can still easily boot OpenCore and view the entire boot process. To do so, make sure SIP is disabled (to allow NVRAM write access) and run the following:
 
 ```sh
 sudo bless --verbose --file /Volumes/VOLNAME/EFI/OC/OpenCore.efi --folder /Volumes/VOLNAME/EFI/OC --setBoot
 ```
 
-* Note you will need to replace `VOLNAME` with the Volume name of your USB or hard drive with OpenCore
-* Note 2: Once done, you can re-enable SIP
-* Note 3: The EFI partition OpenCore was installed on must be mounted, if it's unmounted simply rerun "Install OpenCore to drive"
+* Note 1: You will need to replace `VOLNAME` with the Volume name of your USB or hard drive with OpenCore.
+* Note 2: Once done, you can re-enable SIP.
+* Note 3: The EFI partition OpenCore was installed on must be mounted. If it's unmounted, simply rerun "Install OpenCore to drive."
 
-Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore ensuring seamless usage even with OS installation and updates.
+Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority, making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore, ensuring seamless usage even with OS installation and updates.
 
 ## How to Boot Big Sur Recovery
 
-By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the "Spacebar" inside OpenCore's Picker to list all boot options.
+By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the `Spacebar` key while inside OpenCore's Picker to list all boot options.
 
 ## Stuck on "Your Mac needs a firmware update"
 
 Full error: "Your Mac needs a firmware update in order to install to this Volume. Please select a Mac OS Extended (Journaled) volume instead."
 
-This error occurs when macOS determines the firmware to not have full APFS support. To resolve is quite simple, when building OpenCore head to "Patcher Settings" and enable "Moderate SMBIOS Patching" or higher. This will ensure that the firmware reported will show as supporting full APFS capabilities.
+This error occurs when macOS determines that the current firmware does not have full APFS support. To resolve this, when installing OpenCore, head to "Patcher Settings" and enable "Moderate SMBIOS Patching" or higher. This will ensure that the firmware reported will show support for full APFS capabilities.
 
 ## No Brightness Control
 
-With OCLP v0.0.22, we've added support for brightness control on many models. However some users may have noticed that their brightness keys do not work.
+With OCLP v0.0.22, we've added support for brightness control on many models. However, some users may have noticed that their brightness keys do not work.
 
-To work-around, we recommend user try out the below app:
+As a work-around, we recommend users try out the below app:
 
 * [Brightness Slider](https://actproductions.net/free-apps/brightness-slider/)
 
 ## Cannot connect Wi-Fi on Monterey with legacy cards
 
-With OCLP v0.2.5, we've added support for legacy Wi-Fi on Monterey. However some users may have noticed that they can't connect to wireless networks.
+With OCLP v0.2.5, we've added support for legacy Wi-Fi on Monterey. However, some users may have noticed that they can't connect to wireless networks.
 
-To work-around, we recommend users to manually connect using the "other" option on the Wi-Fi menu bar or manually adding the network on the "Network" preference pane.
+To work-around this, we recommend that users manually connect using the "other" option in the Wi-Fi menu bar or manually adding the network in the "Network" preference pane.
 
 ## No Graphics Acceleration
 
+In macOS, GPU drivers are often dropped from the OS with each major release of it. With macOS Big Sur, currently all non-Metal GPUs require additional patches to gain acceleration. In addition, macOS Monterey removed Graphics Drivers for both Intel Ivy Bridge and NVIDIA Kepler graphics processors. 
 
-In macOS, each release generally means GPU drivers are dropped from the OS. With macOS Big Sur, currently all non-Metal GPUs require additional patches to gain acceleration. In addition, macOS Monterey removed Graphics Drivers for both Intel Ivy Bridge and NVIDIA Kepler. 
-
-If you're using OCLP v0.4.4, you should have been prompted to install Root Volume patches after first boot from installation of macOS. If you need to do this manually, you can within our app. Once rebooted, acceleration will be re-enabled as well as brightness control for laptops.
+If you're using OCLP v0.4.4, you should have been prompted to install Root Volume patches after the first boot from installation of macOS. If you need to do this manually, you can do so within the patcher app. Once rebooted, acceleration will be re-enabled as well as brightness control for laptops.
 
 ## Black Screen on MacBookPro11,3 in macOS Monterey
 
 Due to Apple dropping NVIDIA Kepler support in macOS Monterey, [MacBookPro11,3's GMUX has difficulties switching back to the iGPU to display macOS correctly.](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/522) To work-around this issue, boot the MacBookPro11,3 in Safe Mode and once macOS is installed, run OCLP's Post Install Root Patches to enable GPU Acceleration for the NVIDIA dGPU.
 
-* Safe Mode can be started by holding Shift+Enter when selecting macOS Monterey in OCLP's Boot Menu.
+* Safe Mode can be started by holding `Shift` + `Enter` when selecting macOS Monterey in OCLP's Boot Menu.
 
 ## No DisplayPort Output on Mac Pros with NVIDIA Kepler
 
-If you're having troubles with DisplayPort output on Mac Pros, try enabling Minimal Spoofing in Settings -> SMBIOS Settings and rebuild/install OpenCore. This will trick macOS drivers into thinking you have a newer MacPro7,1 and play nicer.
+If you're having trouble with DisplayPort output on Mac Pros, try enabling Minimal Spoofing in Settings -> SMBIOS Settings and rebuild/install OpenCore. This will trick macOS drivers into thinking you have a newer MacPro7,1 and resolve the issue.
 
 ![](../images/OCLP-GUI-SMBIOS-Minimal.png)
 
@@ -110,17 +120,17 @@ A semi-common popup some users face is the "Volume Hash Mismatch" error:
 <img src="../images/Hash-Mismatch.png">
 </p>
 
-What this error signifies is that the OS detects the boot volume's hash does not match to what the OS detects, this error is generally cosmetic and can be ignored. However if your system starts to crash spontaneously shortly after, you'll want to reinstall macOS fresh without importing any data at first.
+What this error signifies is that the OS detects that the boot volume's hash does not match what the OS is expecting, this error is generally cosmetic and can be ignored. However if your system starts to crash spontaneously shortly after, you'll want to reinstall macOS fresh without importing any data at first.
 
 * Note that this bug affects native Macs as well and is not due to issues with unsupported Macs: [OSX Daily: “Volume Hash Mismatch” Error in MacOS Monterey](https://osxdaily.com/2021/11/10/volume-hash-mismatch-error-in-macos-monterey/)
 
-Additionally it can help to disable FeatureUnlock in Settings -> Misc Settings as this tool can be strenuous on systems with weaker memory stability.
+Additionally, it can help to disable FeatureUnlock in Settings -> Misc Settings as this tool can be strenuous on systems with weaker memory stability.
 
 ## Cannot Disable SIP in recoveryOS
 
-With OCLP, the patcher will always overwrite the current SIP value on boot to ensure that users don't brick an installation after NVRAM reset. However for users wanting to disable SIP entirely, this can be done easily.
+With OCLP, the patcher will always overwrite the current SIP value on boot to ensure that users don't brick an installation after an NVRAM reset. However, for users wanting to disable SIP entirely, this can be done easily.
 
-Head into the GUI, Patcher Settings and toggle the bits you need disabled from SIP:
+Head into the GUI, go to Patcher Settings, and toggle the bits you need disabled from SIP:
 
 | SIP Enabled | SIP Lowered (Root Patching) | SIP Disabled |
 | :--- | :--- | :--- |
@@ -135,10 +145,19 @@ For those experiencing issues with USB 1.1 devices (such as mice, keyboards and
 
 Because of this, we recommend placing a USB 2.0/3.0 hub between your devices and the port on the Mac Pro. UHCI and EHCI cannot both be used at once, so using a USB hub will always force the EHCI controller on.
 
-* Alternatively, you can try cold starting the hardware and see if macOS recognizes the UHCI controller properly
+* Alternatively, you can try cold-starting the hardware and see if macOS recognizes the UHCI controller properly.
 
 ## Stuck on "Less than a minute remaining..."
 
-A common area for systems to get "stuck", namely for units that are missing the `AES` CPU instruction/older mobile hardware. During this stange a lot of heavy cryptography is performed, which can make systems appear to be stuck when in reality they are working quite hard to finish up the installation. 
+A common area for systems to get "stuck", namely for units that are missing the `AES` CPU instruction/older mobile hardware. During this stage, a lot of heavy cryptography is performed, which can make systems appear to be stuck. In reality they are working quite hard to finish up the installation.
+
+Because this step can take a few hours or more depending on drive speeds, be patient at this stage and do not manually power off or reboot your machine as this will break the installation and require you to reinstall. If you think your system has stalled, press the Caps Lock key. If the light turns on, your system is busy.
+
+## No acceleration after a Metal GPU swap on Mac Pro
+
+If you finished installing Monterey with the original card installed (to see bootpicker for example) and swapped your GPU to a Metal supported one, you may notice that you're missing acceleration. To fix this, open OCLP and revert root patches to get your Metal-supported GPU work again.
+
+Alternatively, you can remove "AutoPkg-Assets.pkg" from /Library/Packages on the USB drive before proceeding with the installation. To see the folder, enable hidden files with `Command` + `Shift` + `.`
+
+The reason for this is that the autopatcher will assume that you will be using the original graphics card and therefore does non-metal patching, which includes removing some drivers for other cards. This causes Metal cards to not accelerate after swapping.
 
-Because this step can take a few hours or more depending on drive speeds, be patient at this stage and do not manually reboot your machine as this will break the installation and require you to reinstall. If you think your system has stalled, press the Caps Lock key. If the light turns on, your system is busy.

docs/UNINSTALL.md

@@ -1,13 +1,14 @@
 # Uninstalling OpenCore
 
-To remove OpenCore is actually quite simply:
+To remove OpenCore:
 
 1. Remove OpenCore either from the USB or internal drive
 
-* You'll need to mount the drive's EFI partition, and delete the `EFI/OC` and `System` folders
-  * Note **do not** delete the entire EFI folder, this will likely break any existing Windows and Linux installations
-  * [See here for an example on how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+  * You'll need to mount the drive's EFI partition, and delete the `EFI/OC` and `System` folders
+    * Note: **Do not** delete the entire EFI folder, this will likely break any existing Windows and Linux installations.
+    * [See here for an example on how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+    * For 5k iMac users, you will also need to delete `boot.efi` on the root of the EFI partition.
 
 2. [Reset NVRAM](https://support.apple.com/HT204063)
 
-Know that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the prohibited symbol. Be ready to install an older version of macOS before you uninstall OpenCore.
+Note that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the "prohibited" symbol. Be ready to install an older version of macOS before you uninstall OpenCore.

docs/UNIVERSALCONTROL.md

@@ -1,8 +1,8 @@
 # Universal Control on unsupported Macs
 
-Introduced in macOS 12 Monterey, Universal Control is a feature that allows a Mac to control other Macs and/or iPads, share input devices, and share files across them simultaneously. With OpenCore and FeatureUnlock, Universal Control can be unlocked for most unsupported Macs, so long as they meet the technical requirements.
+Introduced in macOS 12 Monterey, Universal Control is a feature that allows a Mac to control other Macs and/or iPads, share input devices, and share files across them simultaneously. With OpenCore and FeatureUnlock, Universal Control can be unlocked for most unsupported Macs, as long as they meet the technical requirements listed on this page.
 
-* Note: Following page is primarily for hobbiests, no proper support is provided outside of Discord support (see bottom of page)
+* Note: The following page is primarily for tinkerers, no proper support is provided outside of Discord support (see bottom of page).
 
 ## Enabling Universal Control
 
@@ -14,7 +14,7 @@ If you meet all the requirements, in most cases you can go to Display Preference
 | ![](../images/UC-enable-1.png) | ![OCLP GUI Build Finished](../images/UC-enable-2.png) |
 
 
-Most Macs 2011 and above should work out of the box. However, older Macs like 2008-2011 MacBook Pro's require upgrading to a newer Wi-Fi/Bluetooth card. More info in the [requirements section.](#requirements-for-universal-control)
+Most Mac models from 2011 and above should work out of the box. However, older Macs like the 2008-2011 MacBook Pros require upgrading the Wi-Fi/Bluetooth card to a newer model. More info in the [requirements section.](#requirements-for-universal-control)
 
 Some Monterey-native models are blacklisted, check the [blacklisted models section](#blacklisted-models) for more info.
 
@@ -28,33 +28,34 @@ Technical requirements:
 * iPadOS 15.4 or newer (if applicable)
 * OpenCore Legacy Patcher 0.4.3 or newer
 
-Check the [table of models](#table-of-models) below whether you need to upgrade hardware and exactly what hardware is required to be changed based on the offending Macs. Refer for help on how to upgrade the Wi-Fi card on older 2008-2011 models on the Discord channel [#hardware](https://discord.gg/rqdPgH8xSN) if required.
+Check the [table of models](#table-of-models) below to see whether you need to upgrade hardware and exactly what hardware is required to be changed based on the offending Macs listed. For help on how to upgrade the Wi-Fi card in older 2008-2011 models, refer to the Discord channel [#hardware](https://discord.gg/rqdPgH8xSN) if required.
 
 
 
 Other requirements:
 
-* All devices signed into the same iCloud account.
-* Two Factor Authentication enabled with your Apple ID.
-* Bluetooth and WiFi enabled, neither needs to be connected so long as they are enabled.
+* All devices are signed into the same iCloud account.
+* Two Factor Authentication is enabled with your Apple ID.
+* Bluetooth and WiFi are enabled. Neither needs to be connected, leaving them enabled is sufficient.
 * Handoff turned on from iCloud settings.
-* The devices in question to be in close proximity.
+* The devices in question are in close proximity.
 
 
 ### Table of models
 
-This table shows which models do and don't support Universal Control out of box (OOB) and what is required to gain support.
+This table shows which models do and do not support Universal Control out of box (OOB) and what is required to gain support.
+Note: For AirPort upgrades, only the best/newest cards are listed.
 
 ::: details MacBook
 
 |   SMBIOS   | WiFi/BT version | UC OOB  | Comment |
 |------------|-----------------|------------|---------|
-| MacBook4,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 |
-| MacBook5,1 | ^^ |  ^^ | ^^ |
-| MacBook5,2 | WiFi 4 / BT 2.1 EDR  | ^^ | ^^ |
-| MacBook6,1 | ^^ | ^^ | Upgrade to BCM94360 |
+| MacBook4,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
+| MacBook5,1 | ^^ |  ^^ | <span style="color:red"> Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
+| MacBook5,2 | WiFi 4 / BT 2.1 EDR  | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
+| MacBook6,1 | ^^ | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
 | MacBook7,1 | ^^ | ^^ | ^^ |
-| MacBook8,1 | WiFi 5 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
+| MacBook8,1 | WiFi 4 + BT 4.2 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 
 :::
 
@@ -62,8 +63,8 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB  | Comment |
 |--------|-----------------|------------|---------|
-| MacBookAir2,1 | Wi-Fi 4 / BT 2.1 EDR | <span style="color:red"> NO </span> | Replace the card with BCM94360 and disconnect/disable the BT module. |
-| MacBookAir3,1 | ^^ | ^^ | ^^ |
+| MacBookAir2,1 | Wi-Fi 4 / BT 2.1 EDR | <span style="color:red"> NO </span> | Use a Broadcom USB Bluetooth 4.0+ Dongle |
+| MacBookAir3,1 | ^^ | ^^ | Replace stock AirPort card with a BCM94360CS2 card |
 | MacBookAir3,2 | ^^ | ^^ | ^^ |
 | MacBookAir4,1 | Wi-Fi 4 +  BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | MacBookAir4,2 | ^^ | ^^ | ^^ |
@@ -81,16 +82,16 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB   | Comment |
 |--------|-----------------|-------------|---------|
-| MacBookPro4,1 | Wi-Fi 4   /   BT 2.1 EDR | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 |
-| MacBookPro5,1 | ^^ | ^^ | Upgrading to BCM94331 requires some heavy case hardware modifications, so instead use a USB BT 4.0 dongle |
+| MacBookPro4,1 | Wi-Fi 4   /   BT 2.1 EDR | <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card |
+| MacBookPro5,1 | ^^ | ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle |
 | MacBookPro5,2 | ^^ | ^^ | ^^ |
 | MacBookPro5,3 | ^^ | ^^ | ^^ |
 | MacBookPro5,4 | ^^ | ^^ | ^^ |
 | MacBookPro5,5 | ^^ | ^^ | ^^ |
 | MacBookPro6,1 | ^^ | ^^ | ^^ |
-| MacBookPro6,2 | ^^ | ^^ | ^^ |
-| MacBookPro7,1 | ^^ | ^^ | ^^ |
-| MacBookPro8,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Upgrade to BCM94331 |
+| MacBookPro6,2 | ^^ | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
+| MacBookPro7,1 | ^^ | ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle |
+| MacBookPro8,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
 | MacBookPro8,2 | ^^ | ^^ | ^^ |
 | MacBookPro9,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | MacBookPro9,2 | ^^ | ^^ | ^^ |
@@ -108,8 +109,8 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB | Comment |
 |--------|-----------------|------------|---------|
-| Macmini3,1 | Wi-Fi 4 + BT 2.1 EDR  |  <span style="color:red"> NO </span>  | Upgrade requires some heavy electrical and case modifications, so instead used a USB BT 4.0 dongle. |
-| Macmini4,1 | ^^ |  ^^ | Upgrade to BCM94360. |
+| Macmini3,1 | Wi-Fi 4 + BT 2.1 EDR  |  <span style="color:red"> NO </span>  | Upgrade requires some heavy electrical and case modifications, so instead used a Broadcom USB Bluetooth 4.0+ Dongle. |
+| Macmini4,1 | ^^ |  ^^ | ^^ |
 | Macmini5,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | Macmini5,2 | ^^ | ^^ | ^^ |
 | Macmini5,3 | ^^ | ^^ | ^^ |
@@ -117,21 +118,21 @@ This table shows which models do and don't support Universal Control out of box
 | Macmini6,2 | ^^ | ^^ | ^^ |
 | Macmini7,1 | Wi-Fi 5 + BT 4.0 | <span style="color:red"> NO </span> | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 
-::: 
+:::
 
 
 :::details iMac
 
 |  SMBIOS  | WiFi/BT version | UC OOB | Comment |
 |----------|-----------------|------------|---------|
-| iMac7,1  | Wi-Fi 4 + BT 2.0 EDR  | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 (soldering required for BT)
+| iMac7,1  | Wi-Fi 4 + BT 2.0 EDR  | <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CD card
 | iMac8,1  | ^^ | ^^ | ^^ |
 | iMac9,1  | Wi-Fi 4 / BT 2.1 EDR  | ^^ | ^^ |
 | iMac10,1 | ^^ | ^^ | ^^ |
 | iMac11,1 | ^^ | ^^ | ^^ |
 | iMac11,2 | ^^ | ^^ | ^^ |
 | iMac11,3 | ^^ | ^^ | ^^ |
-| iMac12,1 | ^^ | ^^ | ^^ |
+| iMac12,1 | ^^ | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM943602CD card
 | iMac12,2 | ^^ | ^^ | ^^ |
 | iMac13,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | iMac13,2 | ^^ | ^^ | ^^ |
@@ -144,21 +145,32 @@ This table shows which models do and don't support Universal Control out of box
 | iMac16,1 | Wi-Fi 5 + BT 4.2 | <span style="color:red"> NO </span> | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 | iMac16,2 | ^^ | ^^ | ^^ |
 
-::: 
+:::
 
 :::details Mac Pro
 
 | SMBIOS    | WiFi/BT version | UC OOB  | Comment |
 |-----------|-----------------|---------|---------|
-| MacPro3,1 | Wi-Fi 4 + BT 2.0 EDR | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360. |
-| MacPro4,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 (soldering required for BT) |
+| MacPro3,1 | Wi-Fi 4 + BT 2.0 EDR | <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE Adapter board with a BCM943602CD card |
+| MacPro4,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM943602CD card |
 | MacPro5,1 | ^^ | ^^ | ^^ |
 | MacPro6,1 | Wi-Fi 5 + BT 4.0 | ^^ | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 
 * Note: Some older Mac Pro configurations may not have shipped with a WiFi card in the base model
 
 
-::: 
+:::
+
+
+:::details Xserve ;p
+
+| SMBIOS    | WiFi/BT version | UC OOB  | Comment |
+|-----------|-----------------|---------|---------|
+| Xserve2,1 | N/A | <span style="color:red"> NO </span> | Install a PCIe BCM943602CD card |
+| Xserve3,1 | ^^ | ^^ | ^^ |
+
+:::
+
 ## Blacklisted models
 
 The following models are blacklisted from using Universal Control by Apple:
@@ -171,9 +183,9 @@ The following models are blacklisted from using Universal Control by Apple:
 - Macmini7,x - Mac mini 2014
 - MacPro6,x - Mac Pro Late 2013
 
-The hardware in these models is capable but due to blacklisting, the only solution to use Universal Control on the models above is to spoof their SMBIOS. SMBIOS spoofing essentially fools some aspects of macOS to think they are running on a different machine. 
+The hardware in these models are capable of supporting Universal Control, but due to blacklisting, the only solution to use Universal Control on these models is to spoof their SMBIOS. SMBIOS spoofing essentially fools some aspects of macOS to think they are running on a different machine. 
 
-With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMBIOS and thus grants a blacklisted Mac to connect to other iPads and Macs with Universal Control.
+With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMBIOS and thus grants a blacklisted Mac to connect to other Macs and iPads with Universal Control.
 
 | Situation | Condition | Solution |
 |-----------|-----------|---------|
@@ -184,7 +196,7 @@ With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMB
 
 :::warning
 
-Before we continue, please keep in mind SMBIOS Spoofing is an advanced feature of OpenCore, that with reckless usage of it, could potentially screw things around and leave your installation non-working. Once you boot into a spoofed state, it is highly recommended you stay spoofed, and avoid booting macOS without OpenCore.
+Before we continue, please keep in mind that SMBIOS Spoofing is an advanced feature of OpenCore. Reckless usage of it could potentially break important functionality and leave your installation in a non-working state. Once you boot into a spoofed state, it is highly recommended that you stay spoofed, and avoid booting macOS without OpenCore.
 
 :::
 
@@ -192,9 +204,9 @@ Before we continue, please keep in mind SMBIOS Spoofing is an advanced feature o
 
 Firstly, run the GUI version of OpenCore Legacy Patcher, go to **Settings** and tick **Allow native models**.
 
-**Note:** Unless you are building OpenCore on a different machine than it's targeted for, **do not** change the model in this main settings view. It is important to understand that OCLP targets this model regardless of what you may have spoofed to, as your Mac is still what the Native SMBIOS shows.
+**Note:** Unless you are building OpenCore on a different machine than it's targeted for, **do not** change the model in the main settings view. It is important to understand that OCLP targets this model regardless of what you may have spoofed to, as your Mac is still what the Native SMBIOS shows.
 
-Secondly, go to **SMBIOS Settings**, tick **Allow Native Spoofs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one next to your native model in the table for spoofed models below.**
+Secondly, go to **SMBIOS Settings**, tick **Allow Native Spoofs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one listed next to your native model in the table for spoofed models below.**
 
 
 ::: details Table for spoofed models (click to expand)
@@ -208,8 +220,8 @@ Any model after the list of officially blacklisted Macs should be supported, but
 |-------------|---------------|--------------|--------|-----------|
 | MacBook Air Early 2015 11" / 13" | MacBookAir7,x | MacBookAir8,1 | <span style="color:#30BCD5"> YES </span> | Hzlph |
 | MacBook Pro Early 2015 13" | MacBookPro12,x | MacBookPro13,1 | ^^ | ^^ |
-| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro13,3 | ^^ | ^^ 
-| iMac Late 2015 21" | iMac16,x | iMac18,2 | ^^ | ^^ 
+| MacBook Pro Mid 2015 15" | MacBookPro11,4 / 11,5 | MacBookPro13,3 | ^^ | ^^
+| iMac Late 2015 21" | iMac16,x | iMac18,2 | ^^ | ^^
 | Mac mini Late 2014  | Macmini7,x | MacMini8,1 | <span style="color:red"> NO </span> | N/A |
 | Mac Pro Late 2013 | MacPro6,x | MacPro7,1 | <span style="color:#30BCD5"> YES </span> | Crystall1nedev |
 
@@ -220,8 +232,8 @@ Any model after the list of officially blacklisted Macs should be supported, but
 | ![](../images/OCLP-allow-native-models.png) | ![](../images/OCLP-smbios-settings.png) |
 
 
-Build and install OpenCore again, reboot back to the OS. Enable Universal Control as explained in [Enabling Universal Control section.](#enabling-universal-control)
+Build and install OpenCore again, and reboot back to the OS. Enable Universal Control as explained in the [Enabling Universal Control section.](#enabling-universal-control)
 
 
 
-You should now be prompted to log back into iCloud by your Mac. This means you were successful, otherwise, verify you are correctly following the steps listed above, or else ask on the Discord group for assistance on [#misc-help](https://discord.gg/rqdPgH8xSN).
+You should now be prompted to log back into iCloud by your Mac. If you get this prompt, you have successfully configured SMBIOS spoofing. Otherwise, verify that you have correctly followed the steps listed above, or ask on the Discord server for further assistance in [#misc-help](https://discord.gg/rqdPgH8xSN).

docs/UPDATE.md

@@ -1,14 +1,14 @@
 # Updating OpenCore and Patches
 
-With OpenCore Legacy Patcher, generally there's very little reason for users to update the OpenCore installed on their machine unless you feel there's a benefit with new versions for your setup, e.g. Bluetooth has stopped working with a new macOS update. 
+With OpenCore Legacy Patcher, there's generally very little reason for users to update the OpenCore installation on their machine unless you feel there's a benefit with new versions for your setup, e.g. Bluetooth has stopped working with a new macOS update. 
 
-For those who do wish to update, it's actually quite easy. Simply [download the latest release](https://github.com/dortania/OpenCore-Legacy-Patcher/releases) and rerun the patcher:
+For those who do wish to update, simply [download the latest release](https://github.com/dortania/OpenCore-Legacy-Patcher/releases) and rerun the patcher:
 
 ![](../images/OCLP-GUI-Main-Menu.png)
 
-Then simply rebuild your OpenCore build and install again. Then voila, OpenCore is updated!
+Then, rebuild your OpenCore build and install again. OpenCore Will now be updated!
 
-To check what version of OpenCore and Patcher version you're currently running, you can run the following in terminal:
+To check what version of OpenCore and the Patcher you're currently running, you can run the following in the terminal:
 
 ```bash
 # OpenCore Version
@@ -19,4 +19,4 @@ nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:OCLP-Version
 
 ![](../images/oclp-version.png)
 
-From this, we can see we're running a RELEASE version of OpenCore 0.6.8 built on March 27th, 2021 with Patcher Version 0.0.20!
+From this, we can see that we're running a RELEASE version of OpenCore 0.6.8 built on March 27th, 2021 with Patcher Version 0.0.20!

docs/WINDOWS.md

@@ -2,18 +2,18 @@
 
 * Guide based off of [cdf's Mac Pro Thread](https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/)
 
-To install UEFI is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going a bit more step by step in the process including partitioning and such.
+To install a UEFI copy of Windows is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going step by step in the process, including partitioning and such.
 
-* Note: UEFI Windows is generally quite usable for Arrendale and newer models, however machines with Penryn CPUs may experience issues
+* Note: UEFI Windows is generally quite usable for Arrandale and newer models, however machines with Penryn CPUs may experience issues
 * Recommended Models:
   * MacBookAir4,x - 5,x
   * MacBookPro8,x - 10,x
   * Macmini5,x - 6,x
   * iMac11,x - 13,x
 
-Once you know your model is supported, you're good to go with the rest of this guide
+Once you know if your model is supported, you're good to go with the rest of this guide.
 
-* Newer models than listed here will already natively support UEFI Windows through Boot Camp
+* Newer models than listed here will already natively support UEFI Windows through Boot Camp.
 
 For MacPro4,1/5,1 and Xserve3,1 users, please be aware that Windows has troubles with automatic installation, so please refer to cdf's guide on manual installation:
 
@@ -24,19 +24,19 @@ For MacPro4,1/5,1 and Xserve3,1 users, please be aware that Windows has troubles
 To start off, we'll need the following:
 
 * An 8GB USB drive for the Windows Installer
-* Minimum of 30GB of free space on whatever drive you want to install Windows too
+* A minimum of 30GB of free space on whichever drive you want to install Windows to
 
-First, lets format out drives as follows:
+First, let's format our drives with the following steps:
 
 ### USB Drive Formatting
 
-Open Disk Utility in macOS and format the USB Drive as ExFat with MBR Scheme:
+Open Disk Utility in macOS and format the USB Drive as ExFat with the Master Boot Record scheme:
 
 ![](../images/windows-mbr-format.png)
 
 ### Disk Formatting
 
-Next, grab the drive you wish to install Windows on and partition it as ExFat (If formatting entire drive, ensure it's GUID Partition Table):
+Next, grab the drive you wish to install Windows on and partition it as ExFat (If formatting the entire drive, ensure it's using the GUID Partition Table scheme):
 
 ![](../images/windows-partition-1.png)
 
@@ -44,8 +44,8 @@ If you plan to use the same hard drive for macOS and Windows, we recommend creat
 
 Recommended size is 200MB and the partition format **must** be FAT32 for OpenCore to operate correctly. You will next want to install OpenCore onto the new partition, either moving from the ESP with [MountEFI](https://github.com/corpnewt/MountEFI) or rerunning the OpenCore-Patcher.app
 
-* Note: For machines with dedicated drives for Windows, having different partitions for OpenCore is not required
-* Note 2: We recommend uninstalling OpenCore from the ESP/EFI Partition when you create this new OpenCore partition to avoid confusion when selecting OpenCore builds in the Mac's boot picker
+* Note 1: For machines with dedicated drives for Windows, having different partitions for OpenCore is not required.
+* Note 2: We recommend uninstalling OpenCore from the ESP/EFI Partition when you create this new OpenCore partition to avoid confusion when selecting OpenCore builds in the Mac's boot picker.
 
 ![](../images/windows-partition-2.png)
 
@@ -59,7 +59,7 @@ Next, mount the Windows 10 ISO:
 
 ![](../images/windows-iso.png)
 
-The open terminal and run `rsync` on the USB drive (replace CCCOMA_X64 with the mounted ISO's name, as well as replacing W10USB with your USB drive's name):
+Then open terminal and run `rsync` on the USB drive (replace CCCOMA_X64 with the mounted ISO's name, as well as replacing W10USB with your USB drive's name):
 
 ```
 rsync -r -P /Volumes/CCCOMA_X64/ /Volumes/W10USB
@@ -75,7 +75,7 @@ rsync -vha -P --exclude=sources/install.wim /Volumes/CCCOMA_X64/ /Volumes/W10USB
 
 # Use wimlib to split the install.wim file into a size that fits
 wimlib-imagex split /Volumes/CCCOMA_X64/sources/install.wim /Volumes/W10USB/sources/install.swm 4000
-``` 
+```
 
 Once that's completed, you can continue.
 :::
@@ -84,17 +84,17 @@ Once that's completed, you can continue.
 
 Command will take some time, so sit back and get some coffee. Once finished, the root of the USB drive should look as follows:
 
-* Ensure that these folders and files are on the root, otherwise the USB will not boot
+* Ensure that these folders and files are in the root of the USB drive, otherwise the USB will not boot.
 
 ![](../images/windows-rsync-done.png)
 
 Once done, lets reboot into OpenCore's Menu and you'll see a new Windows' entry:
 
-* Note: Do not boot the installer outside of OpenCore as this will default back to the old MBR BIOS setup. Booting through OpenCore ensures Windows uses UEFI
+* Note: Do not boot the installer outside of OpenCore as this will default back to the old MBR BIOS setup. Booting through OpenCore ensures Windows uses UEFI.
 
 ![](../images/oc-windows.png)
 
-From there, install Windows as normal and you'll get a new BootCamp entry in OpenCore's picker when done! Don't forget to run BootCamp's utilities installer as well to ensure Wifi and such are functioning correctly. This can be downloaded from the BootCamp Assistant app in macOS, or with [brigadier](https://github.com/timsutton/brigadier) in Windows.
+From there, install Windows as normal and you'll get a new BootCamp entry in OpenCore's picker when done! Don't forget to run BootCamp's utilities installer as well to ensure Wi-Fi and other important features are functioning correctly. This can be downloaded from the BootCamp Assistant app in macOS, or with [brigadier](https://github.com/timsutton/brigadier) in Windows.
 
 ![](../images/oc-windows-done.png)
 
@@ -124,4 +124,4 @@ You can also open `Properties` on the file to change the compatibility to `Previ
 
 ### iMac12,x Bluescreen after driver installation
 
-Currently Intel's iGPU drivers for the HD 3000 series do not support UEFI booting in Windows. The recommended solution is to simply disable: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)
+Currently Intel's iGPU drivers for the HD 3000 series do not support UEFI booting in Windows. The recommended solution is to simply disable the iGPU: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)

docs/scripts/linkcheck.py

@@ -2,8 +2,8 @@ from pathlib import Path
 import subprocess
 
 for i in [i for i in list(Path().resolve().glob("**/*.md")) if "node_modules" not in str(i.parent) and "_book" not in str(i.parent)]:
-    #bert = subprocess.run(['npx', 'markdown-link-check', '"' + str(i) + '"', '-c', '.markdownlinkcheck.json'], capture_output=True, shell=True, cwd=Path().resolve())    
+    #bert = subprocess.run(['npx', 'markdown-link-check', '"' + str(i) + '"', '-c', '.markdownlinkcheck.json'], capture_output=True, shell=True, cwd=Path().resolve())
     bert = subprocess.run('npx markdown-link-check "' + str(i) + '"', stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=Path().resolve())
-    outpot = bert.stdout.decode().replace("\r", "").split("\n")
-    outpot = [i for i in outpot if ("FILE: " in i or " → Status: " in i) and " → Status: 429" not in i]
-    [print(i) for i in outpot]
+    output = bert.stdout.decode().replace("\r", "").split("\n")
+    output = [i for i in output if ("FILE: " in i or " → Status: " in i) and " → Status: 429" not in i]
+    [print(i) for i in output]

gui/gui_main.py

@@ -31,6 +31,7 @@ class wx_python_gui:
         self.finished_cim_process = False
         self.target_disk = ""
         self.pulse_forward = False
+        self.prepare_result = False
         self.non_metal_required = self.use_non_metal_alternative()
         self.hyperlink_colour = (25, 179, 231)
 
@@ -140,7 +141,7 @@ class wx_python_gui:
                 self.popup = wx.MessageDialog(
                     self.frame,
                     f"During unpacking of our internal files, we seemed to have encountered an error.\n\nIf you keep seeing this error, please try rebooting and redownloading the application.",
-                    "Internal Error occured!",
+                    "Internal Error occurred!",
                     style = wx.OK | wx.ICON_EXCLAMATION
                 )
                 self.popup.ShowModal()
@@ -198,10 +199,10 @@ class wx_python_gui:
                         style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
                     )
                     self.dialog.SetYesNoCancelLabels("View on Github", "Always Ignore", "Ignore Once")
-                    responce = self.dialog.ShowModal()
-                    if responce == wx.ID_YES:
+                    response = self.dialog.ShowModal()
+                    if response == wx.ID_YES:
                         webbrowser.open(github_link)
-                    elif responce == wx.ID_NO:
+                    elif response == wx.ID_NO:
                         print("- Setting IgnoreAppUpdates to True")
                         self.constants.ignore_updates = True
                         global_settings.global_settings().write_property("IgnoreAppUpdates", True)
@@ -231,10 +232,13 @@ class wx_python_gui:
             extension = ""
             if event:
                 if event.GetEventObject() != wx.Menu:
-                    if event.GetEventObject().GetLabel() == "Start Root Patching":
-                        extension = " --gui_patch"
-                    elif event.GetEventObject().GetLabel() == "Revert Root Patches":
-                        extension = " --gui_unpatch"
+                    try:
+                        if event.GetEventObject().GetLabel() == "Start Root Patching":
+                            extension = " --gui_patch"
+                        elif event.GetEventObject().GetLabel() == "Revert Root Patches":
+                            extension = " --gui_unpatch"
+                    except TypeError:
+                        pass
 
             if self.constants.launcher_script is None:
                 args_string = f"'{self.constants.launcher_binary}'{extension}"
@@ -1100,7 +1104,7 @@ class wx_python_gui:
             # Create popup window to inform user of error
             self.popup = wx.MessageDialog(
                 self.frame_modal,
-                "A problem occured trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch",
+                "A problem occurred trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch",
                 "Network Error",
                 wx.YES_NO | wx.ICON_ERROR
             )
@@ -1176,11 +1180,11 @@ class wx_python_gui:
         try:
             sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_patch()
         except Exception as e:
-            self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}")
+            self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
             pass
         sys.stdout = self.stock_stdout
         sys.stderr = self.stock_stderr
-        if self.constants.root_patcher_succeded is True:
+        if self.constants.root_patcher_succeeded is True:
             print("- Root Patcher finished successfully")
             if self.constants.needs_to_open_preferences is True:
                 # Create dialog box to open System Preferences -> Security and Privacy
@@ -1286,11 +1290,11 @@ class wx_python_gui:
         try:
             sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_unpatch()
         except Exception as e:
-            self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}")
+            self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
             pass
         sys.stdout = self.stock_stdout
         sys.stderr = self.stock_stderr
-        if self.constants.root_patcher_succeded is True:
+        if self.constants.root_patcher_succeeded is True:
             print("- Root Patcher finished successfully")
             self.reboot_system(message="Root Patcher finished successfully\nWould you like to reboot now?")
         self.return_to_main_menu.Enable()
@@ -1491,6 +1495,18 @@ class wx_python_gui:
         self.grab_installer_data(ias=ias)
 
     def download_macos_click(self, app_dict):
+
+        try:
+            app_major = app_dict['Version'].split(".")[0]
+            if float(app_major) > self.constants.os_support:
+                # Throw pop up warning OCLP does not support this OS
+                os =  os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(app_major))
+                dlg = wx.MessageDialog(self.frame_modal, f"OpenCore Legacy patcher currently does not support macOS {os}. We highly recommend you select an older installer.\n\nThe newest version we officially support is macOS {os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(str(self.constants.os_support)))}\n\nWould you still want to continue downloading macOS {os}?", "Unsupported OS", wx.YES_NO | wx.ICON_WARNING)
+                if dlg.ShowModal() == wx.ID_NO:
+                    return
+        except ValueError:
+            pass
+
         self.frame.DestroyChildren()
         installer_name = f"macOS {app_dict['Version']} ({app_dict['Build']})"
 
@@ -1586,7 +1602,7 @@ class wx_python_gui:
         wx.App.Get().Yield()
         integrity_path = Path(Path(self.constants.payload_path) / Path(apple_integrity_file_link.split("/")[-1]))
         if utilities.download_file(apple_integrity_file_link, integrity_path, verify_checksum=False):
-            # If we're unable to download the integrity file immediately after downloading the IA, there's a legitmate issue
+            # If we're unable to download the integrity file immediately after downloading the IA, there's a legitimate issue
             # on Apple's end.
             # Fail gracefully and just head to installing the IA.
             utilities.disable_sleep_while_running()
@@ -1734,12 +1750,12 @@ class wx_python_gui:
         self.usb_selection_label.Centre(wx.HORIZONTAL)
 
         i = -15
-        availible_disks = installer.list_disk_to_format()
-        if availible_disks:
+        available_disks = installer.list_disk_to_format()
+        if available_disks:
             print("Disks found")
-            for disk in availible_disks:
-                print(f"{disk}: {availible_disks[disk]['name']} - {availible_disks[disk]['size']}")
-                self.usb_selection = wx.Button(self.frame, label=f"{disk} - {availible_disks[disk]['name']} - {utilities.human_fmt(availible_disks[disk]['size'])}", size=(300, 30))
+            for disk in available_disks:
+                print(f"{disk}: {available_disks[disk]['name']} - {available_disks[disk]['size']}")
+                self.usb_selection = wx.Button(self.frame, label=f"{disk} - {available_disks[disk]['name']} - {utilities.human_fmt(available_disks[disk]['size'])}", size=(300, 30))
                 i = i + 25
                 self.usb_selection.SetPosition(
                     wx.Point(
@@ -1747,7 +1763,7 @@ class wx_python_gui:
                         self.usb_selection_label.GetPosition().y + self.usb_selection_label.GetSize().height + i
                     )
                 )
-                self.usb_selection.Bind(wx.EVT_BUTTON, lambda event, temp=disk: self.format_usb_progress(availible_disks[temp]['identifier'], installer_name, installer_path))
+                self.usb_selection.Bind(wx.EVT_BUTTON, lambda event, temp=disk: self.format_usb_progress(available_disks[temp]['identifier'], installer_name, installer_path))
                 self.usb_selection.Centre(wx.HORIZONTAL)
         else:
             print("No disks found")
@@ -1829,9 +1845,8 @@ class wx_python_gui:
             20
         )
         self.progress_bar.Centre(wx.HORIZONTAL)
-        self.progress_bar.SetValue(0)
 
-        self.progress_label = wx.StaticText(self.frame, label="Bytes Written: 0")
+        self.progress_label = wx.StaticText(self.frame, label="Preparing files, beginning shortly...")
         self.progress_label.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL))
         self.progress_label.SetPosition(
             wx.Point(
@@ -1860,8 +1875,19 @@ class wx_python_gui:
         print("- Creating installer.sh script")
         print(f"- Disk: {disk}")
         print(f"- Installer: {installer_path}")
-        if installer.generate_installer_creation_script(self.constants.installer_sh_path, installer_path, disk):
-            print("- Sucessfully generated creation script")
+
+        self.prepare_script_thread = threading.Thread(target=self.prepare_script, args=(installer_path,disk))
+        self.prepare_script_thread.start()
+        self.progress_bar.Pulse()
+
+        while self.prepare_script_thread.is_alive():
+            self.pulse_alternative(self.progress_bar)
+            wx.GetApp().Yield()
+
+        if self.prepare_result is True:
+            self.progress_label.SetLabel("Bytes Written: 0")
+            self.progress_label.Centre(wx.HORIZONTAL)
+            print("- Successfully generated creation script")
             print("- Starting creation script as admin")
             wx.GetApp().Yield()
             time.sleep(1)
@@ -1872,6 +1898,7 @@ class wx_python_gui:
             self.download_thread = threading.Thread(target=self.download_and_unzip_pkg)
             self.download_thread.start()
             default_output = float(utilities.monitor_disk_output(disk))
+            self.progress_bar.SetValue(0)
             while True:
                 time.sleep(0.1)
                 output = float(utilities.monitor_disk_output(disk))
@@ -1899,30 +1926,37 @@ class wx_python_gui:
                         self.constants.host_is_hackintosh is True
                     )
                 ):
-                    popup_message = wx.MessageDialog(self.frame, "Sucessfully created a macOS installer!", "Success", wx.OK)
+                    popup_message = wx.MessageDialog(self.frame, "Successfully created a macOS installer!", "Success", wx.OK)
                     popup_message.ShowModal()
                 else:
                     self.dialog = wx.MessageDialog(
                         parent=self.frame,
                         message="Would you like to continue and Install OpenCore to this disk?",
-                        caption="Sucessfully created the macOS installer!",
+                        caption="Successfully created the macOS installer!",
                         style=wx.YES_NO | wx.ICON_QUESTION
                     )
                     self.dialog.SetYesNoLabels("Install OpenCore to disk", "Skip")
-                    responce = self.dialog.ShowModal()
-                    if responce == wx.ID_YES:
+                    response = self.dialog.ShowModal()
+                    if response == wx.ID_YES:
                         self.constants.start_build_install = True
                         self.build_install_menu()
         else:
             print("- Failed to create installer script")
+            self.progress_label.SetLabel("Failed to copy files to tmp directory")
+            self.progress_label.Centre(wx.HORIZONTAL)
+            popup_message = wx.MessageDialog(self.frame, "Failed to prepare the base files for installer creation.\n\nPlease ensure you have 20GB~ free on-disk before starting to ensure the installer has enough room to work.", "Error", wx.OK)
+            popup_message.ShowModal()
         self.return_to_main_menu.Enable()
 
+    def prepare_script(self, installer_path, disk):
+        self.prepare_result = installer.generate_installer_creation_script(self.constants.payload_path, installer_path, disk)
+
     def start_script(self):
         utilities.disable_sleep_while_running()
         args = [self.constants.oclp_helper_path, "/bin/sh", self.constants.installer_sh_path]
         output, error, returncode = run.Run()._stream_output(comm=args)
         if "Install media now available at" in output:
-            print("- Sucessfully created macOS installer")
+            print("- Successfully created macOS installer")
             while self.download_thread.is_alive():
                 # wait for download_thread to finish
                 # though highly unlikely this thread is still alive (flashing an Installer will take a while)
@@ -1982,7 +2016,7 @@ class wx_python_gui:
         # Define Menu
         # - Header: Settings
         # - Dropdown: Model
-        # - Chechboxes:
+        # - Checkboxes:
         #   - Verbose
         #   - Kext Debug
         #   - OpenCore Debug
@@ -2172,6 +2206,21 @@ class wx_python_gui:
 
     def allow_native_models_click(self, event=None):
         if self.checkbox_allow_native_models.GetValue():
+            # Throw a prompt warning about this
+            dlg = wx.MessageDialog(self.frame_modal, "This option should only be used if your Mac natively supports the OSes you wish to run.\n\nIf you are currently running an unsupported OS, this option will break booting. Only toggle for enabling OS features on a native Mac.\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+            if dlg.ShowModal() == wx.ID_NO:
+                self.checkbox_allow_native_models.SetValue(False)
+                return
+            # If the system is running an unsupported OS, throw a second warning
+            if self.constants.computer.real_model in smbios_data.smbios_dictionary:
+                if self.constants.detected_os > smbios_data.smbios_dictionary[self.constants.computer.real_model]["Max OS Supported"]:
+                    chassis_type = "aluminum"
+                    if self.constants.computer.real_model in ["MacBook4,1", "MacBook5,2", "MacBook6,1", "MacBook7,1"]:
+                        chassis_type = "plastic"
+                    dlg = wx.MessageDialog(self.frame_modal, f"This model, {self.constants.computer.real_model}, does not natively support macOS {os_data.os_conversion.kernel_to_os(self.constants.detected_os)}, {os_data.os_conversion.convert_kernel_to_marketing_name(self.constants.detected_os)}. The last native OS was macOS {os_data.os_conversion.kernel_to_os(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}, {os_data.os_conversion.convert_kernel_to_marketing_name(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}\n\nToggling this option will breaking booting on this OS. Are you absolutely certain this is desired?\n\nYou may end up with a nice {chassis_type} brick 🧱", "Are you certain?", wx.YES_NO | wx.ICON_WARNING)
+                    if dlg.ShowModal() == wx.ID_NO:
+                        self.checkbox_allow_native_models.SetValue(False)
+                        return
             print("Allow Native Models")
             self.constants.allow_oc_everywhere = True
             self.constants.serial_settings = "None"
@@ -2326,7 +2375,7 @@ class wx_python_gui:
         self.disable_battery_throttling_checkbox.SetPosition(wx.Point(
             self.hibernation_checkbox.GetPosition().x,
             self.hibernation_checkbox.GetPosition().y + self.hibernation_checkbox.GetSize().height))
-        self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrendale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display"))
+        self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrandale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display"))
 
         # Disable XCPM
         self.disable_xcpm_checkbox = wx.CheckBox(self.frame_modal, label="Disable XCPM")
@@ -2660,6 +2709,8 @@ class wx_python_gui:
         self.smbios_model_dropdown.SetStringSelection(self.constants.override_smbios)
         self.smbios_model_dropdown.Bind(wx.EVT_CHOICE, self.smbios_model_click)
         self.smbios_model_dropdown.Center(wx.HORIZONTAL)
+        if self.smbios_dropdown.GetStringSelection() == "None":
+            self.smbios_model_dropdown.Disable()
 
         # Label: Custom Serial Number
         self.smbios_serial_label = wx.StaticText(self.frame_modal, label="Custom Serial Number")
@@ -2742,6 +2793,10 @@ class wx_python_gui:
         self.constants.custom_board_serial_number = self.smbios_board_serial_textbox.GetValue()
 
     def generate_new_serials_clicked(self, event):
+        # Throw pop up warning about misusing this feature
+        dlg = wx.MessageDialog(self.frame_modal, "Please take caution when using serial spoofing. This should only be used on machines that were legally obtained and require reserialization.\n\nNote: new serials are only overlayed through OpenCore and are not permanently installed into ROM.\n\nMisuse of this setting can break power management and other aspects of the OS if the system does not need spoofing\n\nDortania does not condone the use of our software on stolen devices.\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+        if dlg.ShowModal() == wx.ID_NO:
+            return
         macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.constants.custom_model or self.computer.real_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         macserial_output = macserial_output.stdout.decode().strip().split(" | ")
         if len(macserial_output) == 2:
@@ -2760,9 +2815,19 @@ class wx_python_gui:
             self.constants.allow_native_spoofs = False
 
     def smbios_spoof_level_click(self, event=None):
+        # Throw pop up warning about misusing this feature
         selection = self.smbios_dropdown.GetStringSelection()
+        if selection != "None":
+            dlg = wx.MessageDialog(self.frame_modal, "This option should only be used when you need to change the machine's SMBIOS data.\n\nMisuse of this option can break OS functionality. Only use if you absolutely understand the need for this setting\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+            if dlg.ShowModal() == wx.ID_NO:
+                self.smbios_dropdown.SetStringSelection(self.constants.serial_settings)
+                return
         print(f"SMBIOS Spoof Level: {selection}")
         self.constants.serial_settings = selection
+        if selection == "None":
+            self.smbios_model_dropdown.Disable()
+        else:
+            self.smbios_model_dropdown.Enable()
 
     def smbios_model_click(self, event=None):
         selection = self.smbios_model_dropdown.GetStringSelection()
@@ -2908,9 +2973,9 @@ class wx_python_gui:
         self.configure_sip_title.SetFont(wx.Font(18, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
         self.configure_sip_title.Center(wx.HORIZONTAL)
 
-        # Label: Flip indivdual bits corresponding to XNU's csr.h
+        # Label: Flip individual bits corresponding to XNU's csr.h
         # If you're unfamiliar with how SIP works, do not touch this menu
-        self.sip_label = wx.StaticText(self.frame_modal, label="Flip indivdual bits corresponding to")
+        self.sip_label = wx.StaticText(self.frame_modal, label="Flip individual bits corresponding to")
         self.sip_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.sip_label.SetPosition(
             wx.Point(-1, self.configure_sip_title.GetPosition().y + self.configure_sip_title.GetSize().height + 10)
@@ -3054,7 +3119,7 @@ OpenCore Legacy Patcher by default knows the most ideal
         self.subheader_2.SetSize(wx.Size(self.frame_modal.GetSize().width, 30))
         self.subheader_2.Centre(wx.HORIZONTAL)
 
-        # Label: Set FeatreUnlock status
+        # Label: Set FeatureUnlock status
         self.feature_unlock_label = wx.StaticText(self.frame_modal, label="Feature Unlock Status:", style=wx.ALIGN_CENTRE)
         self.feature_unlock_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.feature_unlock_label.SetPosition(wx.Point(0, self.subheader_2.GetPosition().y + self.subheader_2.GetSize().height -5))

payloads/ACPI/Source/SSDT-CPBG.dsl

@@ -1,9 +1,9 @@
-/* Disable the non-existant Co-processor Bridge found on Arrendale, Lynnfield and Clarkdale Macs.
+/* Disable the non-existent Co-processor Bridge found on Arrandale, Lynnfield and Clarkdale Macs.
  * IOPCIFamily in macOS 11.0 up-to 11.2 was unable to handle ACPI probing when device was not present,
- * therefore kernel panicing the machine.
+ * therefore kernel panicking the machine.
  *
  * This SSDT reports the device as disabled avoiding the probing.
- * Not required for macOS 11.2 and newer, however recommended to alliviate pottential issues
+ * Not required for macOS 11.2 and newer, however recommended to alleviate potential issues
  */
 DefinitionBlock ("", "SSDT", 2, "DRTNIA", "CPBGoff", 0x00001000)
 {

payloads/ACPI/Source/SSDT-DGPU.dsl

@@ -4,15 +4,15 @@
  * hardware modifications.
  *
  * Notes:
- *       - SSDT must be used in conjuction with '_INI' to 'XINI' patch
+ *       - SSDT must be used in conjunction with '_INI' to 'XINI' patch
  *         to reroute PCI0 initialization.
- * 
+ *
  *       - AMD drivers in macOS may still attempt to attach and kernel
  *         panic. Disable the dGPU with class-code/device-id spoof or
  *         with '-wegnoegpu'.
  *
  *       - dGPU will reactivate with sleep-wake, additional process
- *         is needed to disable the dGPU. 
+ *         is needed to disable the dGPU.
  *         - ie. AMDGPUWakeHandler.kext for macOS
  *
  * Ref:
@@ -30,13 +30,13 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "dGPU_OFF", 0x00001000)
         OperationRegion (IOGP, SystemIO, 0x0700, 0x51)
         Field (IOGP, ByteAcc, NoLock, Preserve)
         {
-            Offset (0x10), 
-            P710,   8, 
-            Offset (0x28), 
-            P728,   8, 
-            Offset (0x40), 
-            P740,   8, 
-            Offset (0x50), 
+            Offset (0x10),
+            P710,   8,
+            Offset (0x28),
+            P728,   8,
+            Offset (0x40),
+            P740,   8,
+            Offset (0x50),
             P750,   8
         }
 
@@ -90,7 +90,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "dGPU_OFF", 0x00001000)
                     Store (0x07D9, OSYS)
                 }
             }
-            
+
             // Disables dGPU
             Store ("Requesting dGPU power off", Debug)
             P728 = One  // Switch select

payloads/ACPI/Source/SSDT-PCI.dsl

@@ -1,6 +1,6 @@
 /* Removes PCI0's 32-bit Allocation Limitation to resolve PCIe device support on Sandy and
  * Ivy Bridge Macs, mainly applicable for Audio and eGPU support.
- * BUF0 to BUF1 patch required to override exisiting BuffObj in DSDT.
+ * BUF0 to BUF1 patch required to override existing BuffObj in DSDT.
  *
  * Source:
  * https://egpu.io/forums/pc-setup/fix-dsdt-override-to-correct-error-12/

payloads/Config/config.plist

@@ -19,7 +19,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>Comment</key>
-				<string>Patch CPBG for Arrendale, Lynnfield and Clarkdale</string>
+				<string>Patch CPBG for Arrandale, Lynnfield and Clarkdale</string>
 				<key>Path</key>
 				<string>SSDT-CPBG.aml</string>
 			</dict>

payloads/OpenCore/clean.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Simple script to delete unnessary files from OpenCore and move into place
+# Simple script to delete unnecessary files from OpenCore and move into place
 # To use, simply :
 # - Download an OpenCore build
 # - Place the X64 folder in the /payloads/OpenCore folder

resources/build.py

@@ -1019,7 +1019,7 @@ class BuildOpenCore:
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -revasset"
         if self.get_kext_by_bundle_path("RestrictEvents.kext")["Enabled"] is False:
             # Ensure this is done at the end so all previous RestrictEvents patches are applied
-            # RestrictEvents and EFICheckDisabler will confilict if both are injected
+            # RestrictEvents and EFICheckDisabler will conflict if both are injected
             self.enable_kext("EFICheckDisabler.kext", self.constants.restrictevents_version, self.constants.efi_disabler_path)
         if self.constants.set_vmm_cpuid is True:
             # Should be unneeded with our sysctl VMM patch, however for reference purposes we'll leave it here
@@ -1161,8 +1161,8 @@ class BuildOpenCore:
             minimal_serial_patch(self)
         else:
             # Update DataHub to resolve Lilu Race Condition
-            # macOS Monterey will somtimes not present the boardIdentifier in the DeviceTree on UEFI 1.2 or older Mac,
-            # Thus resulting in an infitinte loop as Lilu tries to request the Board ID
+            # macOS Monterey will sometimes not present the boardIdentifier in the DeviceTree on UEFI 1.2 or older Mac,
+            # Thus resulting in an infinite loop as Lilu tries to request the Board ID
             # To resolve this, set PlatformInfo -> DataHub -> BoardProduct and enable UpdateDataHub
 
             # Note 1: Only apply if system is UEFI 1.2, this is generally Ivy Bridge and older, excluding MacPro6,1
@@ -1181,6 +1181,8 @@ class BuildOpenCore:
                 self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
                 self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = self.constants.custom_serial_number
                 self.config["PlatformInfo"]["Generic"]["MLB"] = self.constants.custom_board_serial_number
+                self.config["PlatformInfo"]["Generic"]["MaxBIOSVersion"] = False
+                self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
                 self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Spoofed-SN"] = self.constants.custom_serial_number
                 self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Spoofed-MLB"] = self.constants.custom_board_serial_number
 
@@ -1337,7 +1339,7 @@ class BuildOpenCore:
     def sign_files(self):
         if self.constants.vault is True:
             if utilities.check_command_line_tools() is True:
-                # sign.command checks for the existance of '/usr/bin/strings' however does not verify whether it's executable
+                # sign.command checks for the existence of '/usr/bin/strings' however does not verify whether it's executable
                 # sign.command will continue to run and create an unbootable OpenCore.efi due to the missing strings binary
                 # macOS has dummy binaries that just reroute to the actual binaries after you install Xcode's Command Line Tools
                 print("- Vaulting EFI")

resources/cli_menu.py

@@ -171,7 +171,7 @@ Note: For security reasons, OpenShell will be disabled when Vault is set.
         utilities.cls()
         utilities.header(["Set System Integrity protection"])
         print(
-            f"""SIP is used to ensure proper secuirty measures are set,
+            f"""SIP is used to ensure proper security measures are set,
 however to patch the root volume this must be lowered partially.
 Only disable is absolutely necessary. SIP value = 0x802
 
@@ -553,7 +553,7 @@ be prepared if enabling.
 Some 2013-14 MacBook Pro's have issues with the built-in thunderbolt,
 resulting in kernel panics and random shutdowns.
 
-To alliviate, you can disable the thunderbolt controller on MacBookPro11,x
+To alleviate, you can disable the thunderbolt controller on MacBookPro11,x
 machines with this option.
 
 Note: This option only works on MacBookPro11,x, file an issue if you know of
@@ -650,7 +650,7 @@ for Windows may prefer to only work with the dGPU and eGPU active.
         else:
             self.dGPU_switch_support()
 
-    def set_3rd_party_drices(self):
+    def set_3rd_party_drives(self):
         utilities.cls()
         utilities.header(["Set enhanced 3rd Party SSD Support"])
         print(
@@ -671,7 +671,7 @@ TRIM is not ideal.
         elif change_menu in {"q", "Q", "Quit", "quit"}:
             print("Returning to previous menu")
         else:
-            self.set_3rd_party_drices()
+            self.set_3rd_party_drives()
 
     def set_software_demux(self):
         utilities.cls()
@@ -795,7 +795,7 @@ Flipping this setting will disable automatic loading of additional drives in
 OpenCore's boot menu other than what was booted.
 
 Note: This option should only be flipped under the following circumstances:
-      - You are experincing wake failures from hibernation
+      - You are experiencing wake failures from hibernation
       - You are only using 1 disk in your system for booting (ie. no RAID)
       - OpenCore is installed on the same disk as the OS
       - Your system has an Intel iGPU and Nvidia dGPU
@@ -857,7 +857,7 @@ Supported Options:
 3. Disable FeatureUnlock
             """
         )
-        change_menu = input("Set FeatreUnlock (ie. 1): ")
+        change_menu = input("Set FeatureUnlock (ie. 1): ")
         if change_menu == "1":
             self.constants.fu_status = True
             self.constants.fu_arguments = None
@@ -1156,7 +1156,7 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
                 [f"Disable Battery Throttling:\tCurrently {self.constants.disable_msr_power_ctl}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_battery_throttle],
                 [f"Disable XCPM:\t\tCurrently {self.constants.disable_xcpm}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_xcpm],
                 [f"Set Software Demux:\tCurrently {self.constants.software_demux}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_software_demux],
-                [f"Set 3rd Party SSD Support:\tCurrently {self.constants.allow_3rd_party_drives}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_3rd_party_drices],
+                [f"Set 3rd Party SSD Support:\tCurrently {self.constants.allow_3rd_party_drives}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_3rd_party_drives],
                 [f"Set FeatureUnlock: \tCurrently {self.constants.fu_status}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_fu_settings],
                 [f"Set NVRAM Write:\t\tCurrently {self.constants.nvram_write}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_nvram_write],
                 [f"Set Content Caching:\tCurrently {self.constants.set_content_caching}", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_cc_support],

resources/constants.py

@@ -12,7 +12,7 @@ from data import os_data
 class Constants:
     def __init__(self):
         # Patcher Versioning
-        self.patcher_version = "0.4.6"  # OpenCore-Legacy-Patcher
+        self.patcher_version = "0.4.8"  # OpenCore-Legacy-Patcher
         self.patcher_support_pkg_version = "0.5.1"  #  PatcherSupportPkg
         self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
         self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/"
@@ -187,7 +187,7 @@ class Constants:
         self.set_content_caching = False  #    Set Content Caching
         self.allow_nvme_fixing = True  #       Allow NVMe Kernel Space Patches
         self.disable_xcpm = False  #           Disable XCPM (X86PlatformPlugin.kext)
-        self.root_patcher_succeded = False  #  Determine if root patcher succeeded
+        self.root_patcher_succeeded = False  #  Determine if root patcher succeeded
         self.booted_oc_disk = None  #          Determine current disk OCLP booted from
         self.start_build_install = False  #    Determine if build install should be started
         self.host_is_non_metal = False  #      Determine if host is non-metal (ie. enable UI hacks)

resources/global_settings.py

@@ -1,6 +1,6 @@
 # Alternative to Apple's 'defaults' tool
 # Store data in '/Users/Shared'
-# This is to ensure compatibility when running wihout a user
+# This is to ensure compatibility when running without a user
 # ie. during automated patching
 
 from pathlib import Path
@@ -18,18 +18,26 @@ class global_settings:
     def generate_settings_file(self):
         if Path(self.global_settings_plist).exists():
             return
-        plistlib.dump({"Developed by Dortania": True,}, Path(self.global_settings_plist).open("wb"))
+        try:
+            plistlib.dump({"Developed by Dortania": True,}, Path(self.global_settings_plist).open("wb"))
+        except PermissionError:
+            print("- Permission error: Unable to write to global settings file")
 
     def read_property(self, property_name):
-        plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
-        if property_name in plist:
-            return plist[property_name]
+        if Path(self.global_settings_plist).exists():
+            plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
+            if property_name in plist:
+                return plist[property_name]
         return None
 
     def write_property(self, property_name, property_value):
-        plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
-        plist[property_name] = property_value
-        plistlib.dump(plist, Path(self.global_settings_plist).open("wb"))
+        if Path(self.global_settings_plist).exists():
+            plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
+            plist[property_name] = property_value
+            try:
+                plistlib.dump(plist, Path(self.global_settings_plist).open("wb"))
+            except PermissionError:
+                print("- Failed to write to global settings file")
 
 
     def convert_defaults_to_global_settings(self):
@@ -41,7 +49,14 @@ class global_settings:
             # merge defaults with global settings
             global_settings_plist = plistlib.load(Path(self.global_settings_plist).open("rb"))
             global_settings_plist.update(defaults_plist)
-            plistlib.dump(global_settings_plist, Path(self.global_settings_plist).open("wb"))
+            try:
+                plistlib.dump(global_settings_plist, Path(self.global_settings_plist).open("wb"))
+            except PermissionError:
+                print("- Permission error: Unable to write to global settings file")
+                return
 
             # delete defaults plist
-            Path(defaults_path).unlink()
+            try:
+                Path(defaults_path).unlink()
+            except PermissionError:
+                print("- Permission error: Unable to delete defaults plist")

resources/install.py

@@ -1,5 +1,5 @@
 # Installation of OpenCore files to ESP
-# Usage soley for TUI
+# Usage solely for TUI
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
 import plistlib
@@ -229,18 +229,22 @@ Please build OpenCore first!"""
                 Path(mount_path / Path("EFI/BOOT")).mkdir()
                 shutil.move(mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi"))
                 shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
-            if determine_sd_card(sd_type) is True:
-                print("- Adding SD Card icon")
-                shutil.copy(self.constants.icon_path_sd, mount_path)
-            elif ssd_type is True:
-                print("- Adding SSD icon")
-                shutil.copy(self.constants.icon_path_ssd, mount_path)
-            elif disk_type == "USB":
-                print("- Adding External USB Drive icon")
-                shutil.copy(self.constants.icon_path_external, mount_path)
+            # Due to how OpenCore processes on-volume icons, Windows may appear as OC's icon
+            if (mount_path / Path("EFI/Microsoft")).exists():
+                print("- Windows Boot Loader detected, skipping volume icon")
             else:
-                print("- Adding Internal Drive icon")
-                shutil.copy(self.constants.icon_path_internal, mount_path)
+                if determine_sd_card(sd_type) is True:
+                    print("- Adding SD Card icon")
+                    shutil.copy(self.constants.icon_path_sd, mount_path)
+                elif ssd_type is True:
+                    print("- Adding SSD icon")
+                    shutil.copy(self.constants.icon_path_ssd, mount_path)
+                elif disk_type == "USB":
+                    print("- Adding External USB Drive icon")
+                    shutil.copy(self.constants.icon_path_external, mount_path)
+                else:
+                    print("- Adding Internal Drive icon")
+                    shutil.copy(self.constants.icon_path_internal, mount_path)
 
             print("- Cleaning install location")
             if not self.constants.recovery_status:

resources/installer.py

@@ -3,6 +3,7 @@ from pathlib import Path
 import plistlib
 import subprocess
 import requests
+import tempfile
 from resources import utilities, tui_helpers
 
 def list_local_macOS_installers():
@@ -135,6 +136,9 @@ def list_downloadable_macOS_installers(download_path, catalog):
                             build_plist = plistlib.loads(requests.get(bm_package["URL"]).content)
                         except plistlib.InvalidFileException:
                             continue
+                        # Ensure Apple Silicon specific Installers are not listed
+                        if "VMM-x86_64" not in build_plist["MobileAssetProperties"]["SupportedDeviceModels"]:
+                            continue
                         version = build_plist["MobileAssetProperties"]["OSVersion"]
                         build = build_plist["MobileAssetProperties"]["Build"]
                         try:
@@ -203,6 +207,11 @@ def only_list_newest_installers(available_apps):
 
         # Now remove all versions that are not the largest
         for ia in list(available_apps):
+            if available_apps[ia]["Variant"] in ["DeveloperSeed", "PublicSeed"]:
+                # Remove Beta builds from default listing
+                available_apps.pop(ia)
+                continue
+
             if available_apps[ia]["Version"].startswith(version):
                 remote_version = available_apps[ia]["Version"].split(".")
                 if remote_version[0] == "10":
@@ -328,16 +337,48 @@ def list_disk_to_format():
         })
     return list_disks
 
+# Create global tmp directory
+tmp_dir = tempfile.TemporaryDirectory()
 
-def generate_installer_creation_script(script_location, installer_path, disk):
+def generate_installer_creation_script(tmp_location, installer_path, disk):
     # Creates installer.sh to be piped to OCLP-Helper and run as admin
     # Goals:
     # - Format provided disk as HFS+ GPT
     # - Run createinstallmedia on provided disk
-    # Implemnting this into a single installer.sh script allows us to only call
+    # Implementing this into a single installer.sh script allows us to only call
     # OCLP-Helper once to avoid nagging the user about permissions
 
     additional_args = ""
+    script_location = Path(tmp_location) / Path("Installer.sh")
+
+    # Due to a bug in createinstallmedia, running from '/Applications' may sometimes error:
+    #   'Failed to extract AssetData/boot/Firmware/Manifests/InstallerBoot/*'
+    # This affects native Macs as well even when manually invoking createinstallmedia
+
+    # To resolve, we'll copy into our temp directory and run from there
+
+    # Create a new tmp directory
+    # Our current one is a disk image, thus CoW will not work
+    global tmp_dir
+    ia_tmp = tmp_dir.name
+
+    print(f"Creating temporary directory at {ia_tmp}")
+    # Delete all files in tmp_dir
+    for file in Path(ia_tmp).glob("*"):
+        subprocess.run(["rm", "-rf", str(file)])
+
+    # Copy installer to tmp (use CoW to avoid extra disk writes)
+    args = ["cp", "-cR", installer_path, ia_tmp]
+    if utilities.check_filesystem_type() != "apfs":
+        # HFS+ disks do not support CoW
+        args[1] = "-R"
+    subprocess.run(args)
+
+    # Adjust installer_path to point to the copied installer
+    installer_path = Path(ia_tmp) / Path(Path(installer_path).name)
+    if not Path(installer_path).exists():
+        print(f"Failed to copy installer to {ia_tmp}")
+        return False
 
     createinstallmedia_path = str(Path(installer_path) / Path("Contents/Resources/createinstallmedia"))
     plist_path = str(Path(installer_path) / Path("Contents/Info.plist"))

resources/reroute_payloads.py

@@ -1,4 +1,4 @@
-# Reoute binaries to tmp directory, and mount a disk image of the payloads
+# Reroute binaries to tmp directory, and mount a disk image of the payloads
 # Implements a shadowfile to avoid direct writes to the dmg
 # Copyright (C) 2022, Mykola Grymalyuk
 
@@ -46,7 +46,7 @@ class reroute_payloads:
     def unmount_active_dmgs(self, unmount_all_active=True):
         # Find all DMGs that are mounted, and forcefully unmount them
         # If our disk image was previously mounted, we need to unmount it to use again
-        # This can happen if we crash during a previous scession, however 'atexit' class should hopefully avoid this
+        # This can happen if we crash during a previous secession, however 'atexit' class should hopefully avoid this
         dmg_info = subprocess.run(["hdiutil", "info", "-plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         dmg_info = plistlib.loads(dmg_info.stdout)
 

resources/sys_patch.py

@@ -44,7 +44,7 @@ class PatchSysVolume:
         self.computer = self.constants.computer
         self.root_mount_path = None
         self.root_supports_snapshot = utilities.check_if_root_is_apfs_snapshot()
-        self.constants.root_patcher_succeded = False # Reset Variable each time we start
+        self.constants.root_patcher_succeeded = False # Reset Variable each time we start
         self.constants.needs_to_open_preferences = False
         self.patch_set_dictionary = {}
         self.needs_kmutil_exemptions = False # For '/Library/Extensions' rebuilds
@@ -113,7 +113,7 @@ class PatchSysVolume:
             else:
                 self.clean_skylight_plugins()
                 self.delete_nonmetal_enforcement()
-                self.constants.root_patcher_succeded = True
+                self.constants.root_patcher_succeeded = True
                 print("- Unpatching complete")
                 print("\nPlease reboot the machine for patches to take effect")
 
@@ -172,7 +172,7 @@ class PatchSysVolume:
             print("\nPlease reboot the machine for patches to take effect")
             if self.needs_kmutil_exemptions is True:
                 print("Note: Apple will require you to open System Preferences -> Security to allow the new kernel extensions to be loaded")
-            self.constants.root_patcher_succeded = True
+            self.constants.root_patcher_succeeded = True
             if self.constants.gui_mode is False:
                 input("\nPress [ENTER] to continue")
 
@@ -304,7 +304,7 @@ class PatchSysVolume:
         elif Path(source_folder + "/" + file_name_str).is_dir():
             # Applicable for .kext, .app, .plugin, .bundle, all of which are directories
             if Path(destination_folder + "/" + file_name).exists():
-                print(f"  - Found existing {file_name}, overwritting...")
+                print(f"  - Found existing {file_name}, overwriting...")
                 utilities.process_status(utilities.elevated(["rm", "-R", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
             else:
                 print(f"  - Installing: {file_name}")
@@ -313,7 +313,7 @@ class PatchSysVolume:
         else:
             # Assume it's an individual file, replace as normal
             if Path(destination_folder + "/" + file_name).exists():
-                print(f"  - Found existing {file_name}, overwritting...")
+                print(f"  - Found existing {file_name}, overwriting...")
                 utilities.process_status(utilities.elevated(["rm", f"{destination_folder}/{file_name}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
             else:
                 print(f"  - Installing: {file_name}")

resources/sys_patch_auto.py

@@ -193,7 +193,7 @@ class AutomaticSysPatch:
                 utilities.process_status(utilities.elevated(["cp", "-R", path, "/Library/Application Support/Dortania/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
 
                 if not Path("/Library/Application Support/Dortania/OpenCore-Patcher.app").exists():
-                    # Sometimes the binary the user launches maye have a suffix (ie. OpenCore-Patcher 3.app)
+                    # Sometimes the binary the user launches may have a suffix (ie. OpenCore-Patcher 3.app)
                     # We'll want to rename it to OpenCore-Patcher.app
                     path = path.split("/")[-1]
                     print(f"- Renaming {path} to OpenCore-Patcher.app")

resources/sys_patch_detect.py

@@ -68,7 +68,6 @@ class detect_root_patch:
                                 self.kepler_gpu = True
                                 self.supports_metal = True
                 elif gpu.arch in [
-                    device_probe.NVIDIA.Archs.Tesla,
                     device_probe.NVIDIA.Archs.Fermi,
                     device_probe.NVIDIA.Archs.Kepler,
                     device_probe.NVIDIA.Archs.Maxwell,
@@ -349,6 +348,7 @@ class detect_root_patch:
             required_patches.update({"Intel Sandy Bridge": all_hardware_patchset["Graphics"]["Intel Sandy Bridge"]})
         if hardware_details["Graphics: Intel Ivy Bridge"] is True:
             required_patches.update({"Metal Common": all_hardware_patchset["Graphics"]["Metal Common"]})
+            required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
             required_patches.update({"Intel Ivy Bridge": all_hardware_patchset["Graphics"]["Intel Ivy Bridge"]})
         if hardware_details["Graphics: Nvidia Tesla"] is True:
             required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]})
@@ -361,12 +361,15 @@ class detect_root_patch:
             required_patches.update({"Non-Metal Enforcement": all_hardware_patchset["Graphics"]["Non-Metal Enforcement"]})
         if hardware_details["Graphics: Nvidia Kepler"] is True:
             required_patches.update({"Metal Common": all_hardware_patchset["Graphics"]["Metal Common"]})
+            required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
             required_patches.update({"Nvidia Kepler": all_hardware_patchset["Graphics"]["Nvidia Kepler"]})
             for gpu in self.constants.computer.gpus:
+                # Handle mixed GPU situations (ie. MacBookPro11,3: Haswell iGPU + Kepler dGPU)
                 if gpu.arch == device_probe.Intel.Archs.Haswell:
+                    if "Modern GVA" in required_patches:
+                        del(required_patches["Modern GVA"])
                     required_patches.update({"GVA Work-Around": all_hardware_patchset["Graphics"]["GVA Work-Around"]})
-            if "GVA Work-Around" not in required_patches:
-                required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
+                    break
         if hardware_details["Graphics: AMD TeraScale 1"] is True:
             required_patches.update({"Non-Metal Common": all_hardware_patchset["Graphics"]["Non-Metal Common"]})
             required_patches.update({"AMD TeraScale Common": all_hardware_patchset["Graphics"]["AMD TeraScale Common"]})

resources/sys_patch_helpers.py

@@ -28,20 +28,23 @@ class sys_patch_helpers:
             board_to_patch_hex = bytes.fromhex(board_to_patch.encode('utf-8').hex())
             reported_board_hex = bytes.fromhex(self.constants.computer.reported_board_id.encode('utf-8').hex())
 
-            if len(board_to_patch_hex) != len(reported_board_hex):
-                print(f"- Error: Board ID {self.constants.computer.reported_board_id} is not the same length as {board_to_patch}")
-                raise Exception("Host's Board ID is not the same length as the kext's Board ID, cannot patch!!!")
+            if len(board_to_patch_hex) > len(reported_board_hex):
+                # Pad the reported Board ID with zeros to match the length of the board to patch
+                reported_board_hex = reported_board_hex + bytes(len(board_to_patch_hex) - len(reported_board_hex))
+            elif len(board_to_patch_hex) < len(reported_board_hex):
+                print(f"- Error: Board ID {self.constants.computer.reported_board_id} is longer than {board_to_patch}")
+                raise Exception("Host's Board ID is longer than the kext's Board ID, cannot patch!!!")
+
+            path = source_files_path + "/10.13.6/System/Library/Extensions/AppleIntelSNBGraphicsFB.kext/Contents/MacOS/AppleIntelSNBGraphicsFB"
+            if Path(path).exists():
+                with open(path, 'rb') as f:
+                    data = f.read()
+                    data = data.replace(board_to_patch_hex, reported_board_hex)
+                    with open(path, 'wb') as f:
+                        f.write(data)
             else:
-                path = source_files_path + "/10.13.6/System/Library/Extensions/AppleIntelSNBGraphicsFB.kext/Contents/MacOS/AppleIntelSNBGraphicsFB"
-                if Path(path).exists():
-                    with open(path, 'rb') as f:
-                        data = f.read()
-                        data = data.replace(board_to_patch_hex, reported_board_hex)
-                        with open(path, 'wb') as f:
-                            f.write(data)
-                else:
-                    print(f"- Error: Could not find {path}")
-                    raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!")
+                print(f"- Error: Could not find {path}")
+                raise Exception("Failed to find AppleIntelSNBGraphicsFB.kext, cannot patch!!!")
 
 
     def generate_patchset_plist(self, patchset, file_name):

resources/tui_helpers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2022, Dhinak G, Mykola Grymaluk
+# Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 from resources import utilities
 
 class TUIMenu:

resources/updates.py

@@ -62,7 +62,7 @@ class check_binary_updates:
             # print("- Network connection functional")
             response = requests.get(self.binary_url)
             data_set = response.json()
-            # print("- Retrived latest version data")
+            # print("- Retrieved latest version data")
             self.remote_version = data_set["tag_name"]
             # print(f"- Latest version: {self.remote_version}")
             self.remote_version_array = self.remote_version.split(".")

resources/utilities.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2022, Dhinak G, Mykola Grymaluk
+# Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
 import hashlib
 import math
@@ -93,6 +93,10 @@ def check_seal():
     else:
         return False
 
+def check_filesystem_type():
+    # Expected to return 'apfs' or 'hfs'
+    filesystem_type = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    return filesystem_type["FilesystemType"]
 
 def csr_dump():
     # Based off sip_config.py
@@ -250,7 +254,7 @@ def check_secure_boot_level():
         #
         # Genuine Mac logic:
         #   - On genuine non-T2 Macs, they always return 0
-        #   - T2 Macs will return based on their Starup Policy (Full(2), Medium(1), Disabled(0))
+        #   - T2 Macs will return based on their Startup Policy (Full(2), Medium(1), Disabled(0))
         # Ref: https://support.apple.com/en-us/HT208198
         if check_ap_security_policy() != 0:
             return True
@@ -346,7 +350,12 @@ def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
 
     if decode:
         if isinstance(value, bytes):
-            value = value.strip(b"\0").decode()
+            try:
+                value = value.strip(b"\0").decode()
+            except UnicodeDecodeError:
+                # Some sceanrios the firmware will throw garbage in
+                # ie. iMac12,2 with FireWire boot-path
+                value = None
         elif isinstance(value, str):
             value = value.strip("\0")
     return value
@@ -593,7 +602,7 @@ def check_boot_mode():
     return sys_plist[0]["_items"][0]["boot_mode"]
 
 def elevated(*args, **kwargs) -> subprocess.CompletedProcess:
-    # When runnign through our GUI, we run as root, however we do not get uid 0
+    # When running through our GUI, we run as root, however we do not get uid 0
     # Best to assume CLI is running as root
     if os.getuid() == 0 or check_cli_args() is not None:
         return subprocess.run(*args, **kwargs)