Merge pull request #124 from RayBB/patch-1

update brew install command

Classes/Constants.h

@@ -26,3 +26,4 @@
 #define PREF_FAN_SELSPEED @"selspeed"
 #define PREF_FAN_SYNC @"sync"
 #define PREF_FAN_SHOWMENU @"menu"
+#define PREF_FAN_AUTO @"auto"

Classes/FanControl.h

@@ -25,6 +25,7 @@
 #import "NSFileManager+DirectoryLocations.h"
 #import "smc.h"
 #import "smcWrapper.h"
+#import "IOHIDSensor.h"
 #import "MachineDefaults.h"
 
 #import "Power.h"

Classes/FanControl.m

@@ -150,7 +150,11 @@ NSUserDefaults *defaults;
 			@0, PREF_AC_SELECTION,
 			@0, PREF_CHARGING_SELECTION,
 			@0, PREF_MENU_DISPLAYMODE,
+#if TARGET_CPU_ARM64
+            @"Tp0D",PREF_TEMPERATURE_SENSOR,
+#else
             @"TC0D",PREF_TEMPERATURE_SENSOR,
+#endif
             @0, PREF_NUMBEROF_LAUNCHES,
             @NO,PREF_DONATIONMESSAGE_DISPLAY,
 			[NSArchiver archivedDataWithRootObject:[NSColor blackColor]],PREF_MENU_TEXTCOLOR,
@@ -334,6 +338,13 @@ NSUserDefaults *defaults;
 }
 
 
+- (BOOL)usesIOHIDForTemperature {
+#if TARGET_CPU_ARM64
+    return [[MachineDefaults computerModel] rangeOfString:@"MacBookPro17"].length > 0;
+#else
+    return false;
+#endif
+}
 
 // Called via a timer mechanism. This is where all the temp / RPM reading is done.
 //reads fan data and updates the gui
@@ -399,7 +410,11 @@ NSUserDefaults *defaults;
     
     if (bNeedTemp == true) {
         // Read current temperature and format text for the menubar.
-        c_temp = [smcWrapper get_maintemp];
+        if ([self usesIOHIDForTemperature]) {
+            c_temp = [IOHIDSensor getSOCTemperature];
+        } else {
+            c_temp = [smcWrapper get_maintemp];
+        }
         
         if ([[defaults objectForKey:PREF_TEMP_UNIT] intValue]==0) {
             temp = [NSString stringWithFormat:@"%@%CC",@(c_temp),(unsigned short)0xb0];
@@ -447,6 +462,8 @@ NSUserDefaults *defaults;
             [paragraphStyle setAlignment:NSLeftTextAlignment];
             [s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:fsize] range:NSMakeRange(0,[s_status length])];
             [s_status addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,[s_status length])];
+            if (menuBarSetting == 0)
+                [s_status addAttribute:NSBaselineOffsetAttributeName value:[NSNumber numberWithFloat: -6] range:NSMakeRange(0, [s_status length])];
          
             if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
             
@@ -532,6 +549,15 @@ NSUserDefaults *defaults;
 	[DefaultsController revert:sender];
 }
 
