From d8b7e4e4c18a16af222c17501ac66a50b8a76475 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Jan 2022 20:01:24 -0600
Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/extensions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f495d14f53e8..9267b77017ef 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,4 +8,4 @@
     "unwantedRecommendations": [
         "ms-vscode.cpptools-extension-pack"
     ]
-}
+}
\ No newline at end of file

From f830474ab2876d609bec0be406e379125cd7a37a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Jan 2022 20:01:24 -0600
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0b852d767325..bea798f44f5f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,10 @@ applet/
 *.rej
 *.bak
 *.idea
+<<<<<<< HEAD
+=======
+*.s
+>>>>>>> 🔨 Add .vscode/extensions.json
 *.i
 *.ii
 *.swp

From c25a406d6bf722bbcf8e99d347643b2c6b447c84 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 1 Jan 2022 20:01:24 -0600
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/extensions.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 9267b77017ef..b2c8b3b631b4 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,10 +2,17 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
+<<<<<<< HEAD
         "marlinfirmware.auto-build",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
         "ms-vscode.cpptools-extension-pack"
     ]
-}
\ No newline at end of file
+}
+=======
+        "platformio.platformio-ide",
+        "marlinfirmware.auto-build"
+    ]
+}
+>>>>>>> 🔨 Add .vscode/extensions.json

From 4f788f44fbe72aefca67b29ef7db749c9c724355 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Mon, 7 Feb 2022 16:34:48 +1300
Subject: [PATCH 4/5] update gitignore and extentions.json

---
 .gitignore              | 4 ----
 .vscode/extensions.json | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index bea798f44f5f..0b852d767325 100755
--- a/.gitignore
+++ b/.gitignore
@@ -41,10 +41,6 @@ applet/
 *.rej
 *.bak
 *.idea
-<<<<<<< HEAD
-=======
-*.s
->>>>>>> 🔨 Add .vscode/extensions.json
 *.i
 *.ii
 *.swp
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index b2c8b3b631b4..f495d14f53e8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,7 +2,6 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-<<<<<<< HEAD
         "marlinfirmware.auto-build",
         "platformio.platformio-ide"
     ],
@@ -10,9 +9,3 @@
         "ms-vscode.cpptools-extension-pack"
     ]
 }
-=======
-        "platformio.platformio-ide",
-        "marlinfirmware.auto-build"
-    ]
-}
->>>>>>> 🔨 Add .vscode/extensions.json

From fc099d2d0df3dac506f91115fa12dafb3b75767a Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Sat, 26 Feb 2022 16:36:08 +1300
Subject: [PATCH 5/5] check SHOW_BOOTSCREEN with SHOW_CUSTOM_BOOTSCREEN

---
 Marlin/src/inc/SanityCheck.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 9c74ce32db82..7b335dc9295c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -860,6 +860,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  */
 #if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
   #error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
+#elif ENABLED(SHOW_CUSTOM_BOOTSCREEN) && DISABLED(SHOW_BOOTSCREEN)
+  #error "SHOW_CUSTOM_BOOTSCREEN requires SHOW_BOOTSCREEN."
 #elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_MARLINUI_U8GLIB
   #error "CUSTOM_STATUS_SCREEN_IMAGE requires a 128x64 DOGM B/W Graphical LCD."
 #endif