95 Commits (19530c99459b0db67975a66a5dc70e22e994c472)

Author SHA1 Message Date
nothinman 19530c9945 Revert "Merge pull request #756 from danielmartinez/aragones"
11 years ago
Daniel Martinez 8b67f6f3e8 Add Aragonese translation
11 years ago
whosawhatsis d24df7af2c M200 implementation
11 years ago
Alex Borro 05932e4458 Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
daid df194f75e1 Added PT100 support for Ultiboard2
11 years ago
Alex Borro b33375d438 Z Axis Safe Homing when using Z Probe
11 years ago
Erik van der Zalm 48a185d004 Fixed compile errors from bad commits.
11 years ago
Kaz Walker a5e8575829 Add UUID support to M115 responses.
11 years ago
Guillaume Seguin eb23a68e92 Update French translation in language.h
11 years ago
Guillaume Seguin 44f327d738 Uniformly reindent language.h
11 years ago
Guillaume Seguin 326d2db025 Update language.h so that all languages compile
11 years ago
Guillaume Seguin 2cb716f513 Run Marlin/language.h through dos2unix
11 years ago
Guillaume Seguin 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
Erik van der Zalm cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
Michael Mayer e509cdbeb0 added contrast control function for gLCDs
12 years ago
Gabino Lopez 68be33b1fc Update language.h
12 years ago
Nicolas Rossi 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
12 years ago
Erik van der Zalm 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
12 years ago
Erik van der Zalm bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
12 years ago
Erik van der Zalm 73f21cd5d6 Spanish updated so far.
12 years ago
Erik van der Zalm 8b0d82e9db Removed "awaiting translation" for french
12 years ago
BorisLandoni c1d7cf939e Update language.h
12 years ago
Scott Lahteine a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
12 years ago
daid303 ac52dcc174 Updated the card menu and watch messages to make it more informative.
12 years ago
Simon Oliver 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
12 years ago
Erik van der Zalm 038d405254 Corrected #endif in language.h
12 years ago
Dirk Eichel 443aaa30bf Removed GIT fragments
12 years ago
Dirk Eichel 4e448b700a Merged fetched files from Marlin_v1 branch
12 years ago
blddk d2b00fe486 Removed html and added rumba
12 years ago
Dirk Eichel 233df9cca0 Add missing LF at the end of the file
12 years ago
Dirk Eichel bb0de75a92 Removed umwanted HTML code ath the end of the file
12 years ago
Nicolas Rossi 86bf911139 Toggle menu for PSU from LCD pannel
12 years ago
Dirk Eichel ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
Dirk Eichel 8efd4cfd73 fixed merge conflict
12 years ago
Denis Bakin 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
12 years ago
daid 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1
12 years ago
Daniele Sdei 82e28851bd Italian language: SD-Card change and SD-Card init
12 years ago
Daniele Sdei aed5965ad8 Italian language: remove space and some fix
12 years ago
codenamepawel d360846dd4 Update Marlin/language.h
12 years ago
Dirk Eichel a0d4e8e78e Add Messages for SD Card init. & change
12 years ago
Denis B 70871715e4 Added support for extruder offset handling
12 years ago
Bernhard 1d06b10962 Added a feature to have filament change by gcode or display trigger.
12 years ago
Daniele Sdei 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
daid 965baf2683 Merge pull request #362 from daid/Marlin_v1
12 years ago
Henry Palonen 7f30039d2a + Finnish translation
12 years ago
Daniele Sdei 5f82f03ff3 Add italian MSG_RESUMING.
12 years ago
daid303 5e3873c8db Add german MSG_RESUMING.
12 years ago
daid303 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
Sergey Taranenko 58e806f3fa Fix the russial translation.
12 years ago
Sergey Taranenko 50a5ce1dc4 deduplicate messages
12 years ago