-
- Downloads
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts: Marlin/dogm_lcd_implementation.h Marlin/fonts/make_fonts.bat Claerd conflicts with my own #1621. (His was easy. :-) ) corrected typo in fonts/README.fonts Applied changes to the new delta-configurations and deletet there some extra whitespace at the line-endings.
Showing
- .travis.yml 6 additions, 2 deletions.travis.yml
- Documentation/GCodes.md 1 addition, 1 deletionDocumentation/GCodes.md
- Marlin/Configuration.h 1 addition, 0 deletionsMarlin/Configuration.h
- Marlin/Marlin.h 6 additions, 0 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 339 additions, 40 deletionsMarlin/Marlin_main.cpp
- Marlin/dogm_font_data_ISO10646_1.h 176 additions, 0 deletionsMarlin/dogm_font_data_ISO10646_1.h
- Marlin/dogm_lcd_implementation.h 15 additions, 16 deletionsMarlin/dogm_lcd_implementation.h
- Marlin/example_configurations/Hephestos/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/Hephestos/Configuration.h
- Marlin/example_configurations/K8200/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/K8200/Configuration.h
- Marlin/example_configurations/SCARA/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/SCARA/Configuration.h
- Marlin/example_configurations/WITBOX/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/WITBOX/Configuration.h
- Marlin/example_configurations/delta/generic/Configuration.h 95 additions, 18 deletionsMarlin/example_configurations/delta/generic/Configuration.h
- Marlin/example_configurations/delta/generic/Configuration_adv.h 19 additions, 1 deletion.../example_configurations/delta/generic/Configuration_adv.h
- Marlin/example_configurations/delta/kossel_mini/Configuration.h 880 additions, 0 deletions.../example_configurations/delta/kossel_mini/Configuration.h
- Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 547 additions, 0 deletions...mple_configurations/delta/kossel_mini/Configuration_adv.h
- Marlin/example_configurations/makibox/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/makibox/Configuration.h
- Marlin/example_configurations/tvrrug/Round2/Configuration.h 1 addition, 0 deletionsMarlin/example_configurations/tvrrug/Round2/Configuration.h
- Marlin/fonts/ISO10646-1.fon 0 additions, 0 deletionsMarlin/fonts/ISO10646-1.fon
- Marlin/fonts/README.fonts 1 addition, 1 deletionMarlin/fonts/README.fonts
- Marlin/fonts/make_fonts.bat 1 addition, 0 deletionsMarlin/fonts/make_fonts.bat
Loading
Please register or sign in to comment