From 5977eb461dfe2a1c6d20471876d64b352b2d721a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jun 2022 23:50:20 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96=20=20Moving=20to=20bugfix-2.1.x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check-pr.yml | 2 +- buildroot/bin/use_example_configs | 0 buildroot/share/git/mfinfo | 0 buildroot/share/git/mfprep | 0 ini/native.ini | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 buildroot/bin/use_example_configs mode change 100755 => 100644 buildroot/share/git/mfinfo mode change 100755 => 100644 buildroot/share/git/mfprep diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index f631f69dea..abb0d44706 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -29,6 +29,6 @@ jobs: Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x. - It may help to set your fork's default branch to `bugfix-2.0.x`. + It may help to set your fork's default branch to `bugfix-2.1.x`. See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs old mode 100755 new mode 100644 diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo old mode 100755 new mode 100644 diff --git a/buildroot/share/git/mfprep b/buildroot/share/git/mfprep old mode 100755 new mode 100644 diff --git a/ini/native.ini b/ini/native.ini index 1905559fd0..6bd2fa123b 100644 --- a/ini/native.ini +++ b/ini/native.ini @@ -41,7 +41,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb lib_compat_mode = off build_src_filter = ${common.default_src_filter} + lib_deps = ${common.lib_deps} - MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.0.x.zip + MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip extra_scripts = ${common.extra_scripts}