Merge branch 'main' into vmm

resources/build.py

@@ -745,6 +745,10 @@ class BuildOpenCore:
             self.get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.filesystems.apfs")["Enabled"] = True
             # Lets us check in sys_patch.py if config supports FileVault
             self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Settings"] += " -allow_fv"
+        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
+            self.enable_kext("EFICheckDisabler.kext", self.constants.restrictevents_version, self.constants.efi_disabler_path)
 
     def set_smbios(self):
         spoofed_model = self.model

resources/cli_menu.py

@@ -715,12 +715,17 @@ the event there's issues.
                 """Many thanks to the following:
 
   - Acidanthera:\tOpenCore, kexts and other tools
-  - Khronokernel:\tWriting and maintaining this patcher
   - DhinakG:\t\tWriting and maintaining this patcher
+  - Khronokernel:\tWriting and maintaining this patcher
   - ASentientBot:\tLegacy Acceleration Patches
   - Ausdauersportler:\tLinking fixes for SNBGraphicsFB and AMDX3000
-  - Syncretic:\t\tAAAMouSSE and telemetrap
-  - cdf:\t\tNightShiftEnabler and Innie"""
+  - Syncretic:\t\tAAAMouSSE, telemetrap, and SurPlus
+  - cdf:\t\tNightShiftEnabler and Innie
+  - parrotgeek1:\tVMM Patch Set
+
+Source Code:
+https://github.com/dortania/OpenCore-Legacy-Patcher
+  """
             ],
         ).start()
 
@@ -852,7 +857,7 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
                 #     MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).set_amfi,
                 # ],
                 [
-                    f"Set System Intrgity Protection (SIP):\tCurrently {self.constants.sip_status}",
+                    f"Set System Integrity Protection (SIP):\tCurrently {self.constants.sip_status}",
                     MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).change_sip,
                 ],
                 [

resources/constants.py

@@ -257,6 +257,10 @@ class Constants:
     @property
     def restrictevents_path(self):
         return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+    
+    @property
+    def efi_disabler_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/EFICheckDisabler-v{self.restrictevents_version}.zip")
 
     @property
     def restrictevents_mbp_path(self):