225 Commits (1c889cd303f9b4ac5125f4a972b0a6f3c8e3d7be)

Author SHA1 Message Date
stohn 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS

When you add new menu items / messages always copy them to ALL
languages (just use english)
13 years ago
Blair Thompson aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. 13 years ago
stohn 69961dbba3 fixed incorrect menu messages from last commit...
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
13 years ago
Blair Thompson 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde 13 years ago
elgambitero d38b96fff1 Update Marlin/language.h 13 years ago
Erik vd Zalm 9f7f7354f5 Set default language 1 13 years ago
elgambitero aee475aa55 Update Marlin/language.h
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
13 years ago
James Adams e10355500d Updated Language.h with pause, resume, and retract 13 years ago
kobaan 603a5e25b3 Updated german translations in language.h and eliminated a few double lines. 13 years ago
Bernhard bf077125b9 added firmware retract. disabled by default 13 years ago
Daid b59724e42b Add strigification for extruder amount in M115 report. 13 years ago
Daid 516ec90242 Add M401 - Wait for user on LCD button press 13 years ago
Daid 279d00da9f Fixed #if for Ultimaker. 13 years ago
Erik de Bruijn 5aa80e6c05 Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel" 13 years ago
Daid 8503b78876 Added support for 2nd extruder temperature to UltraLCD 13 years ago
tgiphil ad8bc71d3e - Fixed a typo 13 years ago
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
Erik van der Zalm 4deeffbc88 Added missing defines to the german section.
Translation still needed.
13 years ago
Erik van der Zalm 632528aa95 merging with SCUBA82 13 years ago
Blair Thompson 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. 13 years ago
Christian Thalhammer a92b3afe64 added german translation;Menue should be in english.. sounds better 13 years ago
Christian Thalhammer 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
english
13 years ago
Blair Thompson d9f2f509d5 Added new menu items under the prepare submenu.
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
Erik van der Zalm ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu
13 years ago
Blair Thompson fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu.
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years ago