2071 Commits (055c4beaf992a16b15d18e74d628a50ddb6d05b1)
 

Author SHA1 Message Date
nothinman 9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1
11 years ago
nothinman 303ee67896 Merge pull request #864 from whosawhatsis/M200
11 years ago
Tim 8759508319 fix bug for dual extruders not working
11 years ago
whosawhatsis a65564eef6 fix bug in M200 with multiple extruders
11 years ago
whosawhatsis aeaf9b9312 fix bug in M200 with multiple extruders
11 years ago
Neil Darlow 89f78b0b80 Allow use of either SD Card slot when LCD Panel is configured.
11 years ago
David Forrest b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
pixatintes a3530d1141 Update language.h
11 years ago
pixatintes 990e770e15 Update language.h
11 years ago
Dan Nixon f643f4d674 Test and refactor
11 years ago
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman 51c6bd6b72 Merge pull request #846 from Dim3nsioneer/Marlin_v1
11 years ago
Dim3nsioneer c8cdd1fc6f Bugfixes for language option 6 (russian)
11 years ago
Dim3nsioneer 7395dafc1e semantic changes in language.h
11 years ago
Dim3nsioneer fad2a60ce6 Corrections for preheat extension in language.h
11 years ago
Ralf Schultz eecda434fb Sanguinololu servo pins set default disabled
11 years ago
Dim3nsioneer 944ced87c5 Extended Preheat options
11 years ago
Ralf Schultz 06709ad60e Added servo pin assignments to Sanguinololu
11 years ago
ErikZalm 084134d3c7 Merge pull request #841 from Dim3nsioneer/Marlin_v1
11 years ago
Dim3nsioneer 3906f27c46 Individual extruder flow rate
11 years ago
Dim3nsioneer 8613a74443 Merge pull request #1 from ErikZalm/Marlin_v1
11 years ago
Dan Nixon a38c90ee84 Added estop handling
11 years ago
ErikZalm a00cec8b71 Merge pull request #833 from mattsch/optional_feedrate_multiplier
11 years ago
ErikZalm 1f895844ac Merge pull request #829 from blddk/Marlin_v1
11 years ago
neildarlow af8be9013b Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
whosawhatsis 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
Dan Nixon 272072fa20 Added M112
11 years ago
whosawhatsis aab61e63c3 FWRETRACT in mm/s
11 years ago
Matthew Schick 6cd85e6008 Add support for disabling encoder control for feedrate multiplier
11 years ago
blddk 09af1b90b8 Added CHDK support
11 years ago
blddk 765b2da3d4 Added CHDK support
11 years ago
paciotti 881e348eed Update Configuration_adv.h
11 years ago
neildarlow 5a332df47e Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman 040357fd1b Merge pull request #822 from tommil/Marlin_v1
11 years ago
Tommi Lamberg 15d1b8d719 Fixed finnish translation
11 years ago
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
ErikZalm 7f76a0e064 Merge pull request #813 from drf5n/PID_DEBUG
11 years ago
ErikZalm 4f3eb6bec8 Merge pull request #811 from anfroholic/patch-1
11 years ago
Erik van der Zalm fcd8524b6e Only increase EEPROM version for DELTA printers.
11 years ago
ErikZalm 8c98690e1d Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration
11 years ago
Jim Morris 8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
11 years ago
David Forrest 8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
anfroholic 661e378ce9 Update README.md
11 years ago
ErikZalm fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5
11 years ago
ErikZalm 1aa10a5f18 Merge pull request #806 from Cylindric3D/typofixes_upstream
11 years ago
Cylindric fdce91192e Various typo fixes - only in comments, no code changes.
11 years ago
Cylindric d819c55395 Various typo fixes - only in comments, no code changes.
11 years ago
ErikZalm fd4542f33a Merge pull request #805 from whosawhatsis/M200
11 years ago
ErikZalm e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1
11 years ago
ErikZalm 465b654d24 Merge pull request #797 from Cylindric3D/update_menu_plan
11 years ago