diff --git a/README.md b/README.md index 159d998f95..ee9ce86fce 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,22 @@ # Marlin 3D Printer Firmware - Additional documentation can be found in [our wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page). + Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki/Main-Page). -## Release Candidate -- Marlin 1.1.0-RC3 - 01 December 2015 +## Release Candidate -- Marlin 1.1.0-RC4 - 24 March 2016 __Not for production use – use with caution!__ -Previously tagged versions of Marlin are not recommended. However, the latest patches to the Marlin 1.0 series can be found in the [1.0.x](https://github.com/MarlinFirmware/Marlin/tree/1.0.x) branch. +You can download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest "stable" release of Marlin is 1.0.2-1.) -[This branch, "RC"](https://github.com/MarlinFirmware/Marlin/tree/RC), is our current pre-release candidate. +You'll always find the latest Release Candidate in the ["RC" branch](https://github.com/MarlinFirmware/Marlin/tree/RC). Bugs that we find in the current Release Candidate are patched in the ["RCBugFix" branch](https://github.com/MarlinFirmware/Marlin/tree/RC), so during beta testing this is where you can always find the latest code on its way towards release. -Future development takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/). +Future development (Marlin 1.2 and beyond) takes place in the [MarlinDev repository](https://github.com/MarlinFirmware/MarlinDev/). ## Recent Changes +RC4 - 24 Mar 2016 + Many lingering bugs and nagging issues addressed + Improvements to LCD menus, CoreXY/CoreXZ, Delta, Bed Leveling, and more… + RC3 - 01 Dec 2015 A number of language sensitive strings have been revised Formatting of the LCD display has been improved to handle negative coordinates better @@ -26,25 +30,21 @@ RC1 - 19 Sep 2015 Published for testing ## Submitting Patches -Proposed patches should be submitted as a Pull Request against the [RCBugFix](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix) branch -Note: Do not propose added features. Patches to the Release Candidate are limited to corrections of coding errors for the functions that have been implemented. -Please follow the proper style. Pull requests containing styling errors will have to be reworked. - +Proposed patches should be submitted as a Pull Request against the [RCBugFix](https://github.com/MarlinFirmware/Marlin/tree/RCBugFix) branch. +- Don't submit new feature proposals. The RCBugFix branch is for fixing bugs in existing features. +- Do submit questions and concerns. The "naive" question is often the one we forget to ask. +- Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information. ## Current Status: Testing -Please test this firmware and inform us of any issues where it fails to perform in a manner consistent with the designed functionality. +Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by! [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev) ##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) -## Contact - -__Google Hangout:__ . Hangout We have a hangout every 2 weeks. Search the issue list for "Hangout" and you will see what time and date the next event is going on. - ## Credits The current Marlin dev team consists of: