Commit graph

243 commits

Author SHA1 Message Date
Tim Kuipers
e57ca0aa53 JSON remove: removed Fill Gaps Between Walls (CURA-996) 2016-05-12 17:52:24 +02:00
Tim Kuipers
8a4fdf8fb3 JSON remove: removed Remove Overlapping Wall Parts (CURA-996) 2016-05-12 17:50:02 +02:00
Tim Kuipers
0b0e53dcf5 JSON fix: max infill combine is 8 layers cause of cura statically defined array length (CURA-1255) 2016-05-11 09:37:21 +02:00
Tim Kuipers
581edfeaa5 JSON: fix: better max infill_sparse_thickness (CURA-1255) 2016-05-04 16:21:53 +02:00
Tim Kuipers
51ed0f317b JSON feat: conical_overhang_angle (CURA-1412) 2016-05-04 15:49:07 +02:00
Tim Kuipers
46f4caab32 JSON feat: conical_overhang_enabled (CURA-1412) 2016-05-04 15:32:20 +02:00
Tim Kuipers
4aaa528ea2 JSON feat: settings split: Compensate Overlapping wall parts ==> outer ; inner wall parts (CURA-995) 2016-05-04 15:11:11 +02:00
Tim Kuipers
a0838256e2 JSON fix: regular fan speed at layer inherit function was a bit off 2016-05-04 14:07:46 +02:00
Tim Kuipers
5a891a5fa2 JSON refactor: moved support z distance above support xy distance options (CURA-1479)
The support dist priority option may enable the xy dist overhang option, so it's logical to group it with the xy dist options, but it presumes you know about the support z distance, so it's more logical to put the x distance options above the xy distance options.
2016-05-04 11:46:42 +02:00
Tim Kuipers
fd871c35ca JSON feat: support_xy_overrides_z and support_xy_distance_overhang (CURA-1479) 2016-05-04 11:43:59 +02:00
Tim Kuipers
a176c6a977 JSON: fix for support roof vs infill speed visiblity 2016-04-28 12:30:03 +02:00
Ghostkeeper
43dff1296c Move retraction distance to material settings
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces
Contributes to issue CURA-695.
2016-04-20 17:18:10 +02:00
Tim Kuipers
6799a76a7c JSON fix: combing mode default enum value (CURA-694) 2016-04-20 15:25:23 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +02:00
Jaime van Kessel
8a94739de0 Raft line widths now inherit from line_width
CURA-695
2016-04-15 16:08:23 +02:00
Tim Kuipers
7ea02f9d98 JSON fix: Infill Overlap mm didn't default to 0 when infill was too dense (CURA-786) 2016-04-14 13:50:40 +02:00
Tim Kuipers
f426ba3168 changed infill overlap min_value to min_value_warning and made it -50% (CURA-786)
-50% corresponds to the value where the hole in the nozzle just at the boundary of the inner wall
2016-04-14 13:33:00 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json
CURA-1394
2016-04-14 11:49:46 +02:00
Tim Kuipers
592d98d4fd JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:56:34 +02:00
Tim Kuipers
cc06c632a1 JSON: refactor: combing bool ==> enum; introduction of noskin combing (CURA-694) 2016-04-13 09:50:51 +02:00
Tim Kuipers
a57125292d JSON fix: syntax mistake 2016-04-11 19:10:16 +02:00
Tim Kuipers
59f5bcb1cd feat: infill overlap in mm (besides %) (CURA-786) 2016-04-11 18:57:37 +02:00
Tim Kuipers
a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura
This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349
2016-04-11 18:50:41 +02:00
Simon Edwards
8fad56c1f4 Revert a number of Settings names changes after code review.
CURA-1177
2016-04-11 11:13:20 +02:00
Tim Kuipers
2ccdf674c8 JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374) 2016-04-08 14:34:36 +02:00
Ghostkeeper
db173f1347 Add more speed limits
Can't have our users breaking the laws of physics.
2016-04-06 13:58:56 +02:00
Simon Edwards
a15d864f0f Updated the Surface Mode description
Fixes CURA-850
2016-04-06 13:56:23 +02:00
Simon Edwards
3fa19e576b Fixed a few minor english errors in the settings names. 2016-04-06 11:47:02 +02:00
Simon Edwards
0187224137 Settings names are now meaningful outside their place/category in the sidebar.
Fixes CURA-1177
2016-04-06 11:46:53 +02:00
Ghostkeeper
7a217130a7
Fix profiles and FDMprinter after merge
Merge didn't go too well.

Contributes to issue CURA-1235.
2016-04-05 09:49:44 +02:00
Ghostkeeper
0684cee681 Merge branch '2.1'
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
2016-04-04 18:49:09 +02:00
Tim Kuipers
efdd92d358 JSON: fix: hide alternate skin rotation when skin pattern is concentric (CURA-1235) 2016-04-04 14:27:19 +02:00
Jaime van Kessel
c1e0b38b8e Moved multiple settings (draft shield, coasting, conical support, etc) into experimental
CURA-1267
2016-04-04 13:42:15 +02:00
Ghostkeeper
fd75276ed8
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
Conflicts:
	resources/machines/fdmprinter.json
2016-03-31 18:42:03 +02:00
Ghostkeeper
2d86606b5a
Use double quotes for string
Contributes to issue CURA-1309.
2016-03-31 18:31:04 +02:00
Ghostkeeper
53018b49a4
Restore Extra Skin Wall Count description
Contributes to issue CURA-1309.
2016-03-31 18:26:20 +02:00
Ghostkeeper
b2042b84f9
Capitalise all setting labels
Contributes to issue CURA-1309.
2016-03-31 18:11:59 +02:00
Ghostkeeper
5387699174
American spelling
Contributes to issue CURA-1309.
2016-03-31 18:04:26 +02:00
Ghostkeeper
b11051b281 Improve language construction
Contributes to issue CURA-1309.
2016-03-31 17:56:00 +02:00
Ghostkeeper
3a7a1a4baa
Remove superfluous spaces
Contributes to issue CURA-1309.
2016-03-31 17:47:15 +02:00
Jaime van Kessel
926dc1a010 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:46:00 +02:00
Jaime van Kessel
6951b78ee0 Set magic_fuzzy_skin_thickness min value to 0.001
CURA-1125
2016-03-31 16:45:15 +02:00
Tim Kuipers
2290c8298d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:15:05 +02:00
Tim Kuipers
76bd1cc78c JSON: language fixes by Jeroen (CURA-1309) 2016-03-31 16:14:48 +02:00
Jaime van Kessel
f3d600b72e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 13:51:19 +02:00
Jaime van Kessel
b7a465afd6 Added round to top/bottom layer calculation
This is because 1.12 / 0.04 = 28.000000000000004 according to python.
The math.ceil then ensured that the result was 29 (instead of expected 28)
CURA-1140
2016-03-31 13:50:04 +02:00
Tim Kuipers
9a780b56ef Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 12:51:26 +02:00
Tim Kuipers
b8dee1b166 JSON: max warning value draft shield height 2016-03-31 12:51:15 +02:00