Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_granty_fix_15017

This commit is contained in:
Scott Lahteine
2019-08-23 23:45:37 -05:00
640 changed files with 36424 additions and 4761 deletions

View File

@ -135,7 +135,7 @@
#endif
// Name displayed in the LCD "Ready" message and Info menu
//#define CUSTOM_MACHINE_NAME "ADIMLab Granty V2"
#define CUSTOM_MACHINE_NAME "ADIMLab Granty V2"
// Printer's unique ID, used by some programs to differentiate between machines.
// Choose your own or use a service like http://www.uuidgenerator.net/version4