-
- Downloads
Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
Conflicts: Marlin/Configuration.h Marlin/configurator/config/Configuration.h Marlin/example_configurations/Felix/Configuration.h Marlin/example_configurations/Felix/Configuration_DUAL.h Marlin/example_configurations/Hephestos/Configuration.h Marlin/example_configurations/K8200/Configuration.h Marlin/example_configurations/SCARA/Configuration.h Marlin/example_configurations/WITBOX/Configuration.h Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/example_configurations/makibox/Configuration.h Marlin/example_configurations/tvrrug/Round2/Configuration.h Conflicts with my Chinese implementation resolved.
Showing
- Documentation/Compilation.md 3 additions, 3 deletionsDocumentation/Compilation.md
- Documentation/GCodes.md 172 additions, 104 deletionsDocumentation/GCodes.md
- Documentation/LCDLanguageFont.md 5 additions, 4 deletionsDocumentation/LCDLanguageFont.md
- Marlin/Conditionals.h 43 additions, 8 deletionsMarlin/Conditionals.h
- Marlin/Configuration.h 14 additions, 14 deletionsMarlin/Configuration.h
- Marlin/Configuration_adv.h 4 additions, 2 deletionsMarlin/Configuration_adv.h
- Marlin/Makefile 2 additions, 2 deletionsMarlin/Makefile
- Marlin/Marlin.h 27 additions, 7 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 984 additions, 770 deletionsMarlin/Marlin_main.cpp
- Marlin/SanityCheck.h 6 additions, 3 deletionsMarlin/SanityCheck.h
- Marlin/Servo.cpp 1 addition, 1 deletionMarlin/Servo.cpp
- Marlin/Servo.h 3 additions, 3 deletionsMarlin/Servo.h
- Marlin/blinkm.cpp 2 additions, 2 deletionsMarlin/blinkm.cpp
- Marlin/blinkm.h 1 addition, 1 deletionMarlin/blinkm.h
- Marlin/cardreader.cpp 5 additions, 5 deletionsMarlin/cardreader.cpp
- Marlin/cardreader.h 1 addition, 1 deletionMarlin/cardreader.h
- Marlin/configuration_store.cpp 226 additions, 155 deletionsMarlin/configuration_store.cpp
- Marlin/configuration_store.h 3 additions, 3 deletionsMarlin/configuration_store.h
- Marlin/configurator/config/Configuration.h 8 additions, 6 deletionsMarlin/configurator/config/Configuration.h
- Marlin/configurator/config/Configuration_adv.h 4 additions, 2 deletionsMarlin/configurator/config/Configuration_adv.h
Loading
Please register or sign in to comment