Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts: README.md Solved
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
* [Filament Sensor](/Documentation/FilamentSensor.md)
|
||||
* [Ramps Servo Power](/Documentation/RampsServoPower.md)
|
||||
* [LCD Language - Font - System](Documentation/LCDLanguageFont.md)
|
||||
* [Mesh Bed Leveling](/Documentation/MeshBedLeveling.md)
|
||||
|
||||
##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
|
||||
|
||||
|
Reference in New Issue
Block a user