Compare commits

...

3 Commits

Author SHA1 Message Date
Scott Lahteine
dee6322bf0 Merged 1.1.0-RC6 Version changes 2016-04-24 20:34:42 -07:00
Scott Lahteine
30c9893be7 Updated README.md 2016-04-24 19:59:52 -07:00
Scott Lahteine
8757463b46 Apply RC6 label to the version 2016-04-24 19:33:26 -07:00
2 changed files with 11 additions and 6 deletions

View File

@@ -29,7 +29,7 @@
/** /**
* Marlin release version identifier * Marlin release version identifier
*/ */
#define SHORT_BUILD_VERSION "1.1.0-RCBugFix" #define SHORT_BUILD_VERSION "1.1.0-RC6"
/** /**
* Verbose version identifier which should contain a reference to the location * Verbose version identifier which should contain a reference to the location
@@ -42,7 +42,7 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define STRING_DISTRIBUTION_DATE "2016-04-16 12:00" #define STRING_DISTRIBUTION_DATE "2016-04-24 12:00"
/** /**
* @todo: Missing documentation block * @todo: Missing documentation block

View File

@@ -1,8 +1,8 @@
# Marlin 3D Printer Firmware # Marlin 3D Printer Firmware
<img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" /> <img align="top" width=175 src="Documentation/Logo/Marlin%20Logo%20GitHub.png" />
Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page). Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki).
## Release Candidate -- Marlin 1.1.0-RC5 - 01 April 2016 ## Release Candidate -- Marlin 1.1.0-RC6 - 24 April 2016
__Not for production use use with caution!__ __Not for production use use with caution!__
@@ -14,9 +14,14 @@ Future development (Marlin 1.2 and beyond) takes place in the [MarlinDev reposit
## Recent Changes ## Recent Changes
- RCBugFix - RCBugFix
- Throw error if compiling with older versions (<1.60) of Arduino due to serios problems with outdated Arduino versions - Throw error if compiling with older versions (<1.60) of Arduino due to serious problems with outdated Arduino versions
- Please upgrade your IDE at least to Arduino 1.6.0. Thanks. - Please upgrade your IDE at least to Arduino 1.6.0. Thanks.
- RC6 - 23 Apr 2016
- Completed support for CoreXY / CoreXZ in planner
- Changes to positioning behavior
- Various issues fixed. More details pending.
- RC5 - 01 Apr 2016 - RC5 - 01 Apr 2016
- Warn if compiling with older versions (<1.50) of Arduino - Warn if compiling with older versions (<1.50) of Arduino
- Fix various LCD menu issues - Fix various LCD menu issues
@@ -91,4 +96,4 @@ Marlin is published under the [GPL license](/LICENSE) because we believe in open
While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)