3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 23:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
1998 commits 330 branches 295 tags 714 MiB
Commit graph

154 commits

Author SHA1 Message Date
Tamara Hogenhout
a43f9ef435 makes the mm's square again 
fixes #CURA-526
 2016-01-15 17:20:40 +01:00
Tamara Hogenhout
fab62430e0 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-08 13:36:41 +01:00
Tamara Hogenhout
533a171f8b Removes certain symbols that give problems with the extract-json script 
contributes to #CURA-526
 2016-01-08 13:34:47 +01:00
Tim Kuipers
3767ea06f6 bugfix: wrong min/max_value(_warning) (CURA-666) 2016-01-07 19:34:24 +01:00
Tim Kuipers
f3322d06b0 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-07 19:08:37 +01:00
Tim Kuipers
2dc0118d3d fix: all settings now have either a min_value or a min_value_warning, and if possible a max_value or a max_value_warning (CURA-666) 
Also some min_value settings were a number instead of a string with a number...
 2016-01-07 19:08:27 +01:00
Tamara Hogenhout
7115cd6bc2 Revert "Removes certain symbols that give problems with the extract-json script" 
This reverts commit 9f61bff08f.
 2016-01-07 13:32:04 +01:00
Tim Kuipers
9a6980211c Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-07 12:07:23 +01:00
Tim Kuipers
bf6015e312 lil fix: min value for brim width (CURA-435) 2016-01-07 12:07:12 +01:00
Tamara Hogenhout
9f61bff08f Removes certain symbols that give problems with the extract-json script 
contributes to #CURA-526
 2016-01-07 11:46:54 +01:00
Kurt Loeffler
5cff8a033f Moved Nozzle Diameter into a new "Machine" category in the UI. This category needs icon art. 2015-12-23 12:04:41 +01:00
Kurt Loeffler
050bc91912 Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. 
Cherry pick from master.
Conflicts:
	resources/machines/ultimaker2.json
	resources/machines/ultimaker_original.json

Contributes to issue CURA-276.
 2015-12-23 12:02:42 +01:00
Kurt Loeffler
38d2bff8c6 Moved Nozzle Diameter into a new "Machine" category in the UI. This category needs icon art. 2015-12-22 22:49:13 -08:00
Tim Kuipers
788a40c656 lil fix 2015-12-17 12:45:35 +01:00
ckielstra
9bc7b6b6b7 Spelling 2015-12-17 09:21:15 +01:00
Kurt Loeffler
608bfa568b Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. 2015-12-14 11:14:55 -08:00
Kurt Loeffler
384f4fbeaf Reverting 88c8765ee2 2015-12-14 10:29:02 -08:00
Kurt Loeffler
88c8765ee2 Changed the name of the Lone Width field to Nozzle Diameter in the UI to make its use more clear. When the active machine profile is an Ultimaker 2 it will also mention the Olsson Block. 2015-12-11 12:55:28 -08:00
Tim Kuipers
17e372820c JSON: machine_show_variants was never defined in fdmPrinter.json (CURA-494) 2015-12-09 16:28:31 +01:00
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
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
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
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
531033c53b JSON: removed coasting dichotomy between move and retract (CURA-486) 2015-12-03 17:54:18 +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
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
4c668c9a1e JSON: bugfix: retraction limitation didnt have min_value defs (CURA-414) 2015-12-01 13:46:07 +01:00
Tim Kuipers
f044f96910 JSON: bugfix: skin_outline_count label 2015-11-26 16:43:05 +01:00
Tim Kuipers
abc95f6d8c JSON: better retraction count max 2015-11-26 12:09:16 +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
Tim Kuipers
94ee3882ad JSON: PR fix: material_print_temp_prepend and material_bed_temp_prepend weren't in the json file 2015-11-17 12:04:16 +01:00
Tim Kuipers
c493b64cb8 JSON: description of new material_print_temp_wait and material_bed_temp_wait 2015-11-17 10:45:56 +01:00