Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-October3

MarlinFirmware · Oct 19, 2024 · 2fba91f · 2fba91f
2 parents 1f794f4 + cf137cb
commit 2fba91f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.zed/settings.json b/.zed/settings.json
@@ -5,5 +5,12 @@
  * see the documentation: https://zed.dev/docs/configuring-zed#settings-files
  */
 {
-  "enable_language_servers": false
+  "languages": {
+    "C": {
+      "enable_language_server": false
+    },
+    "C++": {
+      "enable_language_server": false
+    }
+  }
 }
diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-10-14"
+//#define STRING_DISTRIBUTION_DATE "2024-10-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-10-14"
+  #define STRING_DISTRIBUTION_DATE "2024-10-17"
 #endif
 
 /**