8 Commits (e87df99e22beb39aa7cf5893c9ca8bdd42865ae9)

Author SHA1 Message Date
Bernhard Kubicek a9c7da06e3 and changed ultipanel to have the mm/sec and not mm/min
13 years ago
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes
13 years ago
Bernhard Kubicek 40e8081623 changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
Erik van der Zalm bf879ceaa9 Added thermistor tables
13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
Erik van der Zalm 750f6c33e3 first commit
13 years ago