diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7effc47cf708..59b50e65d6f6 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -35,7 +35,7 @@ * * Advanced settings can be found in Configuration_adv.h */ -#define CONFIGURATION_H_VERSION 02010203 +#define CONFIGURATION_H_VERSION 02010204 //=========================================================================== //============================= Getting Started ============================= diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 82fd1be67b4b..519ef50bf3bb 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -30,7 +30,7 @@ * * Basic settings can be found in Configuration.h */ -#define CONFIGURATION_ADV_H_VERSION 02010203 +#define CONFIGURATION_ADV_H_VERSION 02010204 // @section develop diff --git a/Marlin/Version.h b/Marlin/Version.h index 3c244a5c5002..ff8504bc7346 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -//#define SHORT_BUILD_VERSION "2.1.2.3" +//#define SHORT_BUILD_VERSION "2.1.2.4" /** * Verbose version identifier which should contain a reference to the location diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 36da6e321348..6accbe2a2530 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -25,7 +25,7 @@ * Release version. Leave the Marlin version or apply a custom scheme. */ #ifndef SHORT_BUILD_VERSION - #define SHORT_BUILD_VERSION "2.1.2.3" + #define SHORT_BUILD_VERSION "2.1.2.4" #endif /** @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2024-05-29" + #define STRING_DISTRIBUTION_DATE "2024-06-16" #endif /** @@ -52,7 +52,7 @@ * to alert users to major changes. */ -#define MARLIN_HEX_VERSION 02010203 +#define MARLIN_HEX_VERSION 02010204 #ifndef REQUIRED_CONFIGURATION_H_VERSION #define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION #endif diff --git a/README.md b/README.md index ac28e343cdac..604d5dd93421 100644 --- a/README.md +++ b/README.md @@ -94,52 +94,19 @@ The Issue Queue is reserved for Bug Reports and Feature Requests. To get help wi Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them. -## Administration - -Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of: - - - - -
Project Maintainer
- - πŸ‡ΊπŸ‡Έβ€…β€…**Scott Lahteine** - β€…β€…β€…β€…β€…β€…[@thinkyhead](https://github.com/thinkyhead) - β€…β€…β€…β€…β€…β€…[β€…β€…Donate πŸ’Έβ€…β€…](https://www.thinkyhead.com/donate-to-marlin) - - - - πŸ‡ΊπŸ‡Έβ€…β€…**Roxanne Neufeld** - β€…β€…β€…β€…β€…β€…[@Roxy-3D](https://github.com/Roxy-3D) - - πŸ‡ΊπŸ‡Έβ€…β€…**Keith Bennett** - β€…β€…β€…β€…β€…β€…[@thisiskeithb](https://github.com/thisiskeithb) - β€…β€…β€…β€…β€…β€…[β€…β€…Donate πŸ’Έβ€…β€…](https://github.com/sponsors/thisiskeithb) - - πŸ‡ΊπŸ‡Έβ€…β€…**Jason Smith** - β€…β€…β€…β€…β€…β€…[@sjasonsmith](https://github.com/sjasonsmith) - - - - πŸ‡§πŸ‡·β€…β€…**Victor Oliveira** - β€…β€…β€…β€…β€…β€…[@rhapsodyv](https://github.com/rhapsodyv) - - πŸ‡¬πŸ‡§β€…β€…**Chris Pepper** - β€…β€…β€…β€…β€…β€…[@p3p](https://github.com/p3p) - -πŸ‡³πŸ‡Ώβ€…β€…**Peter Ellens** - β€…β€…β€…β€…β€…β€…[@ellensp](https://github.com/ellensp) - β€…β€…β€…β€…β€…β€…[β€…β€…Donate πŸ’Έβ€…β€…](https://ko-fi.com/ellensp) - - - - πŸ‡ΊπŸ‡Έβ€…β€…**Bob Kuhn** - β€…β€…β€…β€…β€…β€…[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn) - - πŸ‡³πŸ‡±β€…β€…**Erik van der Zalm** - β€…β€…β€…β€…β€…β€…[@ErikZalm](https://github.com/ErikZalm) - -
+## Project Leadership + +Name|Role|Link|Donate +----|----|----|---- +πŸ‡ΊπŸ‡Έ Scott Lahteine|Project Lead|[[@thinkyhead](https://github.com/thinkyhead)]|[πŸ’Έ Donate](https://marlinfw.org/docs/development/contributing.html#donate) +πŸ‡ΊπŸ‡Έ Roxanne Neufeld|Admin|[[@Roxy-3D](https://github.com/Roxy-3D)]| +πŸ‡ΊπŸ‡Έ Keith Bennett|Admin|[[@thisiskeithb](https://github.com/thisiskeithb)]|[πŸ’Έ Donate](https://github.com/sponsors/thisiskeithb) +πŸ‡ΊπŸ‡Έ Jason Smith|Admin|[[@sjasonsmith](https://github.com/sjasonsmith)]| +πŸ‡§πŸ‡· Victor Oliveira|Admin|[[@rhapsodyv](https://github.com/rhapsodyv)]| +πŸ‡¬πŸ‡§ Chris Pepper|Admin|[[@p3p](https://github.com/p3p)]| +πŸ‡³πŸ‡Ώ Peter Ellens|Admin|[[@ellensp](https://github.com/ellensp)]|[πŸ’Έ Donate](https://ko-fi.com/ellensp) +πŸ‡ΊπŸ‡Έ Bob Kuhn|Admin|[[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)]| +πŸ‡³πŸ‡± Erik van der Zalm|Founder|[[@ErikZalm](https://github.com/ErikZalm)]| ## License diff --git a/config/README.md b/config/README.md index 987957014cbc..9f8e98204143 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # Where have all the configurations gone? -## https://github.com/MarlinFirmware/Configurations/archive/release-2.1.2.3.zip +## https://github.com/MarlinFirmware/Configurations/archive/release-2.1.2.4.zip