Bernhard Kubicek
|
a9c7da06e3
|
and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
|
13 年之前 |
Erik van der Zalm
|
65934eee9c
|
A lot of changes in the planner code
|
13 年之前 |
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
13 年之前 |
Bernhard Kubicek
|
40e8081623
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
13 年之前 |
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 年之前 |
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
13 年之前 |
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
13 年之前 |
Erik van der Zalm
|
750f6c33e3
|
first commit
|
13 年之前 |