Commit graph

1391 commits

Author SHA1 Message Date
Tim Kuipers
11f7f521c9 Merge branch '2.1' 2015-12-08 16:15:43 +01:00
Tamara Hogenhout
9388fd9e55 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-08 13:45:28 +01:00
Tamara Hogenhout
70b221b33a Proof of concept to test the global-only functionalities
Contributes to #CURA-460458
2015-12-08 13:44:59 +01:00
Tamara Hogenhout
f8dbe056b2 Adds a global-only role to the SettingOverrideModel
Also adds a reload function

Contributes to #CURA-458
2015-12-08 13:43:37 +01:00
Tamara Hogenhout
2e5bac5392 Displays settings based on whether they are global-only or not
blobal-only means it's not allowed to be used as a per object setting

Contribute to #CURA-458
2015-12-08 13:42:16 +01:00
Tim Kuipers
4932ef819c JSON fix: Min Volume Before Coasting doesn't include Coasting Volume anymore (CURA-528) 2015-12-08 13:30:12 +01:00
Tim Kuipers
5009ac99e6 retrieve brim_width instead of brim_line_count * skirt_line_width (CURA-550) 2015-12-08 10:51:07 +01:00
Tim Kuipers
a4e824464c JSON bugfix: coasting_min_volume had an inherit_function and the inherit property (CURA-550) 2015-12-08 10:47:09 +01:00
Tim Kuipers
71c8393f8c JSON bugfix: default brim width (CURA-550) 2015-12-08 10:13:23 +01:00
Tim Kuipers
26a7fc7bdc JSON: made brim_line_count default match brim_width_default for 0.4 nozzles (CURA-550) 2015-12-08 09:50:34 +01:00
Tim Kuipers
8a853e5b05 JSON bugfix: infill_density ==> infill_sparse_density (CURA-550) 2015-12-08 09:48:01 +01:00
Tim Kuipers
6ef68ca5c1 JSON: made coasting_min_volume depend on coasting_volume (CURA-550) 2015-12-08 09:47:20 +01:00
Tim Kuipers
67bbb5478e JSON: (bugfix) introduced brim_width (CURA-550) 2015-12-08 09:38:21 +01:00
Tim Kuipers
e69bdd4fe5 JSON: introduced brim_width (CURA-550) 2015-12-07 18:11:48 +01:00
Tim Kuipers
b86a219315 JSON: fix: coasting min volume should be at least as high as coasting volume (CURA-528) 2015-12-07 18:05:00 +01:00
Arjen Hiemstra
c854221d4f Update default profiles with values as supplied by Paul 2015-12-04 17:12:27 +01:00
Arjen Hiemstra
48a3e06fd6 Update default profiles with values as supplied by Paul 2015-12-04 17:09:05 +01:00
Arjen Hiemstra
fd4943b18a Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:45 +01:00
Arjen Hiemstra
92ff7e9360 Fix variant selection dropdown in sidebar so it actually selects a variant 2015-12-04 16:46:12 +01:00
Tim Kuipers
0f54e1e712 JSON: better retraction_count_max 2015-12-04 11:22:58 +01:00
Ghostkeeper
e0ebff91ed Remove period from setting label
The 'Use towers' setting had a period behind the name. It shouldn't have.
2015-12-04 11:12:37 +01:00
Tim Kuipers
ca49226e18 JSON: better retraction_count_max 2015-12-04 11:04:42 +01:00
Tim Kuipers
8dce36583f Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-03 17:54:34 +01:00
Tim Kuipers
531033c53b JSON: removed coasting dichotomy between move and retract (CURA-486) 2015-12-03 17:54:18 +01:00
Ghostkeeper
1db430c61a Log errors in case the file writing fails
An error message is written to the log including the file that was not written to and the stringified exception.
2015-12-03 14:09:22 +01:00
Tim Kuipers
840bf5d504 JSON: changed temp-flow graph to comply approx with the graph for silver PLA on the UM2 (CURA-299) 2015-12-02 17:46:22 +01:00
Tim Kuipers
758aa31ae6 changed temp-flow graph to comply approx with the graph for silver PLA on the UM2 (CURA-299) 2015-12-02 17:37:37 +01:00
fieldOfView
4edc258df0 "min_value" should be a string, fixes CURA-521 2015-12-02 15:26:06 +01:00
Tim Kuipers
976abd5df8 JSON: support extruder nr for roof/layer_0 children of support_extruder_nr and introduced new support_infill_extruder_nr (CURA-366)
The engine now retrieves support_infill_extruder_nr instead of support_extruder_nr
2015-12-01 16:06:19 +01:00
Tim Kuipers
b2b477fda8 JSON: support infill name change and label and description (CURA-366) 2015-12-01 16:04:52 +01:00
Tim Kuipers
09f75dea15 JSON: small fix descriptions machine settings (CURA-365) 2015-12-01 14:42:38 +01:00
Tim Kuipers
bf701640b9 JSON: lil: * ==> ° 2015-12-01 14:39:07 +01:00
Tim Kuipers
4f8ac05851 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-12-01 13:46:17 +01:00
Tim Kuipers
4c668c9a1e JSON: bugfix: retraction limitation didnt have min_value defs (CURA-414) 2015-12-01 13:46:07 +01:00
Arjen Hiemstra
aefed915e2 Remove debug code
Fixes CURA-518
2015-12-01 13:03:41 +01:00
Jaime van Kessel
562cd2b8fa Update README.md
Added the barbarian tool
2015-12-01 11:16:15 +01:00
Arjen Hiemstra
949fd199a8 Fix the last code style issue 2015-11-30 11:56:08 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Tim Kuipers
b245fe732b JSON: bugfix/feat: introduced missing Dual Extrusion Overlap 2015-11-26 17:03:58 +01:00
Tim Kuipers
938ac7a08b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-11-26 16:43:15 +01:00
Tim Kuipers
f044f96910 JSON: bugfix: skin_outline_count label 2015-11-26 16:43:05 +01:00
daid
9302a36391 Small codestyle fix. 2015-11-26 15:29:32 +01:00
Tim Kuipers
914062a0bd JSON: prime tower visible by default 2015-11-26 12:26:17 +01:00
Tim Kuipers
abc95f6d8c JSON: better retraction count max 2015-11-26 12:09:16 +01:00
Tim Kuipers
e53a5b0928 JSON: bugfix: enable_prime_tower worked inversedly 2015-11-26 12:08:58 +01:00
Tim Kuipers
97ca5cf95a Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-11-25 10:07:45 +01:00
Tim Kuipers
f31105c2bd lil 2015-11-24 15:43:43 +01:00
ckielstra
5c73da1054 A few more spelling fixes.
CURA-206
2015-11-24 14:57:24 +01:00
Tamara Hogenhout
a87680f354 fixes the worst typo's for the 2.1 release
Consistensy/teminology will be picked up by SMS or a translations agency which SMS hires.

Fixes #CURA-206
2015-11-23 14:29:07 +01:00