Commit graph

720 commits

Author SHA1 Message Date
Jaime van Kessel
d5382c7924 Merge branch 'revise_jellybox_support' of git://github.com/IMADE3D/cura 2017-04-04 13:28:53 +02:00
Ghostkeeper
6eeb61c6ff
Merge branch 'maukcc-master' 2017-03-29 13:26:14 +02:00
Ghostkeeper
23a09f7f3c
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-03-29 13:25:34 +02:00
Filip Goc
0d4a74182b update and rename jellybox definition
- jellybox -> imade3d jellybox
- includes variants
2017-03-28 12:56:19 -04:00
Ghostkeeper
2810054f8e
Fix spelling of maximum skin angle expansion description 2017-03-27 16:00:09 +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
Ghostkeeper
780e24d050 Merge branch 'master' of https://github.com/austin-makeit/Cura into austin-makeit-master 2017-03-21 10:45:43 +01:00
austin-makeit
6ed00900fe Update and rename makeit_pro_m to makeit_pro_m.def.json 2017-03-20 10:43:10 -07:00
austin-makeit
f5c9620d3b Update and rename makeit_pro_l to makeit_pro_l.def.json 2017-03-20 10:42:37 -07:00
Jack Ha
c1ca2ac09a Merge branch '2.5' 2017-03-20 12:56:35 +01:00
Tim Kuipers
35516ccc45 JSON fix: tetrehedral infill line distance was wrong (CURA-3474)
the infill line distance in the frontend is the average line distance, not the line distance between two lines which are equidistant
2017-03-17 15:05:01 +01:00
austin-makeit
8cd5c8bb69 Update makeit_pro_m 2017-03-16 15:50:54 -07:00
austin-makeit
918c5e1254 Update makeit_pro_l 2017-03-16 15:49:35 -07:00
austin-makeit
e4d32db873 Merge pull request #1 from austin-makeit/patch-2
Create MAKEiT definitions and extruders
2017-03-16 15:41:01 -07:00
austin-makeit
179919d14c Create makeit_pro_m 2017-03-16 15:33:13 -07:00
austin-makeit
d0ce717add Create makeit_pro_l 2017-03-16 15:30:42 -07:00
Jaime van Kessel
134425db90 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 11:27:54 +01:00
Jaime van Kessel
1f734d5245 Disabled the start_layers_at_same_position setting 2017-03-16 11:21:08 +01:00
Jaime van Kessel
6da6ae1b9e start_x and start_y are now settable per extruder 2017-03-16 11:19:44 +01:00
Jaime van Kessel
5bcfba0f17 Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)"
This reverts commit 1482c27b21.
2017-03-16 11:16:55 +01:00
probonopd
9dbb7fcc15 Update as per discussion in https://github.com/Ultimaker/Cura/pull/1350 2017-03-14 18:31:58 +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
Jack Ha
d7e35fa480 Added global qualities for Superdraft and Verydraft. CURA-3510 2017-03-13 14:32:45 +01:00
Ghostkeeper
41e3336ea9
Merge branch 'feature_omp_writeGcode' into 2.5 2017-03-13 09:34:37 +01:00
Ghostkeeper
137de23221
Always prefer 0.4mm nozzles at initial loading
Otherwise we might end up with 0.8mm AA cores, and those don't have a normal quality profile so that gives all sorts of trouble.
2017-03-10 18:20:42 +01:00
Tim Kuipers
5e782ae85b fix: type fix for last commit (CURA-3440) 2017-03-10 16:03:23 +01:00
Tim Kuipers
b03ac3ea78 JSON fix: skin angle for expansion is max angle; better description (CURA-3440) 2017-03-10 15:59:47 +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
MaukCC
e451737faf Update cartesio.def.json 2017-03-10 13:29:34 +01:00
MaukCC
00bcc1e6aa Update cartesio.def.json 2017-03-09 10:32:48 +01:00
MaukCC
2ea8029a81 Update cartesio.def.json 2017-03-09 09:43:43 +01:00
Tim Kuipers
e20b4ef179 Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall 2017-03-08 11:35:07 +01:00
Tim Kuipers
0f5f163fdf fix: prime tower thickness has rounding (CURA-3180) 2017-03-08 11:05:37 +01:00
Mark Burton
5a7812b4b7 Rename combing_retract_before_outer_wall setting to travel_retract_before_outer_wall.
The forced retraction can now occur irrespective of whether combing is in use or not.
2017-03-08 09:30:58 +00:00
MaukCC
ba6677636e Update cartesio.def.json 2017-03-08 09:56:21 +01:00
Tim Kuipers
3047ff26f1 fix: min warning for skin angle (CURA-3440) 2017-03-07 13:09:30 +01:00
Mark Burton
c9cdc40807 Merge remote-tracking branch 'upstream/master' into mb-combing-retract-before-outer-wall 2017-03-06 18:07:08 +00:00
Ghostkeeper
37e7971b81 Merge branch 'feature_temp_disable' 2017-03-06 16:51:59 +01:00
Tim Kuipers
87c8ff0e08 Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles 2017-03-06 14:31:57 +01:00
Tim Kuipers
34d99b5ab3 Merge branch 'smartavionics-mb-anchor-skin-in-infill' 2017-03-06 13:45:46 +01:00
Tim Kuipers
aca2faa696 fix: combing_retract_before_outer_wall always causes retraction now (CURA-3438) 2017-03-06 12:56:27 +01:00
Tim Kuipers
8fa3be5bf8 Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall 2017-03-06 12:51:04 +01:00
Ghostkeeper
44859210cc
Tweak bed adhesion settings
These settings are said to improve bed adhesion.

See https://github.com/Ultimaker/Cura/pull/1350#issuecomment-284247064
2017-03-06 11:13:20 +01:00
Tim Kuipers
4878a50b61 JSON refactor: skin expansion descriptions, defaults and new min_skin_angle_for_expansion settings (CURA-3440) 2017-03-03 14:50:46 +01:00
Tim Kuipers
a7e08f10a4 JSON fix: only enable skin expansion settings when we have it enabled (CURA-3440) 2017-03-03 12:41:54 +01:00
Tim Kuipers
5550dbf53f JSON fix: don't expand bottom skins by default (CURA-3440) 2017-03-03 12:41:14 +01:00
Tim Kuipers
3a92bf73a8 JSON fix: moved expand_skins_expand_distance and min_skin_width_for_expansion out of illegitimate parent (CURA-3440) 2017-03-03 12:37:06 +01:00