70 Commits

Author SHA1 Message Date
Lipu Fei
75573da9dd Fix merge conflicts with master 2018-02-27 13:08:29 +01:00
maukcc
c323bac306 extruder change update
extruder change update:
- wiping nozzles
- temperature updates
2018-02-20 17:15:21 +01:00
Lipu Fei
73968e5c48 Revert "WIP: Update and fix definition files"
This reverts commit 27a346a58beaea9de249ebf229f0979d51ad21ff.
2018-02-16 14:23:11 +01:00
Lipu Fei
5ad4447e37 WIP: Update and fix definition files 2018-02-16 14:23:11 +01:00
Lipu Fei
c469ebbf9f WIP: Fix material lookup problems and update definition files 2018-02-16 14:23:11 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master 2017-11-14 11:59:35 +01:00
MaukCC
38882c6d13
Update cartesio.def.json 2017-11-14 10:53:51 +01:00
maukcc
ef2d9b0468 Cartesio profiles
updated prime tower
update PC profiles
2017-11-14 10:30:10 +01:00
Ghostkeeper
202f7f87f8
Remove ID from definition files
Sometimes it's out of sync. Sometimes even missing. Let's just not use that any more.

Contributes to issue CURA-4243.
2017-11-02 12:53:06 +01:00
Ghostkeeper
4b4f971222
Make 'other' the default category
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
2017-08-25 09:17:55 +02:00
Ghostkeeper
66c97259c2
Make prime tower automatic formula the default for all FDM printers
The Custom FDM Printer had wrong positions by default as well.
2017-07-21 12:56:37 +02:00
maukcc
50d3ba9fbe Cartesio extruders start positions
Cartesio extruders start and end positions added
2017-07-12 13:43:54 +02:00
maukcc
194d7bb3b8 Cartesio profiles update
Cartesio disalowed areas
Cartesio extruder offsets
Cartesio high quality profiles
2017-07-04 14:58:01 +02:00
maukcc
88e761e1be Cartesio acc. and jerk control
Added acceleration and jerk control for normal opperation, for special
materials, and for multi material jobs.
2017-06-02 09:41:04 +02:00
Scheepers
f8691d6190 New Cartesio build platform 2017-05-13 13:10:24 +02:00
MaukCC
570b8767e0 Update cartesio.def.json 2017-05-08 13:27:01 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
MaukCC
6ecd780bea Update cartesio.def.json 2017-04-20 14:47:43 +02:00
MaukCC
10233b2c02 Update cartesio.def.json 2017-04-20 11:53:05 +02:00
MaukCC
47aa044f7c Update cartesio.def.json 2017-04-20 11:33:36 +02:00
MaukCC
4c9b8bdf0a Update cartesio.def.json 2017-04-20 10:18:30 +02:00
MaukCC
91e0ab8fde Update cartesio.def.json 2017-04-20 10:16:04 +02:00
MaukCC
ebcf1baae8 Update cartesio.def.json 2017-04-20 10:13:21 +02:00
MaukCC
5aee2556a1 Update cartesio.def.json 2017-04-20 08:45:48 +02:00
MaukCC
5a4475c7d9 Update cartesio.def.json 2017-04-20 08:42:47 +02:00
MaukCC
c686cecb6b Update cartesio.def.json 2017-04-18 09:33:29 +02:00
MaukCC
3319d07729 Update cartesio.def.json 2017-04-12 15:02:19 +02:00
MaukCC
d0cc5c1a0c Update cartesio.def.json 2017-04-12 10:44:29 +02:00
MaukCC
14e65ae2b8 Update cartesio.def.json 2017-04-12 10:10:57 +02:00
MaukCC
39befe1c22 Update cartesio.def.json 2017-04-07 13:06:14 +02:00
MaukCC
2ea6487368 Update cartesio.def.json 2017-04-06 15:27:59 +02:00
MaukCC
d7caa860a7 Update cartesio.def.json 2017-04-06 14:13:05 +02:00
MaukCC
288e519278 Update cartesio.def.json 2017-04-06 12:13:39 +02:00
MaukCC
8d49bbd2f5 Update cartesio.def.json 2017-04-05 16:40:02 +02:00
MaukCC
513ede0fda Update cartesio.def.json 2017-04-05 09:07:14 +02:00
MaukCC
8ff057d483 Update cartesio.def.json 2017-04-05 09:05:29 +02:00
MaukCC
e6bdf8c8f6 Update cartesio.def.json 2017-04-05 09:04:16 +02:00
MaukCC
edbfd4343a Update cartesio.def.json 2017-04-04 20:46:37 +02:00
MaukCC
21c14f58aa Update cartesio.def.json 2017-04-04 18:05:27 +02:00
MaukCC
bb200fa9e8 Update cartesio.def.json 2017-04-04 18:04:25 +02:00
MaukCC
c9397fd986 Update cartesio.def.json 2017-04-04 18:01:52 +02:00
Ghostkeeper
23a09f7f3c
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-03-29 13:25:34 +02:00
MaukCC
83f5619be0 Update cartesio.def.json 2017-03-22 09:45:41 +01:00
MaukCC
4e698cb685 Update cartesio.def.json 2017-03-22 09:45:23 +01:00
MaukCC
35c0f3ca74 Update cartesio.def.json 2017-03-14 15:05:20 +01:00
MaukCC
5428a29a28 Update cartesio.def.json 2017-03-14 14:44:56 +01:00
MaukCC
0ea296f240 Update cartesio.def.json 2017-03-10 13:55:08 +01:00
MaukCC
e5e518ba76 Update cartesio.def.json 2017-03-10 13:52:24 +01:00