Merge remote-tracking branch 'origin/dev'

Uhh

Author: EmeraldLoc

.DS_Store

@@ -3,12 +3,27 @@
     <channel>
         <title>sm_osx</title>
         <item>
+<<<<<<< HEAD
+=======
+            <title>1.3.4</title>
+            <pubDate>Fri, 27 Oct 2023 22:00:06 -0500</pubDate>
+            <sparkle:version>17</sparkle:version>
+            <sparkle:shortVersionString>1.3.4</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1796523" type="application/octet-stream" sparkle:edSignature="zoxhm3vdYrln8y2b48DK4R2m06aDls3tVl6y1rprtQ1Ri+ILiBS3+P9JH2s/2UR4p9nYcHpzSVMrw0CHrOkXCQ=="/>
+        </item>
+        <item>
+>>>>>>> origin/dev
             <title>1.3.3.1</title>
             <pubDate>Fri, 13 Oct 2023 15:30:33 -0500</pubDate>
             <sparkle:version>16</sparkle:version>
             <sparkle:shortVersionString>1.3.3.1</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>13.0</sparkle:minimumSystemVersion>
+<<<<<<< HEAD
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1892496" type="application/octet-stream" sparkle:edSignature="0L9538PUNNSW8z60A3Ce9N1IZCpdFSBQIAkTC44CxCeFTL1INWemlIUTKpXJcrBkszEp9H5Uar2CyJVcsdlsAg=="/>
+=======
+            <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1891917" type="application/octet-stream" sparkle:edSignature="ifbgzUqgjVi/cOmD/fQw6cGqX0N1x/L96ye7eyZPoxf4mVIxerLPx3puWxE7XSmxWIbcePO2il/SyH2gWHhPCw=="/>
+>>>>>>> origin/dev
         </item>
         <item>
             <title>1.3.3</title>
@@ -19,6 +34,7 @@
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1890723" type="application/octet-stream" sparkle:edSignature="cS26JijTY1/9AGu5qEYgX2gfRO09m7Oy+KDZ5LkrJak0PH/xS3uX+kWpH4f6sC+LoXTze/6T5Ta6trlYklQ6Cw=="/>
         </item>
         <item>
+<<<<<<< HEAD
             <title>1.3.2</title>
             <pubDate>Wed, 04 Oct 2023 19:14:55 -0500</pubDate>
             <sparkle:version>14</sparkle:version>
@@ -27,6 +43,8 @@
             <enclosure url="https://github.com/EmeraldLoc/sm_osx/releases/latest/download/sm_osx.zip" length="1862868" type="application/octet-stream" sparkle:edSignature="/dQZDwKE2KRwCj2Df33I9+02dFmu4mWYQpPKeDjKAg41e+bVyN4EAJzmqD7ADEIYRX6j7lF9lOHza8BF6vrUAg=="/>
         </item>
         <item>
+=======
+>>>>>>> origin/dev
             <title>1.2.9</title>
             <pubDate>Fri, 24 Mar 2023 16:26:20 -0500</pubDate>
             <sparkle:version>1</sparkle:version>

appcast.xml

@@ -14,9 +14,9 @@
 		<key>CFBundleIdentifier</key>
 		<string>com.CubingStudios.sm-osx</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.3.1</string>
+		<string>1.3.4</string>
 		<key>CFBundleVersion</key>
-		<string>16</string>
+		<string>17</string>
 		<key>SigningIdentity</key>
 		<string>Apple Development: calebelm@icloud.com (VZ9N8YGDP3)</string>
 		<key>Team</key>
@@ -25,7 +25,7 @@
 	<key>ArchiveVersion</key>
 	<integer>2</integer>
 	<key>CreationDate</key>
-	<date>2023-10-13T20:30:27Z</date>
+	<date>2023-10-28T03:00:00Z</date>
 	<key>Name</key>
 	<string>sm_osx</string>
 	<key>SchemeName</key>

archives/sm_osx.xcarchive/Info.plist

@@ -21,13 +21,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.3.1</string>
+	<string>1.3.4</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle

@@ -13,8 +13,8 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.3.1</string>
+		<string>1.3.4</string>
 		<key>CFBundleVersion</key>
-		<string>16</string>
+		<string>17</string>
 	</dict>
 </plist>