|
@@ -1,11 +1,11 @@
|
1
|
1
|
# Marlin 3D Printer Firmware
|
2
|
2
|
|
3
|
|
-[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=bugfix-2.0.x)](https://travis-ci.org/MarlinFirmware/Marlin)
|
4
|
3
|
![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg)
|
5
|
4
|
![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg)
|
6
|
5
|
![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg)
|
|
6
|
+[![Build Status](https://github.com/MarlinFirmware/Marlin/workflows/CI/badge.svg?branch=bugfix-2.0.x)](https://github.com/MarlinFirmware/Marlin/actions)
|
7
|
7
|
|
8
|
|
-<img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
|
|
8
|
+<img align="right" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
|
9
|
9
|
|
10
|
10
|
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
|
11
|
11
|
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
|
|
@@ -65,10 +65,10 @@ Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.
|
65
|
65
|
|
66
|
66
|
The current Marlin dev team consists of:
|
67
|
67
|
|
68
|
|
- - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
|
|
68
|
+ - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
|
69
|
69
|
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
|
70
|
|
- - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
|
71
|
70
|
- Chris Pepper [[@p3p](https://github.com/p3p)] - UK
|
|
71
|
+ - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
|
72
|
72
|
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal
|
73
|
73
|
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands [![Flattr Erik](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)
|
74
|
74
|
|