From cf88d61c206ab8015089aadb9ec64b2186f49a41 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:40:57 +0100 Subject: [PATCH] added links to reprap.org and the license --- README.md | 85 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index a4e6f93c27..e8cf8bb00c 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,44 @@ -# Marlin 3D Printer Firmware - - * [Configuration & Compilation](/Documentation/Compilation.md) - * Supported - * [Features](/Documentation/Features.md) - * [Hardware](/Documentation/Hardware.md) - * [GCodes](/Documentation/GCodes.md) - * Notes - * [Auto Bed Leveling](/Documentation/BedLeveling.md) - * [Filament Sensor](/Documentation/FilamentSensor.md) - -## Quick Information - -This RepRap firmware is a mashup between Sprinter, grbl and many original parts. - -Derived from Sprinter and Grbl by Erik van der Zalm. -Sprinters lead developers are Kliment and caru. -Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl -A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. -Some features have been added by: -Lampmaker, Bradley Feldman, and others... - -## Current Status: Bug Fixing - -[![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/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) - -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 - -## Contact - -__IRC:__ #marlin-firmware @freenode -__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da - -## Licence - -Marlin has a GPL license because I believe in open development. -Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. - -[![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) - +# Marlin 3D Printer Firmware + + + * [Configuration & Compilation](/Documentation/Compilation.md) + * Supported + * [Features](/Documentation/Features.md) + * [Hardware](/Documentation/Hardware.md) + * [GCodes](/Documentation/GCodes.md) + * Notes + * [Auto Bed Leveling](/Documentation/BedLeveling.md) + * [Filament Sensor](/Documentation/FilamentSensor.md) + +##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) + +## Quick Information + +This RepRap firmware is a mashup between Sprinter, grbl and many original parts. + +Derived from Sprinter and Grbl by Erik van der Zalm. +Sprinters lead developers are Kliment and caru. +Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl +A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. +Some features have been added by: +Lampmaker, Bradley Feldman, and others... + +## Current Status: Bug Fixing + +[![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/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) + +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 + +## Contact + +__IRC:__ #marlin-firmware @freenode + +__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +## Licence + +Marlin is published unde the [GPL license](/Documentation/COPYING.md) because I believe in open development. +Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. + +[![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)