Fix NightShift in Monterey

CHANGELOG.md

@@ -6,6 +6,9 @@
 - Implement OpenCore GUI
 - Ensure symlinks are preserved
 - Enable TeraScale 2 patches by default on desktops
+- Fix NightShift support for macOS Monterey
+- Add UniversalControl support
+  - Currently not enabled by Apple in macOS Monterey Beta 2/iOS 15 Beta 2
 
 ## 0.2.2
 

Resources/Build.py

@@ -169,12 +169,6 @@ class BuildOpenCore:
             ("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path, lambda: self.constants.allow_oc_everywhere is False),
             ("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path, lambda: self.model in ModelArray.MacPro71),
             ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1"]),
-            (
-                "NightShiftEnabler.kext",
-                self.constants.nightshift_version,
-                self.constants.nightshift_path,
-                lambda: self.model in ModelArray.NightShift and self.constants.allow_oc_everywhere is False and self.constants.serial_settings == "Minimal",
-            ),
             ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: self.constants.allow_oc_everywhere is False),
             # CPU patches
             ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model in ModelArray.DualSocket),

Resources/ModelArray.py

@@ -445,13 +445,35 @@ XhciSupport = [
 ]
 
 SidecarPatch = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
     "MacBook8,1",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,2",
     "MacBookAir5,1",
     "MacBookAir5,2",
     "MacBookAir6,1",
     "MacBookAir6,2",
     "MacBookAir7,1",
     "MacBookAir7,2",
+    "MacBookPro4,1",
+    "MacBookPro5,1",
+    "MacBookPro5,2",
+    "MacBookPro5,3",
+    "MacBookPro5,4",
+    "MacBookPro5,5",
+    "MacBookPro6,1",
+    "MacBookPro6,2",
+    "MacBookPro7,1",
+    "MacBookPro8,1",
+    "MacBookPro8,2",
+    "MacBookPro8,3",
     "MacBookPro9,1",
     "MacBookPro9,2",
     "MacBookPro10,1",
@@ -468,10 +490,24 @@ SidecarPatch = [
     "MacBookPro14,1",
     "MacBookPro14,2",
     "MacBookPro14,3",
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
     "Macmini6,1",
     "Macmini6,2",
     "Macmini7,1",
     "Macmini8,1",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
     "iMac13,1",
     "iMac13,2",
     "iMac13,3",
@@ -485,6 +521,8 @@ SidecarPatch = [
     "iMac18,1",
     "iMac18,2",
     "iMac18,3",
+    "MacPro3,1",
+    "MacPro4,1",
     "MacPro5,1",
     "MacPro6,1",
     "Dortania1,1",

payloads/Config/config.plist

@@ -816,7 +816,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>19.0.0</string>
+				<string>16.0.0</string>
 				<key>BundlePath</key>
 				<string>SidecarFixup.kext</string>
 				<key>ExecutablePath</key>