From a9042202482eef9cbedcf1b4719b819cd0cf9242 Mon Sep 17 00:00:00 2001
From: Michael Eisemann <me@Michaels-MBP.localdomain>
Date: Wed, 10 Nov 2021 18:34:34 -0500
Subject: [PATCH 1/4] Add updated MacBook models

---
 .../Resources/Property Lists/MacintoshModels.plist        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Sources/Plugins/System Profiler/Resources/Property Lists/MacintoshModels.plist b/Sources/Plugins/System Profiler/Resources/Property Lists/MacintoshModels.plist
index 9eb356670..1498de531 100755
--- a/Sources/Plugins/System Profiler/Resources/Property Lists/MacintoshModels.plist	
+++ b/Sources/Plugins/System Profiler/Resources/Property Lists/MacintoshModels.plist	
@@ -134,6 +134,14 @@
 	<string>MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)</string>
 	<key>MacBookPro17,1</key>
 	<string>MacBook Pro (13-inch, M1, 2020)</string>
+	<key>MacBookPro18,1</key>
+	<string>MacBook Pro (16-inch, 2021)</string>
+	<key>MacBookPro18,2</key>
+	<string>MacBook Pro (16-inch, 2021)</string>
+	<key>MacBookPro18,3</key>
+	<string>MacBook Pro (14-inch, 2021)</string>
+	<key>MacBookPro18,4</key>
+	<string>MacBook Pro (14-inch, 2021)</string>
 	<key>MacPro1,1*</key>
 	<string>Mac Pro (Original)</string>
 	<key>MacPro2,1</key>

From e1107212032758f2c0d4e9699b72f3de747bdceb Mon Sep 17 00:00:00 2001
From: Glyph <glyph@twistedmatrix.com>
Date: Wed, 22 Dec 2021 15:53:09 -0800
Subject: [PATCH 2/4] honor user-specified full-screen presentation options

---
 Sources/App/Classes/Views/Main Window/TVCMainWindow.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/App/Classes/Views/Main Window/TVCMainWindow.m b/Sources/App/Classes/Views/Main Window/TVCMainWindow.m
