Skip to content

Commit

Permalink
🔖 Version 2.1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jun 16, 2024
1 parent 53392f3 commit fff0d70
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 53 deletions.
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 =============================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand All @@ -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

/**
Expand All @@ -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
Expand Down
59 changes: 13 additions & 46 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<table align="center">
<tr><td>Project Maintainer</td></tr>
<tr><td>

🇺🇸  **Scott Lahteine**
      [@thinkyhead](https://github.com/thinkyhead)
      [<kbd>  Donate 💸  </kbd>](https://www.thinkyhead.com/donate-to-marlin)

</td><td>

🇺🇸  **Roxanne Neufeld**
      [@Roxy-3D](https://github.com/Roxy-3D)

🇺🇸  **Keith Bennett**
      [@thisiskeithb](https://github.com/thisiskeithb)
      [<kbd>  Donate 💸  </kbd>](https://github.com/sponsors/thisiskeithb)

🇺🇸  **Jason Smith**
      [@sjasonsmith](https://github.com/sjasonsmith)

</td><td>

🇧🇷  **Victor Oliveira**
      [@rhapsodyv](https://github.com/rhapsodyv)

🇬🇧  **Chris Pepper**
      [@p3p](https://github.com/p3p)

🇳🇿  **Peter Ellens**
      [@ellensp](https://github.com/ellensp)
      [<kbd>  Donate 💸  </kbd>](https://ko-fi.com/ellensp)

</td><td>

🇺🇸  **Bob Kuhn**
      [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)

🇳🇱  **Erik van der Zalm**
      [@ErikZalm](https://github.com/ErikZalm)

</td></tr>
</table>
## 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

Expand Down
2 changes: 1 addition & 1 deletion config/README.md
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit fff0d70

Please sign in to comment.