Scott Lahteine 2 лет назад
Родитель
Сommit
d08223429b

+ 5 - 5
.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,13 +14,13 @@ body:
 
 
         ## Before Reporting a Bug
         ## Before Reporting a Bug
 
 
-        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
+        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
 
-        - Test with the [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see whether the issue still exists.
+        - Test with the [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see whether the issue still exists.
 
 
         ## Instructions
         ## Instructions
 
 
-        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/contributing.md) for additional guidelines.
+        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/contributing.md) for additional guidelines.
 
 
         1. Provide a good title starting with [BUG].
         1. Provide a good title starting with [BUG].
         2. Fill out all sections of this bug report form.
         2. Fill out all sections of this bug report form.
@@ -28,10 +28,10 @@ body:
 
 
   - type: dropdown
   - type: dropdown
     attributes:
     attributes:
-      label: Did you test the latest `bugfix-2.0.x` code?
+      label: Did you test the latest `bugfix-2.1.x` code?
       description: >-
       description: >-
         Always try the latest code to make sure the issue you are reporting is not already fixed. To download
         Always try the latest code to make sure the issue you are reporting is not already fixed. To download
-        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip).
+        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip).
       options:
       options:
         - Yes, and the problem still exists.
         - Yes, and the problem still exists.
         - No, but I will test it now!
         - No, but I will test it now!

+ 1 - 1
.github/ISSUE_TEMPLATE/feature_request.yml

@@ -17,7 +17,7 @@ body:
 
 
         - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
         - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
 
-        - Check the latest [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see if the feature already exists.
+        - Check the latest [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see if the feature already exists.
 
 
         - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
         - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
 
 

+ 1 - 1
.github/contributing.md

@@ -116,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 
 ### Pull Requests
 ### Pull Requests
 
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-2.0.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 
 * Fill in [the required template](pull_request_template.md).
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.
 * Don't include issue numbers in the PR title.

+ 2 - 2
.github/workflows/bump-date.yml

@@ -18,10 +18,10 @@ jobs:
 
 
     steps:
     steps:
 
 
-    - name: Check out bugfix-2.0.x
+    - name: Check out bugfix-2.1.x
       uses: actions/checkout@v2
       uses: actions/checkout@v2
       with:
       with:
-        ref: bugfix-2.0.x
+        ref: bugfix-2.1.x
 
 
     - name: Bump Distribution Date
     - name: Bump Distribution Date
       run: |
       run: |

+ 2 - 2
.github/workflows/check-pr.yml

@@ -26,8 +26,8 @@ jobs:
         comment: >
         comment: >
           Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
           Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
 
 
-          Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
+          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.
 
 
-          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](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
           See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

+ 2 - 2
.github/workflows/test-builds.yml

@@ -8,7 +8,7 @@ name: CI
 on:
 on:
   pull_request:
   pull_request:
     branches:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     paths-ignore:
     - config/**
     - config/**
     - data/**
     - data/**
@@ -16,7 +16,7 @@ on:
     - '**/*.md'
     - '**/*.md'
   push:
   push:
     branches:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     paths-ignore:
     - config/**
     - config/**
     - data/**
     - data/**

+ 1 - 1
Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
 /**
  * Marlin release version identifier
  * Marlin release version identifier
  */
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
+//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
 
 
 /**
 /**
  * Verbose version identifier which should contain a reference to the location
  * Verbose version identifier which should contain a reference to the location

+ 1 - 1
Marlin/src/inc/Version.h

@@ -25,7 +25,7 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
  */
 #ifndef SHORT_BUILD_VERSION
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "bugfix-2.0.x"
+  #define SHORT_BUILD_VERSION "bugfix-2.1.x"
 #endif
 #endif
 
 
 /**
 /**

+ 1 - 1
Marlin/src/lcd/e3v2/README.md

@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 # DWIN for Creality Ender 3 v2
 
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 
 ## Easy Install
 ## Easy Install
 
 

+ 1 - 1
Marlin/src/lcd/e3v2/jyersui/README.md

@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 # DWIN for Creality Ender 3 v2
 
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 
 ## Easy Install
 ## Easy Install
 
 

Некоторые файлы не были показаны из-за большого количества измененных файлов