+-(void)setFansToAuto:(bool)is_auto {
+    for (int fan_index=0;fan_index<[[FavoritesController arrangedObjects][0][PREF_FAN_ARRAY] count];fan_index++) {
+        [self setFanToAuto:fan_index is_auto:is_auto];
+    }
+}
+
+-(void)setFanToAuto:(int)fan_index is_auto:(bool)is_auto {
+    [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMd",fan_index] value:is_auto ? @"00" : @"01"];
+}
 
 //set the new fan settings
 
@@ -540,20 +566,20 @@ NSUserDefaults *defaults;
 	[FanControl setRights];
 	[FavoritesController setSelectionIndex:cIndex];
     
-    if ([[MachineDefaults computerModel] rangeOfString:@"MacBookPro15"].location != NSNotFound) {
-        for (i=0;i<[[FavoritesController arrangedObjects][cIndex][PREF_FAN_ARRAY] count];i++) {
-            [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMd",i] value:@"01"];
+    for (i=0;i<[[FavoritesController arrangedObjects][cIndex][PREF_FAN_ARRAY] count];i++) {
+        int fan_mode = [smcWrapper get_mode:i];
+        // Auto/forced mode is not available
+        if (fan_mode < 0) {
+            [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMn",i] value:[[FanController arrangedObjects][i][PREF_FAN_SELSPEED] tohex]];
+        } else {
+            bool is_auto = [[FanController arrangedObjects][i][PREF_FAN_AUTO] boolValue];
+            [self setFanToAuto:i is_auto:is_auto];
             float f_val = [[FanController arrangedObjects][i][PREF_FAN_SELSPEED] floatValue];
             uint8 *vals = (uint8*)&f_val;
             //NSString str_val = ;
             [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dTg",i] value:[NSString stringWithFormat:@"%02x%02x%02x%02x",vals[0],vals[1],vals[2],vals[3]]];
         }
     }
-    else {
-        for (i=0;i<[[FavoritesController arrangedObjects][cIndex][PREF_FAN_ARRAY] count];i++) {
-            [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMn",i] value:[[FanController arrangedObjects][i][PREF_FAN_SELSPEED] tohex]];
-        }
-    }
     
 	NSMenu *submenu = [[NSMenu alloc] init];
 	
@@ -674,9 +700,7 @@ NSUserDefaults *defaults;
     }
     error = nil;
     if ([[MachineDefaults computerModel] rangeOfString:@"MacBookPro15"].location != NSNotFound) {
-        for (int i=0;i<[[FavoritesController arrangedObjects][0][PREF_FAN_ARRAY] count];i++) {
-            [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMd",i] value:@"00"];
-        }
+        [self setFansToAuto:true];
     }
 
     NSString *domainName = [[NSBundle mainBundle] bundleIdentifier];
@@ -731,6 +755,13 @@ NSUserDefaults *defaults;
 
 #pragma mark **Power Watchdog-Methods**
 
+- (void)systemWillSleep:(id)sender{
+#if TARGET_CPU_ARM64
+    [FanControl setRights];
+    [self setFansToAuto:true];
+#endif
+}
+
 - (void)systemDidWakeFromSleep:(id)sender{
 	[self apply_settings:nil controllerindex:[[defaults objectForKey:PREF_SELECTION_DEFAULT] intValue]];
 }

Classes/IOHIDSensor.h

@@ -0,0 +1,57 @@
+/*
+ *    FanControl
+ *
+ *    Copyright (c) 2006-2012 Hendrik Holtmann
+ *
+ *    IOHIDSensor.h - MacBook(Pro) FanControl application
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <IOKit/hidsystem/IOHIDEventSystemClient.h>
+#import <IOKit/hidsystem/IOHIDServiceClient.h>
+
+// https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-1035.70.7/IOHIDFamily/AppleHIDUsageTables.h.auto.html
+#define kHIDPage_AppleVendor    0xff00
+#define kHIDUsage_AppleVendor_TemperatureSensor    0x0005
+
+// https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-1035.70.7/IOHIDFamily/IOHIDEventTypes.h.auto.html
+#ifdef __LP64__
+typedef double IOHIDFloat;
+#else
+typedef float IOHIDFloat;
+#endif
+
+// https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-1035.70.7/IOHIDFamily/IOHIDEventTypes.h.auto.html
+#define IOHIDEventFieldBase(type) (type << 16)
+#define kIOHIDEventTypeTemperature  15
+
+
+typedef struct __IOHIDEvent *IOHIDEventRef;
+typedef struct __IOHIDServiceClient *IOHIDServiceClientRef;
+
+IOHIDEventSystemClientRef IOHIDEventSystemClientCreate(CFAllocatorRef);
+void IOHIDEventSystemClientSetMatching(IOHIDEventSystemClientRef, CFDictionaryRef);
+IOHIDEventRef IOHIDServiceClientCopyEvent(IOHIDServiceClientRef, int64_t, int32_t, int64_t);
+IOHIDFloat IOHIDEventGetFloatValue(IOHIDEventRef event, uint32_t field);
+
+@interface IOHIDSensor : NSObject {
+}
+
++ (float) getSOCTemperature;
+
+@end

Classes/IOHIDSensor.m

@@ -0,0 +1,70 @@
+/*
+ *    FanControl
+ *
+ *    Copyright (c) 2006-2012 Hendrik Holtmann
+ *
+ *    IOHIDSensor.m - MacBook(Pro) FanControl application
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import "IOHIDSensor.h"
+
+@implementation IOHIDSensor
+
+static BOOL isSOCSensor(CFStringRef sensorName) {
+    return CFStringFind(sensorName, CFSTR("SOC"), kCFCompareCaseInsensitive).location != kCFNotFound;
+}
+
+static float toOneDecimalPlace(float value) {
+    return roundf(10.0f * value) / 10.0f;
+}
+
++ (float) getSOCTemperature {
+    IOHIDEventSystemClientRef eventSystemClient = IOHIDEventSystemClientCreate(kCFAllocatorDefault);
+    CFArrayRef services = IOHIDEventSystemClientCopyServices(eventSystemClient);
+    if (services) {
+        
+        float socSensorSum = 0.0f;
+        int socSensorCount = 0;
+        
+        for (int i = 0; i < CFArrayGetCount(services); i++) {
+            IOHIDServiceClientRef serviceClientRef = (IOHIDServiceClientRef)CFArrayGetValueAtIndex(services, i);
+            CFStringRef sensorName = IOHIDServiceClientCopyProperty(serviceClientRef, CFSTR("Product"));
+            if (sensorName) {
+                if (isSOCSensor(sensorName)) {
+                    IOHIDEventRef event = IOHIDServiceClientCopyEvent(serviceClientRef, kIOHIDEventTypeTemperature, 0, 0);
+                    if (event) {
+                        IOHIDFloat sensorTemperature = IOHIDEventGetFloatValue(event, IOHIDEventFieldBase(kIOHIDEventTypeTemperature));
+                        CFRelease(event);
+                        socSensorSum += sensorTemperature;
+                        socSensorCount++;
+                    }
+                }
+                CFRelease(sensorName);
+            }
+        }
+        
+        CFRelease(services);
+        CFRelease(eventSystemClient);
+        
+        float avgSOCTemp = socSensorCount > 0 ? socSensorSum / socSensorCount : 0.0f;
+        return toOneDecimalPlace(avgSOCTemp);
+    }
+    
+    return 0.0f;
+}
+
+@end

Classes/MachineDefaults.m

@@ -101,7 +101,7 @@
     if (!supported) {
         NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Alert!",nil)
 						  defaultButton:NSLocalizedString(@"Continue",nil) alternateButton:NSLocalizedString(@"Quit",nil) otherButton:nil
-						informativeTextWithFormat:NSLocalizedString(@"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!",nil)];
+						informativeTextWithFormat:NSLocalizedString(@"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make sure you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!",nil)];
 		NSModalResponse code=[alert runModal];
 		if (code == NSAlertDefaultReturn) {
 			[self readFromSMC];

Classes/Power.h

@@ -58,6 +58,8 @@
 //delegate Prototypes 
 @interface NSObject (PowerDelegate)
 
+- (void)systemWillSleep:(id)sender;
+
 - (void)systemDidWakeFromSleep:(id)sender;
 
 - (void)powerChangeToBattery:(id)sender;

Classes/Power.m

@@ -101,6 +101,7 @@ static void powerSourceChanged(void * refCon)
 	switch (messageType)
 	{
 		case kIOMessageSystemWillSleep:
+			[_delegate systemWillSleep:self];
 			IOAllowPowerChange(root_port, (long)messageArgument);
 		break;
 		case kIOMessageCanSystemSleep:

Classes/smcWrapper.h

@@ -37,6 +37,7 @@
 +(int) get_fan_num;
 +(int) get_min_speed:(int)fan_number;
 +(int) get_max_speed:(int)fan_number;
++(int) get_mode:(int)fan_number;
 +(void)setKey_external:(NSString *)key value:(NSString *)value;
 +(NSString*) get_fan_descr:(int)fan_number;
 

Classes/smcWrapper.m

@@ -70,7 +70,11 @@ NSArray *allSensors;
     NSString *sensor = [[NSUserDefaults standardUserDefaults] objectForKey:PREF_TEMPERATURE_SENSOR];
     SMCReadKey2((char*)[sensor UTF8String], &val,conn);
     retValue = [self convertToNumber:val];
+#if TARGET_CPU_ARM64
+    allSensors = [NSArray arrayWithObjects:@"Tp01",@"Tp05",@"Tp09",@"Tp0b",@"Tp0D",@"Tp0H",@"Tp0L",@"Tp0P",@"Tp0T",@"Tp0X",nil];
+#else
     allSensors = [NSArray arrayWithObjects:@"TC0D",@"TC0P",@"TCAD",@"TC0H",@"TC0F",@"TCAH",@"TCBH",nil];
+#endif
     if (retValue<=0 || floor(retValue) == 129 ) { //workaround for some iMac Models
         for (NSString *sensor in allSensors) {
             SMCReadKey2((char*)[sensor UTF8String], &val,conn);
@@ -131,7 +135,7 @@ NSArray *allSensors;
 	UInt32Char_t  key;
 	SMCVal_t      val;
 	//kern_return_t result;
-	sprintf(key, "F%dAc", fan_number);
+	sprintf(key, "F%cAc", fannum[fan_number]);
 	SMCReadKey2(key, &val,conn);
 	int running= [self convertToNumber:val];
 	return running;
@@ -153,7 +157,7 @@ NSArray *allSensors;
 	//kern_return_t result;
 	NSMutableString *desc;
 
-    sprintf(key, "F%dID", fan_number);
+    sprintf(key, "F%cID", fannum[fan_number]);
     SMCReadKey2(key, &val,conn);
 
     if(val.dataSize>0){
@@ -178,7 +182,7 @@ NSArray *allSensors;
 	UInt32Char_t  key;
 	SMCVal_t      val;
 	//kern_return_t result;
-	sprintf(key, "F%dMn", fan_number);
+	sprintf(key, "F%cMn", fannum[fan_number]);
 	SMCReadKey2(key, &val,conn);
 	int min= [self convertToNumber:val];
 	return min;
@@ -188,11 +192,26 @@ NSArray *allSensors;
 	UInt32Char_t  key;
 	SMCVal_t      val;
 	//kern_return_t result;
-	sprintf(key, "F%dMx", fan_number);
+	sprintf(key, "F%cMx", fannum[fan_number]);
 	SMCReadKey2(key, &val,conn);
 	int max= [self convertToNumber:val];
 	return max;
-}	
+}
+
++(int) get_mode:(int)fan_number{
+    UInt32Char_t  key;
+    SMCVal_t      val;
+    kern_return_t result;
+    
+    sprintf(key, "F%dMd", fan_number);
+    result = SMCReadKey2(key, &val,conn);
+    // Auto mode's key is not available
+    if (result != kIOReturnSuccess) {
+        return -1;
+    }
+    int mode = [self convertToNumber:val];
+    return mode;
+}
 
 
 + (BOOL)validateSMC:(NSString*)path
@@ -242,11 +261,6 @@ NSArray *allSensors;
 +(void)setKey_external:(NSString *)key value:(NSString *)value{
 	NSString *launchPath = [[NSBundle mainBundle]   pathForResource:@"smc" ofType:@""];
     
-   	NSString *checksum=[smcWrapper createCheckSum:launchPath];
-    if (![checksum  isEqualToString:smc_checksum]) {
-        NSLog(@"smcFanControl: Security Error: smc-binary is not the distributed one");
-        return;
-    }
     NSArray *argsArray = @[@"-k",key,@"-w",value];
 	NSTask *task;
     task = [[NSTask alloc] init];

Info.plist

@@ -24,6 +24,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>2.6.1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>

Readme.md

@@ -12,13 +12,13 @@ Make sure you have both [Homebrew](http://brew.sh/) and [Cask](https://caskroom.
 After installing Homebrew and Cask, run:
 
 ```
-$ brew cask install smcfancontrol
+$ brew install --cask smcfancontrol
 ```
 
 After that you'll be able to use Spotlight to launch smcFanControl normally. :-)
 
 
-Requirements: Intel Mac / OS X 10.7 or higher 
+Requirements: Apple Silicon or Intel Mac / OS X 10.7 or higher 
 
 
 Compiled version: https://www.eidac.de/smcfancontrol/smcfancontrol_2_6.zip

Ressources/Dutch.lproj/F.A.Q.rtf

@@ -30,7 +30,7 @@ All changes smcFanControl does to the fan controlling get lost after you shutdow
 
 \b I get a "smcFanControl has not been tested on this machine" warning. What does that mean?\
 
-\b0 Technically smcFanControl supports every intel mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
+\b0 Technically smcFanControl supports every Apple Silicon & Intel Mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
 \
 
 \b How can I restore the Apple defaults for fanspeed?\
@@ -74,7 +74,7 @@ Will there be a version of smcFanControl for Powerbooks or other PPC based Macs?
 
 \b Wouldn't it be even better to read out the temperature and set the fan speeds depending on the readout than just set the minimum fan speed and let automatic fan control as defined by apple do the rest?\
 
-\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. An intel mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
+\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. A Mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
 \
 
 \b I have got a MBP and smcFanControl is reporting 0rpm for one of my fans?\

Ressources/Dutch.lproj/Localizable.strings

@@ -12,7 +12,7 @@
 
 "Right Fan" = "Rechter Fan";
 
-"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl is nog niet getest op deze machine, maar het zou moeten werken als je de instructies volgt. \n\nAls je doorgaat, zorg dan dat er geen andere FanControl-software draait. Als dat wel zo is, de-installeer deze software dan, stop smcFanControl en restart je computer voor je smcFanControl installeert!";
+"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make sure you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl is nog niet getest op deze machine, maar het zou moeten werken als je de instructies volgt. \n\nAls je doorgaat, zorg dan dat er geen andere FanControl-software draait. Als dat wel zo is, de-installeer deze software dan, stop smcFanControl en restart je computer voor je smcFanControl installeert!";
 
 "Continue" = "Doorgaan";
 

Ressources/Dutch.lproj/MainMenu.nib/designable.nib

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.3.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.3.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="smcFanControl" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="21" userLabel="Window" customClass="StatusItemWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="519" y="155" width="337" height="436"/>
+            <rect key="contentRect" x="519" y="155" width="374" height="436"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="337" height="436"/>
+                <rect key="frame" x="0.0" y="0.0" width="374" height="436"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="439">
-                        <rect key="frame" x="20" y="292" width="297" height="99"/>
+                        <rect key="frame" x="20" y="292" width="334" height="99"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="fPm-Su-wyu">
-                            <rect key="frame" x="1" y="0.0" width="295" height="98"/>
+                            <rect key="frame" x="1" y="0.0" width="332" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="875" id="440">
-                                    <rect key="frame" x="0.0" y="0.0" width="295" height="73"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="332" height="73"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -109,6 +109,21 @@
                                                 </binding>
                                             </connections>
                                         </tableColumn>
+                                        <tableColumn identifier="automode" width="45" minWidth="45" maxWidth="1000" id="NOW-nM-e02">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Auto">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Ckd-qt-iMJ">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="492" name="value" keyPath="arrangedObjects.auto" id="sKj-Yb-444"/>
+                                            </connections>
+                                        </tableColumn>
                                     </tableColumns>
                                     <connections>
                                         <outlet property="delegate" destination="212" id="702"/>
@@ -125,7 +140,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="875">
-                            <rect key="frame" x="0.0" y="0.0" width="295" height="25"/>
+                            <rect key="frame" x="0.0" y="0.0" width="332" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
@@ -181,10 +196,10 @@
                         </connections>
                     </button>
                     <box title="Opties" id="479">
-                        <rect key="frame" x="17" y="41" width="303" height="243"/>
+                        <rect key="frame" x="17" y="41" width="340" height="243"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView" id="lD7-kf-ZR3">
-                            <rect key="frame" x="3" y="3" width="297" height="225"/>
+                            <rect key="frame" x="3" y="3" width="334" height="225"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button id="455">
@@ -199,7 +214,7 @@
                                     </connections>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" id="456">
-                                    <rect key="frame" x="107" y="57" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="57" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="460" id="840">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -219,7 +234,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="461">
-                                    <rect key="frame" x="107" y="32" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="32" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="465" id="841">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -239,7 +254,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="466">
-                                    <rect key="frame" x="107" y="7" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="7" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="470" id="842">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -344,7 +359,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" id="609">
-                                    <rect key="frame" x="74" y="187" width="154" height="22"/>
+                                    <rect key="frame" x="74" y="187" width="196" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Temperatuur" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="611" id="849">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -376,7 +391,7 @@
                                     </connections>
                                 </button>
                                 <colorWell id="716">
-                                    <rect key="frame" x="233" y="192" width="39" height="17"/>
+                                    <rect key="frame" x="275" y="190" width="39" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                     <connections>
@@ -390,30 +405,6 @@
                             </subviews>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" id="482">
-                        <rect key="frame" x="242" y="13" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Bewaar" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="savePreferences:" target="212" id="550"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="483">
-                        <rect key="frame" x="159" y="13" width="85" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Annuleer" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                            <string key="keyEquivalent">w</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="closePreferences:" target="212" id="485"/>
-                        </connections>
-                    </button>
                     <button hidden="YES" id="695">
                         <rect key="frame" x="97" y="289" width="150" height="22"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -426,6 +417,30 @@
                             <binding destination="486" name="value" keyPath="selection.sync" id="715"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" id="482">
+                        <rect key="frame" x="279" y="12" width="80" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Bewaar" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="savePreferences:" target="212" id="550"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="483">
+                        <rect key="frame" x="196" y="12" width="85" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Annuleer" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                            <string key="keyEquivalent">w</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="closePreferences:" target="212" id="485"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
         </window>
@@ -483,7 +498,7 @@
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <attributedString key="textStorage">
                                         <fragment>
                                             <mutableString key="content">		    GNU GENERAL PUBLIC LICENSE
@@ -1055,7 +1070,7 @@ Gw
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
                             </subviews>

Ressources/English.lproj/F.A.Q.rtf

@@ -29,7 +29,7 @@ All changes smcFanControl does to the fan controlling get lost after you shutdow
 
 \b I get a "smcFanControl has not been tested on this machine" warning. What does that mean?\
 
-\b0 Technically smcFanControl supports every intel mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
+\b0 Technically smcFanControl supports every Apple Silicon & Intel Mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
 \
 
 \b How can I restore the Apple defaults for fanspeed?\
@@ -73,7 +73,7 @@ Will there be a version of smcFanControl for Powerbooks or other PPC based Macs?
 
 \b Wouldn't it be even better to read out the temperature and set the fan speeds depending on the readout than just set the minimum fan speed and let automatic fan control as defined by apple do the rest?\
 
-\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. An intel mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
+\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. A Mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
 \
 
 \b I have got a MBP and smcFanControl is reporting 0rpm for one of my fans?\

Ressources/English.lproj/MainMenu.nib/designable.nib

@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10115" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10115"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="smcFanControl" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="21" userLabel="Window" customClass="StatusItemWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="519" y="155" width="337" height="436"/>
+            <rect key="contentRect" x="519" y="155" width="374" height="436"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="337" height="436"/>
+                <rect key="frame" x="0.0" y="0.0" width="374" height="436"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="439">
-                        <rect key="frame" x="20" y="292" width="297" height="99"/>
+                        <rect key="frame" x="20" y="292" width="334" height="99"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="ANX-d3-y3X">
-                            <rect key="frame" x="1" y="0.0" width="295" height="98"/>
+                            <rect key="frame" x="1" y="0.0" width="332" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="882" id="440">
-                                    <rect key="frame" x="0.0" y="0.0" width="295" height="75"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="332" height="75"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -109,24 +109,38 @@
                                                 </binding>
                                             </connections>
                                         </tableColumn>
+                                        <tableColumn identifier="automode" width="45" minWidth="45" maxWidth="1000" id="k7u-zt-Zu0">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Auto">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="pTb-gv-bpD">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="492" name="value" keyPath="arrangedObjects.auto" id="iMd-of-nPJ"/>
+                                            </connections>
+                                        </tableColumn>
                                     </tableColumns>
                                     <connections>
                                         <outlet property="delegate" destination="212" id="702"/>
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="875">
-                            <rect key="frame" x="1" y="84" width="295" height="14"/>
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="875">
+                            <rect key="frame" x="1" y="84" width="327" height="14"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="NO" id="873">
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="NO" id="873">
                             <rect key="frame" x="-100" y="-100" width="11" height="81"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="882">
-                            <rect key="frame" x="0.0" y="0.0" width="295" height="23"/>
+                            <rect key="frame" x="0.0" y="0.0" width="332" height="23"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
@@ -182,10 +196,10 @@
                         </connections>
                     </button>
                     <box title="Options" id="479">
-                        <rect key="frame" x="17" y="41" width="303" height="243"/>
+                        <rect key="frame" x="17" y="41" width="340" height="243"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView" id="ILw-66-YcF">
-                            <rect key="frame" x="2" y="2" width="299" height="226"/>
+                            <rect key="frame" x="3" y="3" width="334" height="225"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button id="455">
@@ -200,7 +214,7 @@
                                     </connections>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" id="456">
-                                    <rect key="frame" x="107" y="58" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="57" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="460" id="840">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -220,7 +234,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="461">
-                                    <rect key="frame" x="107" y="33" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="32" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="465" id="841">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -240,7 +254,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="466">
-                                    <rect key="frame" x="107" y="8" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="7" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="470" id="842">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -345,7 +359,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" id="609">
-                                    <rect key="frame" x="74" y="188" width="154" height="22"/>
+                                    <rect key="frame" x="74" y="187" width="196" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Icon only" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="631" id="849">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -377,7 +391,7 @@
                                     </connections>
                                 </button>
                                 <colorWell id="716">
-                                    <rect key="frame" x="233" y="192" width="39" height="17"/>
+                                    <rect key="frame" x="275" y="191" width="39" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                     <connections>
@@ -390,33 +404,7 @@
                                 </colorWell>
                             </subviews>
                         </view>
-                        <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                        <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     </box>
-                    <button verticalHuggingPriority="750" id="482">
-                        <rect key="frame" x="242" y="13" width="80" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="savePreferences:" target="212" id="550"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="483">
-                        <rect key="frame" x="159" y="13" width="85" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                            <string key="keyEquivalent">w</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="closePreferences:" target="212" id="485"/>
-                        </connections>
-                    </button>
                     <button hidden="YES" id="695">
                         <rect key="frame" x="97" y="289" width="85" height="22"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -429,8 +417,33 @@
                             <binding destination="486" name="value" keyPath="selection.sync" id="715"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" id="482">
+                        <rect key="frame" x="279" y="12" width="80" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="savePreferences:" target="212" id="550"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="483">
+                        <rect key="frame" x="196" y="12" width="85" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                            <string key="keyEquivalent">w</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="closePreferences:" target="212" id="485"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="128" y="146"/>
         </window>
         <customObject id="212" userLabel="FanControl" customClass="FanControl">
             <connections>
@@ -476,16 +489,17 @@
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="0.0" horizontalPageScroll="0.0" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="375">
                         <rect key="frame" x="0.0" y="0.0" width="575" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" id="ecH-fN-YuT">
+                        <clipView key="contentView" drawsBackground="NO" id="ecH-fN-YuT">
                             <rect key="frame" x="1" y="1" width="573" height="601"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
-                                <textView editable="NO" importsGraphics="NO" findStyle="panel" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="376">
+                                <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="376">
                                     <rect key="frame" x="0.0" y="0.0" width="573" height="3934"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <attributedString key="textStorage">
                                         <fragment>
                                             <mutableString key="content">		    GNU GENERAL PUBLIC LICENSE
@@ -770,23 +784,21 @@ POSSIBILITY OF SUCH DAMAGES.
 		     END OF TERMS AND CONDITIONS
 </mutableString>
                                             <attributes>
+                                                <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                 <font key="NSFont" size="12" name="Helvetica"/>
                                                 <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO"/>
                                             </attributes>
                                         </fragment>
                                     </attributedString>
                                     <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
                                 </textView>
                             </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="877">
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="877">
                             <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="876">
+                        <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="876">
                             <rect key="frame" x="558" y="1" width="16" height="601"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
@@ -942,6 +954,7 @@ POSSIBILITY OF SUCH DAMAGES.
                     </connections>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="-241" y="85"/>
         </menu>
         <arrayController automaticallyPreparesContent="YES" id="486" userLabel="Favorites">
             <declaredKeys>
@@ -961,6 +974,7 @@ POSSIBILITY OF SUCH DAMAGES.
                 <string>selspeed</string>
                 <string>sync</string>
                 <string>menu</string>
+                <string>auto</string>
             </declaredKeys>
             <connections>
                 <binding destination="486" name="contentArray" keyPath="selection.FanData" id="507"/>
@@ -990,7 +1004,7 @@ POSSIBILITY OF SUCH DAMAGES.
                         <autoresizingMask key="autoresizingMask"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="869">
                             <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
@@ -1051,28 +1065,26 @@ be used.</string>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="0.0" horizontalPageScroll="0.0" verticalLineScroll="0.0" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="621">
                         <rect key="frame" x="0.0" y="0.0" width="575" height="665"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <clipView key="contentView" id="cip-8t-T6q">
+                        <clipView key="contentView" drawsBackground="NO" id="cip-8t-T6q">
                             <rect key="frame" x="1" y="1" width="573" height="663"/>
                             <autoresizingMask key="autoresizingMask"/>
                             <subviews>
-                                <textView editable="NO" importsGraphics="NO" findStyle="panel" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="622">
+                                <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="622">
                                     <rect key="frame" x="0.0" y="0.0" width="573" height="663"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
                                 </textView>
                             </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="879">
+                        <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="879">
                             <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="878">
+                        <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="878">
                             <rect key="frame" x="-30" y="1" width="15" height="587"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>

Ressources/French.lproj/F.A.Q.rtf

@@ -29,7 +29,7 @@ Oui
 
 \b J'obtiens le message d'avertissement "smcFanControl n'a pas encore \'e9t\'e9 test\'e9 sur cette machine". Qu'est ce que cela signifie?\
 
-\b0 Techniquement, smcFanControl fonctionne avec tous les Mac intel, mais ces machines ont des valeurs par d\'e9faut diff\'e9rente. Si vous obtenez ce message, smcFanControl tente de lire la valeur par d\'e9faut directement du System Management Controller. Si vous suivez les instructions (ne pas lancer d'autres logiciels de gestion de ventilation, etc.) vous devriez pouvoir utiliser smcFanControl sur une machine que n'a pas encore \'e9t\'e9 test\'e9e par nos soins.\
+\b0 Techniquement, smcFanControl fonctionne avec tous les Mac Apple Silicon et Intel, mais ces machines ont des valeurs par d\'e9faut diff\'e9rente. Si vous obtenez ce message, smcFanControl tente de lire la valeur par d\'e9faut directement du System Management Controller. Si vous suivez les instructions (ne pas lancer d'autres logiciels de gestion de ventilation, etc.) vous devriez pouvoir utiliser smcFanControl sur une machine que n'a pas encore \'e9t\'e9 test\'e9e par nos soins.\
 \
 
 \b Comment revenir au valeur par d\'e9fauts d\'e9finies par Apple ?\
@@ -63,7 +63,7 @@ Toutefois, vous pouvez d\'e9finir une vitesse minimale sous OSX  puis red\'e9mar
 
 \b Ne serait-il pas mieux de d\'e9finir la vitesse de rotation en fonction de la temp\'e9rature plut\'f4t que de choisir une vitesse minimale et laisse Apple faire le reste ?\
 
-\b0 Oui, cette approche serait probablement plus int\'e9ressante. MAIS : cette m\'e9thode n'a pas \'e9t\'e9 retenue car elle comporte des risques. D\'e9finir la vitesse en fonction de la temp\'e9rature requiert un programme qui tourne en continue. Si ce programme crash ou devient incompatible \'e0 la suite d'une mise \'e0 jour, le ventilateur pourrait \'eatre d\'e9fini \'e0 une valeur trop basse qui pourrait endommager votre machine. D'autre part, cette logique est complexe \'e0 mettre en oeuvre. Un mac intel poss\'e8de une dizaine de sondes de temp\'e9rature, lues continuellement afin de d\'e9finir la vitesse ad\'e9quate de rotation des ventilateurs. Ainsi il ne serait pas judicieux de se reposer sur la lecture d'une seule sonde pour le contr\'f4le de la ventilation.\
+\b0 Oui, cette approche serait probablement plus int\'e9ressante. MAIS : cette m\'e9thode n'a pas \'e9t\'e9 retenue car elle comporte des risques. D\'e9finir la vitesse en fonction de la temp\'e9rature requiert un programme qui tourne en continue. Si ce programme crash ou devient incompatible \'e0 la suite d'une mise \'e0 jour, le ventilateur pourrait \'eatre d\'e9fini \'e0 une valeur trop basse qui pourrait endommager votre machine. D'autre part, cette logique est complexe \'e0 mettre en oeuvre. Un Mac poss\'e8de une dizaine de sondes de temp\'e9rature, lues continuellement afin de d\'e9finir la vitesse ad\'e9quate de rotation des ventilateurs. Ainsi il ne serait pas judicieux de se reposer sur la lecture d'une seule sonde pour le contr\'f4le de la ventilation.\
 \
 
 \b Je poss\'e8de un MBP et smcFanControl m'indique 0 rpm pour l'un des ventilateurs\

Ressources/French.lproj/MainMenu.nib/designable.nib

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.3.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.3.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="smcFanControl" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="21" userLabel="Window" customClass="StatusItemWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="519" y="155" width="337" height="436"/>
+            <rect key="contentRect" x="519" y="155" width="374" height="436"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="337" height="436"/>
+                <rect key="frame" x="0.0" y="0.0" width="374" height="436"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="439">
-                        <rect key="frame" x="20" y="292" width="297" height="99"/>
+                        <rect key="frame" x="20" y="292" width="334" height="99"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="y2T-Xg-EiJ">
-                            <rect key="frame" x="1" y="0.0" width="295" height="98"/>
+                            <rect key="frame" x="1" y="0.0" width="332" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="882" id="440">
-                                    <rect key="frame" x="0.0" y="0.0" width="295" height="73"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="332" height="73"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -109,6 +109,21 @@
                                                 </binding>
                                             </connections>
                                         </tableColumn>
+                                        <tableColumn identifier="automode" width="45" minWidth="45" maxWidth="1000" id="gzK-NS-I9b">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Auto">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="aSl-rs-xTL">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="492" name="value" keyPath="arrangedObjects.auto" id="QxJ-Zn-kTb"/>
+                                            </connections>
+                                        </tableColumn>
                                     </tableColumns>
                                     <connections>
                                         <outlet property="delegate" destination="212" id="702"/>
@@ -117,7 +132,7 @@
                             </subviews>
                         </clipView>
                         <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="875">
-                            <rect key="frame" x="1" y="84" width="295" height="14"/>
+                            <rect key="frame" x="1" y="84" width="326" height="14"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="small" horizontal="NO" id="873">
@@ -125,7 +140,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="882">
-                            <rect key="frame" x="0.0" y="0.0" width="295" height="25"/>
+                            <rect key="frame" x="0.0" y="0.0" width="332" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
@@ -181,10 +196,10 @@
                         </connections>
                     </button>
                     <box title="Options" id="479">
-                        <rect key="frame" x="17" y="41" width="303" height="243"/>
+                        <rect key="frame" x="17" y="41" width="340" height="243"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView" id="zxp-vV-Jsr">
-                            <rect key="frame" x="3" y="3" width="297" height="225"/>
+                            <rect key="frame" x="3" y="3" width="334" height="225"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button id="455">
@@ -199,14 +214,14 @@
                                     </connections>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" id="456">
-                                    <rect key="frame" x="107" y="57" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="57" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="840">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="840">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
                                         <menu key="menu" title="OtherViews" id="457">
                                             <items>
-                                                <menuItem title="Item1" state="on" id="460"/>
+                                                <menuItem title="Item1" id="460"/>
                                                 <menuItem title="Item2" id="459"/>
                                                 <menuItem title="Item3" id="458"/>
                                             </items>
@@ -219,14 +234,14 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="461">
-                                    <rect key="frame" x="107" y="32" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="32" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="841">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="841">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
                                         <menu key="menu" title="OtherViews" id="462">
                                             <items>
-                                                <menuItem title="Item1" state="on" id="465"/>
+                                                <menuItem title="Item1" id="465"/>
                                                 <menuItem title="Item2" id="464"/>
                                                 <menuItem title="Item3" id="463"/>
                                             </items>
@@ -239,14 +254,14 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="466">
-                                    <rect key="frame" x="107" y="7" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="7" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="842">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="842">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
                                         <menu key="menu" title="OtherViews" id="467">
                                             <items>
-                                                <menuItem title="Item1" state="on" id="470"/>
+                                                <menuItem title="Item1" id="470"/>
                                                 <menuItem title="Item2" id="469"/>
                                                 <menuItem title="Item3" id="468"/>
                                             </items>
@@ -344,14 +359,14 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" id="609">
-                                    <rect key="frame" x="74" y="187" width="154" height="22"/>
+                                    <rect key="frame" x="74" y="187" width="196" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <popUpButtonCell key="cell" type="push" title="Température &amp; Vitesse (multiligne)" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="849">
+                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="849">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                         <font key="font" metaFont="smallSystem"/>
                                         <menu key="menu" title="OtherViews" id="610">
                                             <items>
-                                                <menuItem title="Température &amp; Vitesse (multiligne)" state="on" id="613"/>
+                                                <menuItem title="Température &amp; Vitesse (multiligne)" id="613"/>
                                                 <menuItem title="Température &amp; Vitesse (une ligne)" id="616"/>
                                                 <menuItem title="Icone uniquement" tag="1" id="631"/>
                                                 <menuItem title="Température uniquement" tag="1" id="611"/>
@@ -376,7 +391,7 @@
                                     </connections>
                                 </button>
                                 <colorWell id="716">
-                                    <rect key="frame" x="233" y="192" width="39" height="17"/>
+                                    <rect key="frame" x="275" y="191" width="39" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                     <connections>
@@ -390,30 +405,6 @@
                             </subviews>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" id="482">
-                        <rect key="frame" x="240" y="13" width="84" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Enregistrer" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="savePreferences:" target="212" id="550"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="483">
-                        <rect key="frame" x="159" y="13" width="85" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Annuler" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                            <string key="keyEquivalent">w</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="closePreferences:" target="212" id="485"/>
-                        </connections>
-                    </button>
                     <button hidden="YES" id="695">
                         <rect key="frame" x="97" y="289" width="85" height="22"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -426,6 +417,30 @@
                             <binding destination="486" name="value" keyPath="selection.sync" id="715"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" id="482">
+                        <rect key="frame" x="275" y="12" width="84" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Enregistrer" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="851">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="savePreferences:" target="212" id="550"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="483">
+                        <rect key="frame" x="194" y="12" width="85" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Annuler" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="852">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                            <string key="keyEquivalent">w</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="closePreferences:" target="212" id="485"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
         </window>
@@ -483,7 +498,7 @@
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <attributedString key="textStorage">
                                         <fragment>
                                             <mutableString key="content">		    GNU GENERAL PUBLIC LICENSE
@@ -1055,7 +1070,7 @@ Gw
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
                             </subviews>

Ressources/German.lproj/F.A.Q.rtf

@@ -30,7 +30,7 @@ All changes smcFanControl does to the fan controlling get lost after you shutdow
 
 \b I get a "smcFanControl has not been tested on this machine" warning. What does that mean?\
 
-\b0 Technically smcFanControl supports every intel mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
+\b0 Technically smcFanControl supports every Apple Silicon & Intel Mac, but it does not come with defaults for every machine. If you get the warning, smcFanControl tries to read out the fan-details directly from the System Management Controller. If you follow the instructions (no other fan control software is running etc.) you should have no problem running smcFanControl on a machine it has not been tested on.\
 \
 
 \b How can I restore the Apple defaults for fanspeed?\
@@ -74,7 +74,7 @@ Will there be a version of smcFanControl for Powerbooks or other PPC based Macs?
 
 \b Wouldn't it be even better to read out the temperature and set the fan speeds depending on the readout than just set the minimum fan speed and let automatic fan control as defined by apple do the rest?\
 
-\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. An intel mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
+\b0 Yes, that approach is even better and could make your machine running cooler, when you are at higher loads. BUT: I did not take this route for smcFanControl, cause it has some risks. Adjusting the fan speed to CPU temperature requires you have a program running in the background (e.g. a daemon) that adjust fan speed continuously . If that program ever crashes or becomes incompatible cause of a System Update (or the readouts of the temperature sensor get inappropriate) , the fans could get set to a wrong (too low) speed and this could probably damage the machine. In addition to that the fan-control-logic is quite complicate. A Mac has about 10 temperature sensors, that are continuously read out and are used for monitoring and setting the right fan speeds. So it would be "not so great" to read out just the CPU temperature as a foundation for the fan-controlling.\
 \
 
 \b I have got a MBP and smcFanControl is reporting 0rpm for one of my fans?\

Ressources/German.lproj/Localizable.strings

@@ -12,7 +12,7 @@
 
 "Right Fan" = "Rechter Lüfter";
 
-"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl wurde auf Ihrem Computermodel noch nicht getestet! Es sollte jedoch problemlos funktionieren, wenn Sie die Hinweise beachten.\n\nBevor Sie auf Weiter klicken, stellen Sie sicher das keine andere FanControl-Software läuft. Sollte dies noch der Fall sein, wählen Sie Abbrechen, deinstallieren Sie die andere Software, starten Sie Ihren Rechner neu und rufen Sie smcFanControl erneut auf!";
+"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make sure you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl wurde auf Ihrem Computermodel noch nicht getestet! Es sollte jedoch problemlos funktionieren, wenn Sie die Hinweise beachten.\n\nBevor Sie auf Weiter klicken, stellen Sie sicher das keine andere FanControl-Software läuft. Sollte dies noch der Fall sein, wählen Sie Abbrechen, deinstallieren Sie die andere Software, starten Sie Ihren Rechner neu und rufen Sie smcFanControl erneut auf!";
 
 "Continue" = "Weiter";
 

Ressources/German.lproj/MainMenu.nib/designable.nib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.3.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.3.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -12,26 +12,26 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="smcFanControl" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="21" userLabel="Window" customClass="StatusItemWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="502" y="143" width="337" height="436"/>
+            <rect key="contentRect" x="502" y="143" width="379" height="436"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="337" height="436"/>
+                <rect key="frame" x="0.0" y="0.0" width="379" height="436"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="439">
-                        <rect key="frame" x="20" y="292" width="297" height="99"/>
+                        <rect key="frame" x="20" y="292" width="339" height="99"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="DKt-21-Bie">
-                            <rect key="frame" x="1" y="0.0" width="295" height="98"/>
+                            <rect key="frame" x="1" y="0.0" width="337" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="865" id="440">
-                                    <rect key="frame" x="0.0" y="0.0" width="295" height="73"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="337" height="73"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -117,6 +117,21 @@
                                                 </binding>
                                             </connections>
                                         </tableColumn>
+                                        <tableColumn identifier="automode" width="45" minWidth="45" maxWidth="1000" id="WUW-gq-Fnu">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Auto">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="f3L-oh-PyO">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="492" name="value" keyPath="arrangedObjects.auto" id="Rcc-Rt-kVD"/>
+                                            </connections>
+                                        </tableColumn>
                                     </tableColumns>
                                     <connections>
                                         <outlet property="delegate" destination="212" id="702"/>
@@ -133,7 +148,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="865">
-                            <rect key="frame" x="0.0" y="0.0" width="295" height="25"/>
+                            <rect key="frame" x="0.0" y="0.0" width="337" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
@@ -189,10 +204,10 @@
                         </connections>
                     </button>
                     <box title="Optionen" id="479">
-                        <rect key="frame" x="17" y="41" width="303" height="243"/>
+                        <rect key="frame" x="17" y="41" width="345" height="243"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView" id="wRA-yt-OSA">
-                            <rect key="frame" x="3" y="3" width="297" height="225"/>
+                            <rect key="frame" x="3" y="3" width="339" height="225"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button id="455">
@@ -207,7 +222,7 @@
                                     </connections>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" id="456">
-                                    <rect key="frame" x="107" y="57" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="57" width="215" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="460" id="834">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -227,7 +242,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="461">
-                                    <rect key="frame" x="107" y="32" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="32" width="215" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="465" id="835">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -247,7 +262,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="466">
-                                    <rect key="frame" x="107" y="7" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="7" width="215" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="470" id="836">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -352,7 +367,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" id="609">
-                                    <rect key="frame" x="74" y="187" width="154" height="22"/>
+                                    <rect key="frame" x="74" y="187" width="201" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Icon" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="631" id="843">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -384,7 +399,7 @@
                                     </connections>
                                 </button>
                                 <colorWell id="716">
-                                    <rect key="frame" x="233" y="192" width="39" height="17"/>
+                                    <rect key="frame" x="280" y="191" width="39" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                     <connections>
@@ -398,30 +413,6 @@
                             </subviews>
                         </view>
                     </box>
-                    <button verticalHuggingPriority="750" id="482">
-                        <rect key="frame" x="240" y="13" width="82" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Sichern" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="845">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="savePreferences:" target="212" id="550"/>
-                        </connections>
-                    </button>
-                    <button verticalHuggingPriority="750" id="483">
-                        <rect key="frame" x="157" y="13" width="85" height="28"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Abbrechen" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="846">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
-                            <string key="keyEquivalent">w</string>
-                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="closePreferences:" target="212" id="485"/>
-                        </connections>
-                    </button>
                     <button hidden="YES" id="695">
                         <rect key="frame" x="97" y="289" width="85" height="22"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -434,8 +425,33 @@
                             <binding destination="486" name="value" keyPath="selection.sync" id="715"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" id="482">
+                        <rect key="frame" x="282" y="14" width="82" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Sichern" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="845">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="savePreferences:" target="212" id="550"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" id="483">
+                        <rect key="frame" x="199" y="14" width="85" height="28"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="push" title="Abbrechen" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="846">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="smallSystem"/>
+                            <string key="keyEquivalent">w</string>
+                            <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="closePreferences:" target="212" id="485"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="159.5" y="147"/>
         </window>
         <customObject id="212" userLabel="FanControl" customClass="FanControl">
             <connections>
@@ -483,7 +499,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="V8B-kG-n4x">
                             <rect key="frame" x="1" y="1" width="573" height="601"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="376">
                                     <rect key="frame" x="0.0" y="0.0" width="573" height="3934"/>
@@ -491,7 +507,7 @@
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <attributedString key="textStorage">
                                         <fragment>
                                             <mutableString key="content">		    GNU GENERAL PUBLIC LICENSE
@@ -1058,7 +1074,7 @@ werden die Einstellungen des Favoriten
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="2D1-TY-lT6">
                             <rect key="frame" x="1" y="1" width="573" height="663"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES" spellingCorrection="YES" smartInsertDelete="YES" id="622">
                                     <rect key="frame" x="0.0" y="0.0" width="573" height="663"/>
@@ -1066,7 +1082,7 @@ werden die Einstellungen des Favoriten
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
                             </subviews>

Ressources/Machines.plist

@@ -572,5 +572,104 @@
 		<key>NumFans</key>
 		<integer>4</integer>
 	</dict>
+	<dict>
+		<key>Fans</key>
+		<array>
+			<dict>
+				<key>Description</key>
+				<string>Left Fan</string>
+				<key>Maxspeed</key>
+				<integer>5927</integer>
+				<key>Minspeed</key>
+				<real>2160</real>
+				<key>selspeed</key>
+				<integer>2160</integer>
+			</dict>
+			<dict>
+				<key>Description</key>
+				<string>Right Fan</string>
+				<key>Maxspeed</key>
+				<integer>5489</integer>
+				<key>Minspeed</key>
+				<real>2000</real>
+				<key>selspeed</key>
+				<integer>2000</integer>
+			</dict>
+		</array>
+		<key>Machine</key>
+		<string>MacBookPro15,1</string>
+		<key>Maxspeed</key>
+		<integer>5927</integer>
+		<key>Minspeed</key>
+		<integer>2000</integer>
+		<key>NumFans</key>
+		<integer>2</integer>
+	</dict>
+	<dict>
+		<key>Fans</key>
+		<array>
+			<dict>
+				<key>Description</key>
+				<string>Left Fan</string>
+				<key>Maxspeed</key>
+				<integer>5616</integer>
+				<key>Minspeed</key>
+				<real>1836</real>
+				<key>selspeed</key>
+				<integer>1836</integer>
+			</dict>
+			<dict>
+				<key>Description</key>
+				<string>Right Fan</string>
+				<key>Maxspeed</key>
+				<integer>5200</integer>
+				<key>Minspeed</key>
+				<real>1700</real>
+				<key>selspeed</key>
+				<integer>1700</integer>
+			</dict>
+		</array>
+		<key>Machine</key>
+		<string>MacBookPro16,1</string>
+		<key>Maxspeed</key>
+		<integer>5927</integer>
+		<key>Minspeed</key>
+		<integer>1700</integer>
+		<key>NumFans</key>
+		<integer>2</integer>
+	</dict>
+	<dict>
+		<key>Fans</key>
+		<array>
+			<dict>
+				<key>Description</key>
+				<string>Left Fan</string>
+				<key>Maxspeed</key>
+				<integer>4296</integer>
+				<key>Minspeed</key>
+				<integer>1499</integer>
+				<key>selspeed</key>
+				<integer>1499</integer>
+			</dict>
+			<dict>
+				<key>Description</key>
+				<string>Right Fan</string>
+				<key>Maxspeed</key>
+				<integer>4744</integer>
+				<key>Minspeed</key>
+				<integer>1499</integer>
+				<key>selspeed</key>
+				<integer>1499</integer>
+			</dict>
+		</array>
+		<key>Machine</key>
+		<string>MacBookPro18,1</string>
+		<key>Maxspeed</key>
+		<integer>4744</integer>
+		<key>Minspeed</key>
+		<integer>1499</integer>
+		<key>NumFans</key>
+		<integer>2</integer>
+	</dict>
 </array>
 </plist>

Ressources/Spanish.lproj/F.A.Q.rtf

@@ -29,7 +29,7 @@ Todos los cambios realizados por smcFanControl se pierden al apagar el ordenador
 
 \b Me sale el aviso "smcFanControl no ha sido probado en esta m\'e1quina". \'bfQu\'e9 significa?\
 
-\b0 T\'e9cnicamente smcFanControl funciona en todos los mac Intel, pero no trae los valores por defecto para todos los modelos. Si sale este aviso smcFanControl tratar\'e1 de leer los valores por defecto del SMC (System Management Controller) Si sigue las instrucciones (no hay otro controlador de ventiladoes, etc) no deber\'eda de tener ning\'fan problema en usarlo en un modelo en el que no haya sido probado a\'fan.\
+\b0 T\'e9cnicamente smcFanControl funciona en todos los Mac Apple Silicon o Intel, pero no trae los valores por defecto para todos los modelos. Si sale este aviso smcFanControl tratar\'e1 de leer los valores por defecto del SMC (System Management Controller) Si sigue las instrucciones (no hay otro controlador de ventiladoes, etc) no deber\'eda de tener ning\'fan problema en usarlo en un modelo en el que no haya sido probado a\'fan.\
 \
 
 \b \'bfComo puedo recobrar los valores por defecto de Apple para la velocidad de los ventiladores?\
@@ -73,7 +73,7 @@ b) La m\'e1quina se apaga.\
 
 \b \'bfNo ser\'eda mejor leer los valores de temperaura y ajustar la velocidad que limitarse a cambiar el valor m\'ednimo y dejar que el control autom\'e1tico de ventiladores de Apple haga el resto?\
 
-\b0 Si, ese camino es mejor y puede que haga que la m\'e1quina funcione m\'e1s fresca cuando la carga es alta... PERO: No eleg\'ed este camino por los los riesgos que tiene. Requiere un programa en segundo plano (un daemon) ajustando constantemente la velocidad. Si este programa es incompatible con una fuura actualiaci\'f3n del sistema o se cuelga puede fijar la velocidad a un valor demasiado bajo y estropear la m\'e1quina. Adem\'e1s la l\'f3gica que hay que a\'f1adir es muy complicada, un mac intel tiene en torno a 10 sensores de temperatura, con lo que simplemente "leer la temperatura de la CPU y ajustar el ventilador" no es tan buena idea.\
+\b0 Si, ese camino es mejor y puede que haga que la m\'e1quina funcione m\'e1s fresca cuando la carga es alta... PERO: No eleg\'ed este camino por los los riesgos que tiene. Requiere un programa en segundo plano (un daemon) ajustando constantemente la velocidad. Si este programa es incompatible con una fuura actualiaci\'f3n del sistema o se cuelga puede fijar la velocidad a un valor demasiado bajo y estropear la m\'e1quina. Adem\'e1s la l\'f3gica que hay que a\'f1adir es muy complicada, un Mac tiene en torno a 10 sensores de temperatura, con lo que simplemente "leer la temperatura de la CPU y ajustar el ventilador" no es tan buena idea.\
 \
 
 \b \'bfTengo un MBP y smcFanControl dice que un ventilador gira a 0rpm?\

Ressources/Spanish.lproj/Localizable.strings

@@ -1,6 +1,6 @@
-"Do you really want to delete the favorite %@?" = "¿Seguro qu desea eliminar el favorito: %@?";
+"Do you really want to delete the favorite %@?" = "¿Seguro que desea eliminar el favorito: %@?";
 
-"Yes" = "Si";
+"Yes" = "Sí";
 
 "No" = "No";
 
@@ -12,7 +12,7 @@
 
 "Right Fan" = "Ventilador derecho";
 
-"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl no ha sido probado en esta máquina, pero debería de funcionar si sigue esta insrucciones. \n\nSi decide continuar aseguresé de que no hay otro programa de control de ventiladores; si no salga, desinstale los otros programas, reinicie y lance otra vez smcFanControl";
+"smcFanControl has not been tested on this machine yet, but it should run if you follow the instructions. \n\nIf you choose to continue, please make sure you have no other FanControl-software running. Otherwise please quit, deinstall the other software, restart your machine and rerun smcFanControl!" = "smcFanControl no ha sido probado en esta máquina, pero debería de funcionar si sigue esta insrucciones. \n\nSi decide continuar asegúrese de que no hay otro programa de control de ventiladores; si es así salga, desinstale los otros programas, reinicie y lance otra vez smcFanControl";
 
 "Continue" = "Continuar";
 
@@ -22,20 +22,20 @@
 
 "Active Setting" = "Configuración activa";
 
-"Remind me later" = "Remind me later";
+"Remind me later" = "Recuérdame luego";
 
-"Consider a donation" = "Consider a donation";
+"Consider a donation" = "Considera una donación";
 
-"Never ask me again" = "Never ask me again";
+"Never ask me again" = "No volver a preguntar";
 
-"Donate over Paypal" = "Donate over Paypal";
+"Donate over Paypal" = "Dona mediante Paypal";
 
-"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated." = "smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated.";
+"smcFanControl keeps your Mac cool since 2006.\n\nIf smcFanControl is helfpul for you and you want to support further development, a small donation over Paypal is much appreciated." = "smcFanControl mantiene tu Mac fresco desde 2006.\nSi smcFanControl es útil para ti y quieres apoyar su desarrollo, apreciamos que nos aportes una pequeña donación a través de Paypal.";
 
-"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed." = "Do you want to reset smcFanControl to default settings?\nFavorites will be deleted and fans will return to default speed.";
+"Do you want to reset smcFanControl to default settings? Favorites will be deleted and fans will return to default speed." = "¿Desea restablecer la configuración predeterminada de smcFanControl?\n- Los favoritos se eliminarán y los ventiladores volverán a la velocidad predeterminada.";
 
-"Please shutdown your computer now to return to default fan settings." = "Please shutdown your computer now to return to default fan settings.";
+"Please shutdown your computer now to return to default fan settings." = "Por favor, apaga el ordenador ahora  para restaurar la configuración de los ventiladores";
 
-"Reset Settings" = "Reset Settings";
+"Reset Settings" = "Ajustes de fábrica";
 
-"Shutdown required" = "Shutdown required";
+"Shutdown required" = "Se necesita apagar";

Ressources/Spanish.lproj/MainMenu.nib/designable.nib

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.3.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.3.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="smcFanControl" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="21" userLabel="Window" customClass="StatusItemWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="519" y="155" width="337" height="436"/>
+            <rect key="contentRect" x="519" y="155" width="374" height="436"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <value key="minSize" type="size" width="213" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="337" height="436"/>
+                <rect key="frame" x="0.0" y="0.0" width="374" height="436"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="439">
-                        <rect key="frame" x="20" y="292" width="297" height="99"/>
+                        <rect key="frame" x="20" y="292" width="334" height="99"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <clipView key="contentView" id="mtH-6o-sbq">
-                            <rect key="frame" x="1" y="0.0" width="295" height="98"/>
+                            <rect key="frame" x="1" y="0.0" width="332" height="98"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="820" id="440">
-                                    <rect key="frame" x="0.0" y="0.0" width="295" height="73"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="332" height="73"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -109,6 +109,21 @@
                                                 </binding>
                                             </connections>
                                         </tableColumn>
+                                        <tableColumn identifier="automode" width="45" minWidth="45" maxWidth="1000" id="ZKX-An-ioU">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Auto">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" inset="2" id="JH9-Pj-wdb">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                            </buttonCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="492" name="value" keyPath="arrangedObjects.auto" id="IBd-rw-4Cs"/>
+                                            </connections>
+                                        </tableColumn>
                                     </tableColumns>
                                     <connections>
                                         <outlet property="delegate" destination="212" id="702"/>
@@ -125,7 +140,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="820">
-                            <rect key="frame" x="0.0" y="0.0" width="295" height="25"/>
+                            <rect key="frame" x="0.0" y="0.0" width="332" height="25"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>
@@ -181,10 +196,10 @@
                         </connections>
                     </button>
                     <box title="Opciones" id="479">
-                        <rect key="frame" x="17" y="41" width="303" height="243"/>
+                        <rect key="frame" x="17" y="41" width="340" height="243"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <view key="contentView" id="khz-IF-ocy">
-                            <rect key="frame" x="3" y="3" width="297" height="225"/>
+                            <rect key="frame" x="3" y="3" width="334" height="225"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button id="455">
@@ -199,7 +214,7 @@
                                     </connections>
                                 </button>
                                 <popUpButton verticalHuggingPriority="750" id="456">
-                                    <rect key="frame" x="107" y="57" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="57" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="460" id="786">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -219,7 +234,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="461">
-                                    <rect key="frame" x="107" y="32" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="32" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="465" id="787">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -239,7 +254,7 @@
                                     </connections>
                                 </popUpButton>
                                 <popUpButton verticalHuggingPriority="750" id="466">
-                                    <rect key="frame" x="107" y="7" width="168" height="22"/>
+                                    <rect key="frame" x="107" y="7" width="210" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="470" id="788">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -344,7 +359,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" id="609">
-                                    <rect key="frame" x="54" y="187" width="174" height="22"/>
+                                    <rect key="frame" x="54" y="187" width="216" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
                                     <popUpButtonCell key="cell" type="push" title="Sólo icono" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="631" id="795">
                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -376,7 +391,7 @@
                                     </connections>
                                 </button>
                                 <colorWell id="716">
-                                    <rect key="frame" x="233" y="192" width="39" height="17"/>
+                                    <rect key="frame" x="275" y="191" width="39" height="17"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <color key="color" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                     <connections>
@@ -483,7 +498,7 @@
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="601"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <attributedString key="textStorage">
                                         <fragment>
                                             <mutableString key="content">		    GNU GENERAL PUBLIC LICENSE
@@ -1055,7 +1070,7 @@ Gw
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <size key="minSize" width="573" height="663"/>
-                                    <size key="maxSize" width="573" height="10000000"/>
+                                    <size key="maxSize" width="575" height="10000000"/>
                                     <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 </textView>
                             </subviews>

Sparkle.framework/Autoupdate

@@ -0,0 +1 @@
+Versions/Current/Autoupdate

Sparkle.framework/Updater.app

@@ -0,0 +1 @@
+Versions/Current/Updater.app

Sparkle.framework/Versions/A/Headers/SUAppcast.h

@@ -1,27 +0,0 @@
-//
-//  SUAppcast.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUAPPCAST_H
-#define SUAPPCAST_H
-
-#import <Foundation/Foundation.h>
-#import "SUExport.h"
-
-@class SUAppcastItem;
-SU_EXPORT @interface SUAppcast : NSObject<NSURLDownloadDelegate>
-
-@property (copy) NSString *userAgentString;
-@property (copy) NSDictionary *httpHeaders;
-
-- (void)fetchAppcastFromURL:(NSURL *)url completionBlock:(void (^)(NSError *))err;
-- (SUAppcast *)copyWithoutDeltaUpdates;
-
-@property (readonly, copy) NSArray *items;
-@end
-
-#endif

Sparkle.framework/Versions/A/Headers/SUAppcastItem.h

@@ -1,44 +0,0 @@
-//
-//  SUAppcastItem.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/12/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUAPPCASTITEM_H
-#define SUAPPCASTITEM_H
-
-#import <Foundation/Foundation.h>
-#import "SUExport.h"
-
-SU_EXPORT @interface SUAppcastItem : NSObject
-@property (copy, readonly) NSString *title;
-@property (copy, readonly) NSDate *date;
-@property (copy, readonly) NSString *itemDescription;
-@property (strong, readonly) NSURL *releaseNotesURL;
-@property (copy, readonly) NSString *DSASignature;
-@property (copy, readonly) NSString *minimumSystemVersion;
-@property (copy, readonly) NSString *maximumSystemVersion;
-@property (strong, readonly) NSURL *fileURL;
-@property (copy, readonly) NSString *versionString;
-@property (copy, readonly) NSString *displayVersionString;
-@property (copy, readonly) NSDictionary *deltaUpdates;
-@property (strong, readonly) NSURL *infoURL;
-
-// Initializes with data from a dictionary provided by the RSS class.
-- (instancetype)initWithDictionary:(NSDictionary *)dict;
-- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error;
-
-@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
-@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
-@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
-
-// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
-@property (readonly, copy) NSDictionary *propertiesDictionary;
-
-- (NSURL *)infoURL;
-
-@end
-
-#endif

Sparkle.framework/Versions/A/Headers/SUErrors.h

@@ -1,47 +0,0 @@
-//
-//  SUErrors.h
-//  Sparkle
-//
-//  Created by C.W. Betts on 10/13/14.
-//  Copyright (c) 2014 Sparkle Project. All rights reserved.
-//
-
-#ifndef SUERRORS_H
-#define SUERRORS_H
-
-#import <Foundation/Foundation.h>
-#import "SUExport.h"
-
-/**
- * Error domain used by Sparkle
- */
-SU_EXPORT extern NSString *const SUSparkleErrorDomain;
-
-typedef NS_ENUM(OSStatus, SUError) {
-    // Appcast phase errors.
-    SUAppcastParseError = 1000,
-    SUNoUpdateError = 1001,
-    SUAppcastError = 1002,
-    SURunningFromDiskImageError = 1003,
-    
-    // Downlaod phase errors.
-    SUTemporaryDirectoryError = 2000,
-    
-    // Extraction phase errors.
-    SUUnarchivingError = 3000,
-    SUSignatureError = 3001,
-    
-    // Installation phase errors.
-    SUFileCopyFailure = 4000,
-    SUAuthenticationFailure = 4001,
-    SUMissingUpdateError = 4002,
-    SUMissingInstallerToolError = 4003,
-    SURelaunchError = 4004,
-    SUInstallationError = 4005,
-    SUDowngradeError = 4006,
-    
-    // System phase errors
-    SUSystemPowerOffError = 5000
-};
-
-#endif

Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h

@@ -1,38 +0,0 @@
-//
-//  SUStandardVersionComparator.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 12/21/07.
-//  Copyright 2007 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUSTANDARDVERSIONCOMPARATOR_H
-#define SUSTANDARDVERSIONCOMPARATOR_H
-
-#import <Foundation/Foundation.h>
-#import "SUExport.h"
-#import "SUVersionComparisonProtocol.h"
-
-/*!
-    Sparkle's default version comparator.
-
-    This comparator is adapted from MacPAD, by Kevin Ballard.
-    It's "dumb" in that it does essentially string comparison,
-    in components split by character type.
-*/
-SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
-
-/*!
-    Returns a singleton instance of the comparator.
-*/
-+ (SUStandardVersionComparator *)defaultComparator;
-
-/*!
-    Compares version strings through textual analysis.
-
-    See the implementation for more details.
-*/
-- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
-@end
-
-#endif

Sparkle.framework/Versions/A/Headers/SUUpdater.h

@@ -1,366 +0,0 @@
-//
-//  SUUpdater.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 1/4/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUUPDATER_H
-#define SUUPDATER_H
-
-#import <Foundation/Foundation.h>
-#import "SUExport.h"
-#import "SUVersionComparisonProtocol.h"
-#import "SUVersionDisplayProtocol.h"
-
-@class SUAppcastItem, SUAppcast;
-
-@protocol SUUpdaterDelegate;
-
-/*!
-    The main API in Sparkle for controlling the update mechanism.
-
-    This class is used to configure the update paramters as well as manually
-    and automatically schedule and control checks for updates.
- */
-SU_EXPORT @interface SUUpdater : NSObject
-
-@property (unsafe_unretained) IBOutlet id<SUUpdaterDelegate> delegate;
-
-+ (SUUpdater *)sharedUpdater;
-+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
-- (instancetype)initForBundle:(NSBundle *)bundle;
-
-@property (readonly, strong) NSBundle *hostBundle;
-@property (strong, readonly) NSBundle *sparkleBundle;
-
-@property BOOL automaticallyChecksForUpdates;
-
-@property NSTimeInterval updateCheckInterval;
-
-/*!
- * The URL of the appcast used to download update information.
- *
- * This property must be called on the main thread.
- */
-@property (copy) NSURL *feedURL;
-
-@property (nonatomic, copy) NSString *userAgentString;
-
-@property (copy) NSDictionary *httpHeaders;
-
-@property BOOL sendsSystemProfile;
-
-@property BOOL automaticallyDownloadsUpdates;
-
-@property (nonatomic, copy) NSString *decryptionPassword;
-
-/*!
-    Explicitly checks for updates and displays a progress dialog while doing so.
-
-    This method is meant for a main menu item.
-    Connect any menu item to this action in Interface Builder,
-    and Sparkle will check for updates and report back its findings verbosely
-    when it is invoked.
- */
-- (IBAction)checkForUpdates:(id)sender;
-
-/*!
-    Checks for updates, but does not display any UI unless an update is found.
-
-    This is meant for programmatically initating a check for updates. That is,
-    it will display no UI unless it actually finds an update, in which case it
-    proceeds as usual.
-
-    If the fully automated updating is turned on, however, this will invoke that
-    behavior, and if an update is found, it will be downloaded and prepped for
-    installation.
- */
-- (void)checkForUpdatesInBackground;
-
-/*!
-    Checks for updates and, if available, immediately downloads and installs them.
-    A progress dialog is shown but the user will never be prompted to read the
-    release notes.
-    
-    You may want to respond to the userDidCancelDownload delegate method in case
-    the user clicks the "Cancel" button while the update is downloading.
- */
-- (void)installUpdatesIfAvailable;
-
-/*!
-    Returns the date of last update check.
-
-    \returns \c nil if no check has been performed.
- */
-@property (readonly, copy) NSDate *lastUpdateCheckDate;
-
-/*!
-    Begins a "probing" check for updates which will not actually offer to
-    update to that version.
-
-    However, the delegate methods
-    SUUpdaterDelegate::updater:didFindValidUpdate: and
-    SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
-    so you can use that information in your UI.
- */
-- (void)checkForUpdateInformation;
-
-/*!
-    Appropriately schedules or cancels the update checking timer according to
-    the preferences for time interval and automatic checks.
-
-    This call does not change the date of the next check,
-    but only the internal NSTimer.
- */
-- (void)resetUpdateCycle;
-
-@property (readonly) BOOL updateInProgress;
-
-@end
-
-// -----------------------------------------------------------------------------
-// SUUpdater Notifications for events that might be interesting to more than just the delegate
-// The updater will be the notification object
-// -----------------------------------------------------------------------------
-SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
-#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
-#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
-
-// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
-// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
-
-// -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-/*!
-    Provides methods to control the behavior of an SUUpdater object.
- */
-@protocol SUUpdaterDelegate <NSObject>
-@optional
-
-/*!
-    Returns whether to allow Sparkle to pop up.
-
-    For example, this may be used to prevent Sparkle from interrupting a setup assistant.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Returns additional parameters to append to the appcast URL's query string.
-
-    This is potentially based on whether or not Sparkle will also be sending along the system profile.
-
-    \param updater The SUUpdater instance.
-    \param sendingProfile Whether the system profile will also be sent.
-
-    \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- */
-- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-
-/*!
-    Returns a custom appcast URL.
-
-    Override this to dynamically specify the entire URL.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns whether Sparkle should prompt the user about automatic update checks.
-
-    Use this to override the default behavior.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
-
-/*!
-    Called after Sparkle has downloaded the appcast from the remote server.
-
-    Implement this if you want to do some special handling with the appcast once it finishes loading.
-
-    \param updater The SUUpdater instance.
-    \param appcast The appcast that was downloaded from the remote server.
- */
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-/*!
-    Returns the item in the appcast corresponding to the update that should be installed.
-
-    If you're using special logic or extensions in your appcast,
-    implement this to use your own logic for finding a valid update, if any,
-    in the given appcast.
-
-    \param appcast The appcast that was downloaded from the remote server.
-    \param updater The SUUpdater instance.
- */
-- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
-
-/*!
-    Called when a valid update is found by the update driver.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
-
-/*!
-    Called when a valid update is not found.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
-
-/*!
-    Called immediately before downloading the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be downloaded.
-    \param request The mutable URL request that will be used to download the update.
- */
-- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
-
-/*!
-    Called after the specified update failed to download.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that failed to download.
-    \param error The error generated by the failed download.
- */
-- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
-
-/*!
-    Called when the user clicks the cancel button while and update is being downloaded.
-
-    \param updater The SUUpdater instance.
- */
-- (void)userDidCancelDownload:(SUUpdater *)updater;
-
-/*!
-    Called immediately before installing the specified update.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
-
-/*!
-    Returns whether the relaunch should be delayed in order to perform other tasks.
-
-    This is not called if the user didn't relaunch on the previous update,
-    in that case it will immediately restart.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation The invocation that must be completed before continuing with the relaunch.
-
-    \return \c YES to delay the relaunch until \p invocation is invoked.
- */
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
-
-/*!
-    Returns whether the application should be relaunched at all.
-
-    Some apps \b cannot be relaunched under certain circumstances.
-    This method can be used to explicitly prevent a relaunch.
-
-    \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Called immediately before relaunching.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
-
-/*!
-    Returns an object that compares version numbers to determine their arithmetic relation to each other.
-
-    This method allows you to provide a custom version comparator.
-    If you don't implement this method or return \c nil,
-    the standard version comparator will be used.
-
-    \sa SUStandardVersionComparator
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns an object that formats version numbers for display to the user.
-
-    If you don't implement this method or return \c nil,
-    the standard version formatter will be used.
-
-    \sa SUUpdateAlert
-
-    \param updater The SUUpdater instance.
- */
-- (id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
-
-/*!
-    Returns the path which is used to relaunch the client after the update is installed.
-
-    The default is the path of the host bundle.
-
-    \param updater The SUUpdater instance.
- */
-- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
-
-/*!
-    Called before an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called after an updater shows a modal alert window,
-    to give the host the opportunity to hide attached windows that may get in the way.
-
-    \param updater The SUUpdater instance.
- */
-- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
-
-/*!
-    Called when an update is scheduled to be silently installed on quit.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that is proposed to be installed.
-    \param invocation Can be used to trigger an immediate silent install and relaunch.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
-
-/*!
-    Calls after an update that was scheduled to be silently installed on quit has been canceled.
-
-    \param updater The SUUpdater instance.
-    \param item The appcast item corresponding to the update that was proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
-
-/*!
-    Called after an update is aborted due to an error.
-
-    \param updater The SUUpdater instance.
-    \param error The error that caused the abort
- */
-- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
-
-@end
-
-#endif

Sparkle.framework/Versions/A/Headers/Sparkle.h

@@ -1,25 +0,0 @@
-//
-//  Sparkle.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SPARKLE_H
-#define SPARKLE_H
-
-#import <Cocoa/Cocoa.h>
-
-// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
-// there are name-space collisions) so we can list all of them to start with:
-
-#import "SUAppcast.h"
-#import "SUAppcastItem.h"
-#import "SUStandardVersionComparator.h"
-#import "SUUpdater.h"
-#import "SUVersionComparisonProtocol.h"
-#import "SUVersionDisplayProtocol.h"
-#import "SUErrors.h"
-
-#endif

Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h

@@ -1,36 +0,0 @@
-//
-//  SUUnarchiver.h
-//  Sparkle
-//
-//  Created by Andy Matuschak on 3/16/06.
-//  Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUUNARCHIVER_H
-#define SUUNARCHIVER_H
-
-#import <Foundation/Foundation.h>
-
-@class SUHost;
-@protocol SUUnarchiverDelegate;
-
-@interface SUUnarchiver : NSObject
-
-@property (copy, readonly) NSString *archivePath;
-@property (copy, readonly) NSString *updateHostBundlePath;
-@property (copy, readonly) NSString *decryptionPassword;
-@property (weak) id<SUUnarchiverDelegate> delegate;
-
-+ (SUUnarchiver *)unarchiverForPath:(NSString *)path updatingHostBundlePath:(NSString *)host withPassword:(NSString *)decryptionPassword;
-
-- (void)start;
-@end
-
-@protocol SUUnarchiverDelegate <NSObject>
-- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver;
-- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver;
-@optional
-- (void)unarchiver:(SUUnarchiver *)unarchiver extractedProgress:(double)progress;
-@end
-
-#endif

Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist

@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ADP2,1</key>
-	<string>Developer Transition Kit</string>
-	<key>iMac1,1</key>
-	<string>iMac G3 (Rev A-D)</string>
-	<key>iMac4,1</key>
-	<string>iMac (Core Duo)</string>
-	<key>iMac4,2</key>
-	<string>iMac for Education (17 inch, Core Duo)</string>
-	<key>iMac5,1</key>
-	<string>iMac (Core 2 Duo, 17 or 20 inch, SuperDrive)</string>
-	<key>iMac5,2</key>
-	<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
-	<key>iMac6,1</key>
-	<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
-	<key>iMac7,1</key>
-	<string>iMac Intel Core 2 Duo (aluminum enclosure)</string>
-	<key>iMac8,1</key>
-	<string>iMac (Core 2 Duo, 20 or 24 inch, Early 2008 )</string>
-	<key>iMac9,1</key>
-	<string>iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 )</string>
-	<key>iMac10,1</key>
-	<string>iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 )</string>
-	<key>iMac11,1</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2009)</string>
-	<key>iMac11,2</key>
-	<string>21.5&quot; iMac (mid 2010)</string>
-	<key>iMac11,3</key>
-	<string>iMac (Core i5 or i7, 27 inch Mid 2010)</string>
-	<key>iMac12,1</key>
-	<string>iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011)</string>
-	<key>iMac12,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Mid 2011)</string>
-	<key>iMac13,1</key>
-	<string>iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013)</string>
-	<key>iMac13,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2012)</string>
-	<key>iMac14,1</key>
-	<string>iMac (Core i5, 21.5 inch Late 2013)</string>
-	<key>iMac14,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2013)</string>
-	<key>iMac14,3</key>
-	<string>iMac (Core i5 or i7, 21.5 inch Late 2013)</string>
-	<key>iMac14,4</key>
-	<string>iMac (Core i5, 21.5 inch Mid 2014)</string>
-	<key>iMac15,1</key>
-	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015)</string>
-	<key>iMac16,1</key>
-	<string>iMac (Core i5, 21,5 inch Late 2015)</string>
-	<key>iMac16,2</key>
-	<string>iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015)</string>
-	<key>iMac17,1</key>
-	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2015)</string>
-	<key>MacBook1,1</key>
-	<string>MacBook (Core Duo)</string>
-	<key>MacBook2,1</key>
-	<string>MacBook (Core 2 Duo)</string>
-	<key>MacBook4,1</key>
-	<string>MacBook (Core 2 Duo Feb 2008)</string>
-	<key>MacBook5,1</key>
-	<string>MacBook (Core 2 Duo, Late 2008, Unibody)</string>
-	<key>MacBook5,2</key>
-	<string>MacBook (Core 2 Duo, Early 2009, White)</string>
-	<key>MacBook6,1</key>
-	<string>MacBook (Core 2 Duo, Late 2009, Unibody)</string>
-	<key>MacBook7,1</key>
-	<string>MacBook (Core 2 Duo, Mid 2010, White)</string>
-	<key>MacBook8,1</key>
-	<string>MacBook (Core M, 12 inch, Early 2015)</string>
-	<key>MacBookAir1,1</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Early 2008)</string>
-	<key>MacBookAir2,1</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Mid 2009)</string>
-	<key>MacBookAir3,1</key>
-	<string>MacBook Air (Core 2 Duo, 11 inch, Late 2010)</string>
-	<key>MacBookAir3,2</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Late 2010)</string>
-	<key>MacBookAir4,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2011)</string>
-	<key>MacBookAir4,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2011)</string>
-	<key>MacBookAir5,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2012)</string>
-	<key>MacBookAir5,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2012)</string>
-	<key>MacBookAir6,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014)</string>
-	<key>MacBookAir6,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014)</string>
-	<key>MacBookAir7,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Early 2015)</string>
-	<key>MacBookAir7,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Early 2015)</string>
-	<key>MacBookPro1,1</key>
-	<string>MacBook Pro Core Duo (15-inch)</string>
-	<key>MacBookPro1,2</key>
-	<string>MacBook Pro Core Duo (17-inch)</string>
-	<key>MacBookPro2,1</key>
-	<string>MacBook Pro Core 2 Duo (17-inch)</string>
-	<key>MacBookPro2,2</key>
-	<string>MacBook Pro Core 2 Duo (15-inch)</string>
-	<key>MacBookPro3,1</key>
-	<string>MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo)</string>
-	<key>MacBookPro3,2</key>
-	<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
-	<key>MacBookPro4,1</key>
-	<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
-	<key>MacBookPro5,1</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,2</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,3</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,4</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,5</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro6,1</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
-	<key>MacBookPro6,2</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
-	<key>MacBookPro7,1</key>
-	<string>MacBook Pro Intel Core 2 Duo (mid 2010)</string>
-	<key>MacBookPro8,1</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7, 13&quot; (early 2011)</string>
-	<key>MacBookPro8,2</key>
-	<string>MacBook Pro Intel Core i7, 15&quot; (early 2011)</string>
-	<key>MacBookPro8,3</key>
-	<string>MacBook Pro Intel Core i7, 17&quot; (early 2011)</string>
-	<key>MacBookPro9,1</key>
-	<string>MacBook Pro (15-inch, Mid 2012)</string>
-	<key>MacBookPro9,2</key>
-	<string>MacBook Pro (13-inch, Mid 2012)</string>
-	<key>MacBookPro10,1</key>
-	<string>MacBook Pro (Retina, Mid 2012)</string>
-	<key>MacBookPro10,2</key>
-	<string>MacBook Pro (Retina, 13-inch, Late 2012)</string>
-	<key>MacBookPro11,1</key>
-	<string>MacBook Pro (Retina, 13-inch, Late 2013)</string>
-	<key>MacBookPro11,2</key>
-	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
-	<key>MacBookPro11,3</key>
-	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
-	<key>MacbookPro11,4</key>
-	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
-	<key>MacbookPro11,5</key>
-	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
-	<key>MacbookPro12,1 </key>
-	<string>MacBook Pro (Retina, 13-inch, Early 2015)</string>
-	<key>Macmini1,1</key>
-	<string>Mac Mini (Core Solo/Duo)</string>
-	<key>Macmini2,1</key>
-	<string>Mac mini Intel Core</string>
-	<key>Macmini3,1</key>
-	<string>Mac mini Intel Core</string>
-	<key>Macmini4,1</key>
-	<string>Mac mini Intel Core (Mid 2010)</string>
-	<key>Macmini5,1</key>
-	<string>Mac mini (Core i5, Mid 2011)</string>
-	<key>Macmini5,2</key>
-	<string>Mac mini (Core i5 or Core i7, Mid 2011)</string>
-	<key>Macmini5,3</key>
-	<string>Mac mini (Core i7, Server, Mid 2011)</string>
-	<key>Macmini6,1</key>
-	<string>Mac mini (Core i5, Late 2012)</string>
-	<key>Macmini6,2</key>
-	<string>Mac mini (Core i7, Normal or Server, Late 2012)</string>
-	<key>Macmini7,1</key>
-	<string>Mac mini (Core i5 or Core i7, Late 2014)</string>
-	<key>MacPro1,1,Quad</key>
-	<string>Mac Pro</string>
-	<key>MacPro1,1</key>
-	<string>Mac Pro (four-core)</string>
-	<key>MacPro2,1</key>
-	<string>Mac Pro (eight-core)</string>
-	<key>MacPro3,1</key>
-	<string>Mac Pro (January 2008 4- or 8- core &quot;Harpertown&quot;)</string>
-	<key>MacPro4,1</key>
-	<string>Mac Pro (March 2009)</string>
-	<key>MacPro5,1</key>
-	<string>Mac Pro (2010 or 2012)</string>
-	<key>MacPro6,1</key>
-	<string>Mac Pro (Late 2013)</string>
-	<key>PowerBook1,1</key>
-	<string>PowerBook G3</string>
-	<key>PowerBook2,1</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,2</key>
-	<string>iBook G3 (FireWire)</string>
-	<key>PowerBook2,3</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,4</key>
-	<string>iBook G3</string>
-	<key>PowerBook3,1</key>
-	<string>PowerBook G3 (FireWire)</string>
-	<key>PowerBook3,2</key>
-	<string>PowerBook G4</string>
-	<key>PowerBook3,3</key>
-	<string>PowerBook G4 (Gigabit Ethernet)</string>
-	<key>PowerBook3,4</key>
-	<string>PowerBook G4 (DVI)</string>
-	<key>PowerBook3,5</key>
-	<string>PowerBook G4 (1GHz / 867MHz)</string>
-	<key>PowerBook4,1</key>
-	<string>iBook G3 (Dual USB, Late 2001)</string>
-	<key>PowerBook4,2</key>
-	<string>iBook G3 (16MB VRAM)</string>
-	<key>PowerBook4,3</key>
-	<string>iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003)</string>
-	<key>PowerBook5,1</key>
-	<string>PowerBook G4 (17 inch)</string>
-	<key>PowerBook5,2</key>
-	<string>PowerBook G4 (15 inch FW 800)</string>
-	<key>PowerBook5,3</key>
-	<string>PowerBook G4 (17-inch 1.33GHz)</string>
-	<key>PowerBook5,4</key>
-	<string>PowerBook G4 (15 inch 1.5/1.33GHz)</string>
-	<key>PowerBook5,5</key>
-	<string>PowerBook G4 (17-inch 1.5GHz)</string>
-	<key>PowerBook5,6</key>
-	<string>PowerBook G4 (15 inch 1.67GHz/1.5GHz)</string>
-	<key>PowerBook5,7</key>
-	<string>PowerBook G4 (17-inch 1.67GHz)</string>
-	<key>PowerBook5,8</key>
-	<string>PowerBook G4 (Double layer SD, 15 inch)</string>
-	<key>PowerBook5,9</key>
-	<string>PowerBook G4 (Double layer SD, 17 inch)</string>
-	<key>PowerBook6,1</key>
-	<string>PowerBook G4 (12 inch)</string>
-	<key>PowerBook6,2</key>
-	<string>PowerBook G4 (12 inch, DVI)</string>
-	<key>PowerBook6,3</key>
-	<string>iBook G4</string>
-	<key>PowerBook6,4</key>
-	<string>PowerBook G4 (12 inch 1.33GHz)</string>
-	<key>PowerBook6,5</key>
-	<string>iBook G4 (Early-Late 2004)</string>
-	<key>PowerBook6,7</key>
-	<string>iBook G4 (Mid 2005)</string>
-	<key>PowerBook6,8</key>
-	<string>PowerBook G4 (12 inch 1.5GHz)</string>
-	<key>PowerMac1,1</key>
-	<string>Power Macintosh G3 (Blue &amp; White)</string>
-	<key>PowerMac1,2</key>
-	<string>Power Macintosh G4 (PCI Graphics)</string>
-	<key>PowerMac2,1</key>
-	<string>iMac G3 (Slot-loading CD-ROM)</string>
-	<key>PowerMac2,2</key>
-	<string>iMac G3 (Summer 2000)</string>
-	<key>PowerMac3,1</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,2</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,3</key>
-	<string>Power Macintosh G4 (Gigabit Ethernet)</string>
-	<key>PowerMac3,4</key>
-	<string>Power Macintosh G4 (Digital Audio)</string>
-	<key>PowerMac3,5</key>
-	<string>Power Macintosh G4 (Quick Silver)</string>
-	<key>PowerMac3,6</key>
-	<string>Power Macintosh G4 (Mirrored Drive Door)</string>
-	<key>PowerMac4,1</key>
-	<string>iMac G3 (Early/Summer 2001)</string>
-	<key>PowerMac4,2</key>
-	<string>iMac G4 (Flat Panel)</string>
-	<key>PowerMac4,4</key>
-	<string>eMac</string>
-	<key>PowerMac4,5</key>
-	<string>iMac G4 (17-inch Flat Panel)</string>
-	<key>PowerMac5,1</key>
-	<string>Power Macintosh G4 Cube</string>
-	<key>PowerMac5,2</key>
-	<string>Power Mac G4 Cube</string>
-	<key>PowerMac6,1</key>
-	<string>iMac G4 (USB 2.0)</string>
-	<key>PowerMac6,3</key>
-	<string>iMac G4 (20-inch Flat Panel)</string>
-	<key>PowerMac6,4</key>
-	<string>eMac (USB 2.0, 2005)</string>
-	<key>PowerMac7,2</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac7,3</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac8,1</key>
-	<string>iMac G5</string>
-	<key>PowerMac8,2</key>
-	<string>iMac G5 (Ambient Light Sensor)</string>
-	<key>PowerMac9,1</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac10,1</key>
-	<string>Mac Mini G4</string>
-	<key>PowerMac10,2</key>
-	<string>Mac Mini (Late 2005)</string>
-	<key>PowerMac11,2</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac12,1</key>
-	<string>iMac G5 (iSight)</string>
-	<key>RackMac1,1</key>
-	<string>Xserve G4</string>
-	<key>RackMac1,2</key>
-	<string>Xserve G4 (slot-loading, cluster node)</string>
-	<key>RackMac3,1</key>
-	<string>Xserve G5</string>
-	<key>Xserve1,1</key>
-	<string>Xserve (Intel Xeon)</string>
-	<key>Xserve2,1</key>
-	<string>Xserve (January 2008 quad-core)</string>
-	<key>Xserve3,1</key>
-	<string>Xserve (early 2009)</string>
-</dict>
-</plist>