index 711f55638..449d0e03c 100644
--- a/Sources/App/Classes/Views/Main Window/TVCMainWindow.m	
+++ b/Sources/App/Classes/Views/Main Window/TVCMainWindow.m	
@@ -521,7 +521,7 @@ - (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)propose
 
 - (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
 {
-	return (NSApplicationPresentationFullScreen | NSApplicationPresentationHideDock | NSApplicationPresentationAutoHideMenuBar);
+	return proposedOptions;
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification

From 8968a0ceb72a0cbada7a15a9a1b3efcda4f67af7 Mon Sep 17 00:00:00 2001
From: Ken Rachynski <krachynski@me.com>
Date: Mon, 21 Feb 2022 15:31:37 -0700
Subject: [PATCH 3/4] Update README.md

Chat has moved to Libera.chat
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39e3ffe94..e823f8fe2 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Precompiled versions of Textual can be purchased in the [Mac App Store](http://w
 - [Homepage](https://codeux.com/textual)
 - [Frequently Asked Questions](https://help.codeux.com/textual/Frequently-Asked-Questions.kb)
 - [Support](https://help.codeux.com/textual/Support.kb)
-- \#textual on chat.freenode.net
+- \#textual on irc.libera.chat
 - Guides: [Writing Plugins](https://help.codeux.com/textual/Writing-Plugins.kb), [Writing Scripts](https://help.codeux.com/textual/Writing-Scripts.kb)
 
 ## Note Regarding Downloading Source Code

From b85f1594fa0c0591df6f267c3199f37111077d0f Mon Sep 17 00:00:00 2001
From: Ken Rachynski <chief@troublemaker.dev>
Date: Sat, 23 Jul 2022 20:47:27 -0600
Subject: [PATCH 4/4] Correct typo in a preference pane

Xcode added some Xcode version changes to the file as well

Signed-off-by: Ken Rachynski <chief@troublemaker.dev>
---
 .../en.lproj/TDCPreferences.xib               | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib b/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib
index ff87dc9ef..8c3df22ba 100755
--- a/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib	
+++ b/Sources/App/Resources/User Interface/en.lproj/TDCPreferences.xib	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -61,7 +61,7 @@
         <window title="Textual Preferences" allowsToolTipsWhenApplicationIsInactive="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" toolbarStyle="preference" id="4929" userLabel="Toolbar Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <rect key="contentRect" x="367" y="318" width="670" height="240"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1440"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <value key="minSize" type="size" width="670" height="240"/>
             <view key="contentView" id="4930">
                 <rect key="frame" x="0.0" y="0.0" width="670" height="240"/>
@@ -127,7 +127,7 @@
                         <popUpButton key="view" tag="108" id="J0J-90-PIH">
                             <rect key="frame" x="2" y="14" width="55" height="35"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="TPWTB_Advanced" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="o4H-Er-8Yy">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="o4H-Er-8Yy">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" id="W9G-v3-1hY">
@@ -235,7 +235,7 @@
                         <popUpButton key="view" tag="109" id="yuI-3m-esZ">
                             <rect key="frame" x="0.0" y="14" width="55" height="35"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="TPWTB_Addons" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="b9Y-Fr-JSg" id="sbw-Pi-BcH">
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" imageScaling="proportionallyDown" inset="2" pullsDown="YES" selectedItem="b9Y-Fr-JSg" id="sbw-Pi-BcH">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" id="mgV-ad-4kQ">
@@ -488,7 +488,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="250" height="160"/>
                                 <clipView key="contentView" id="QyB-ni-plT">
                                     <rect key="frame" x="1" y="1" width="248" height="158"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" id="nIO-jH-FEm">
                                             <rect key="frame" x="0.0" y="0.0" width="248" height="158"/>
@@ -497,7 +497,7 @@
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="235" minWidth="40" maxWidth="1000" id="WJE-D0-e9x">
+                                                <tableColumn width="206" minWidth="40" maxWidth="1000" id="WJE-D0-e9x">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -546,7 +546,7 @@
                                 <rect key="frame" x="258" y="0.0" width="250" height="160"/>
                                 <clipView key="contentView" id="73A-Qg-29i">
                                     <rect key="frame" x="1" y="1" width="248" height="158"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" id="Vqz-0J-ajG">
                                             <rect key="frame" x="0.0" y="0.0" width="248" height="158"/>
@@ -555,7 +555,7 @@
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="234" minWidth="40" maxWidth="1000" id="FZ6-cu-ERb">
+                                                <tableColumn width="205" minWidth="40" maxWidth="1000" id="FZ6-cu-ERb">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -2782,7 +2782,7 @@ Messages are not saved between app launches unless “Restore scrollback from pr
                     <rect key="frame" x="100" y="128" width="470" height="210"/>
                     <clipView key="contentView" id="AXK-zU-57a">
                         <rect key="frame" x="1" y="1" width="468" height="208"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" id="rGf-Ih-C97">
                                 <rect key="frame" x="0.0" y="0.0" width="468" height="208"/>
@@ -2791,7 +2791,7 @@ Messages are not saved between app launches unless “Restore scrollback from pr
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn identifier="addonCommand" width="455" minWidth="40" maxWidth="1000" id="GzW-ZW-4AC">
+                                    <tableColumn identifier="addonCommand" width="426" minWidth="40" maxWidth="1000" id="GzW-ZW-4AC">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -2806,11 +2806,11 @@ Messages are not saved between app launches unless “Restore scrollback from pr
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView id="5gM-WP-Vf6">
-                                                <rect key="frame" x="1" y="1" width="464" height="17"/>
+                                                <rect key="frame" x="11" y="1" width="435" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="mh1-TF-o7A">
-                                                        <rect key="frame" x="0.0" y="1" width="464" height="16"/>
+                                                        <rect key="frame" x="0.0" y="1" width="435" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="gJi-dD-yjf">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -3587,7 +3587,7 @@ A lower value is always better especially when in a large number of channels.</s
                     <rect key="frame" x="167" y="94" width="350" height="17"/>
                     <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="MeX-O6-c8G">
                         <rect key="frame" x="0.0" y="0.0" width="350" height="17"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <textView editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="panel" allowsNonContiguousLayout="YES" spellingCorrection="YES" id="ijO-xj-OPG">
                                 <rect key="frame" x="0.0" y="0.0" width="350" height="17"/>
@@ -3771,7 +3771,7 @@ A lower value is always better especially when in a large number of channels.</s
                         </gridCell>
                         <gridCell row="ua1-BC-ZVo" column="Bus-Va-tRO" id="lSh-ZL-d5e">
                             <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wph-Lj-E2b">
-                                <rect key="frame" x="34" y="4" width="148" height="16"/>
+                                <rect key="frame" x="35" y="4" width="147" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="File transfer port range:" id="Pak-RG-PFU">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -3848,7 +3848,7 @@ A lower value is always better especially when in a large number of channels.</s
                 </gridView>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wuk-ii-Ge1">
                     <rect key="frame" x="96" y="113" width="320" height="28"/>
-                    <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="You will be asked where to save downloaded files each time you start a file transfer a destination is not configured." id="3k5-n4-vrU">
+                    <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="You will be asked where to save downloaded files each time you start a file transfer if a destination is not configured." id="3k5-n4-vrU">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -4781,7 +4781,7 @@ You should therefore not rely solely on this preference.</string>
                     </connections>
                 </button>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="318-ie-koO">
-                    <rect key="frame" x="108" y="97" width="453" height="18"/>
+                    <rect key="frame" x="108" y="97" width="452" height="18"/>
                     <buttonCell key="cell" type="check" title="Automatically start an Off-the-Record conversation whenever possible" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="vuQ-Sk-fPF">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>