Skip to content

Commit

Permalink
Update README.md for bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Dec 16, 2017
1 parent c5a4230 commit e8d3ea8
Showing 1 changed file with 36 additions and 31 deletions.
67 changes: 36 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ __Not for production use. Use with caution!__

This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release.

Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.1.)
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.7.)

## Recent Changes
- Further integration of Unified Bed Leveling
- Internally always use native machine space
- Initial UBL LCD Menu
- New optimized G-code parser singleton
- Initial M3/M4/M5 Spindle and Laser support
- Added M421 Q to offset a mesh point
- Refinements to G26 and G33
- Added M80 S to query the power state
- Initial `M3`/`M4`/`M5` Spindle and Laser support
- Added `M421 Q` to offset a mesh point
- Refinements to `G26` and `G33`
- Added `M80 S` to query the power state
- "Cancel Print" now shuts off heaters
- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling

## Submitting Patches

Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)).

- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 1.2 and beyond should improve on separation of bug fixes and cutting-edge development.
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 2.0 and beyond should improve on separation of bug fixes and cutting-edge development.
- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information.
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask.

Expand All @@ -40,37 +40,42 @@ Proposed patches should be submitted as a Pull Request against this branch ([bug
## Credits

The current Marlin dev team consists of:
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - English
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - English
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - English
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Deutsch, English
- Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)] - Deutsch, English
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Deutsch, English
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portuguese, English
- Bo Hermannsen [[@boelle](https://github.com/boelle)] - Danish, English
- Bob Cousins [[@bobc](https://github.com/bobc)] - English
- [[@maverikou](https://github.com/maverikou)]
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)]
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)]
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)]

Notable contributors include:
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)]
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)]
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
- Bob Cousins [[@bobc](https://github.com/bobc)]
- Chris Palmer [[@nophead](https://github.com/nophead)]
- [[@paclema](https://github.com/paclema)]
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
- David Braam [[@daid](https://github.com/daid)]
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]

More features have been added by:
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - English, Italian
- Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
- Edward Patel [[@epatel](https://github.com/epatel)]
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
- Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
- Petr Zahradnik [[@clexpert](https://github.com/clexpert)]
- F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)]
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)]
- João Brazio [[@jbrazio](https://github.com/jbrazio)]
- Kai [[@Kaibob2](https://github.com/Kaibob2)]
- Edward Patel [[@epatel](https://github.com/epatel)]
- F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)] - English, Spanish
- [[@esenapaj](https://github.com/esenapaj)] - English, Japanese
- Luc Van Daele[[@LVD-AC](https://github.com/LVD-AC)]
- Nico Tonnhofer [[@Wurstnase](https://github.com/Wurstnase)]
- Petr Zahradnik [[@clexpert](https://github.com/clexpert)]
- Thomas Moore [[@tcm0116](https://github.com/tcm0116)]
- [[@alexxy](https://github.com/alexxy)]
- [[@android444](https://github.com/android444)]
- [[@benlye](https://github.com/benlye)]
- [[@Tannoo](https://github.com/Tannoo)]
- [[@teemuatlut](https://github.com/teemuatlut)]
- [[@bgort](https://github.com/bgort)]
- Luc Van Daele[[@LVD-AC](https://github.com/LVD-AC)] - Dutch, French, English
- [[@Grogyan](https://github.com/Grogyan)]
- [[@marcio-ao](https://github.com/marcio-ao)]
- [[@maverikou](https://github.com/maverikou)]
- [[@oysteinkrog](https://github.com/oysteinkrog)]
- [[@p3p](https://github.com/p3p)]
- [[@paclema](https://github.com/paclema)]
- [[@paulusjacobus](https://github.com/paulusjacobus)]
- [[@psavva](https://github.com/psavva)]
- [[@Tannoo](https://github.com/Tannoo)]
- [[@teemuatlut](https://github.com/teemuatlut)]
- ...and many others

## License
Expand Down

0 comments on commit e8d3ea8

Please sign in to comment.