b4b19a6cbd
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. |
||
---|---|---|
.. | ||
Logo | ||
BedLeveling.md | ||
changelog.md | ||
Compilation.md | ||
Contributing.md | ||
COPYING.md | ||
Features.md | ||
FilamentSensor.md | ||
GCodes.md | ||
LCD Menu Tree.pdf | ||
LCDLanguageFont.md | ||
Menu Plans.xlsx | ||
MeshBedLeveling.md | ||
RampsServoPower.md |