Commit graph

359 commits

Author SHA1 Message Date
Jaime van Kessel
4194a9772f Updates description of support_z_height
CURA-788
2016-02-08 16:34:56 +01:00
Ghostkeeper
f05da7212a Define which settings are global-only
And when, in case it depends on something like the print sequence.

Contributes to issue CURA-458.
2016-02-08 15:59:58 +01:00
Tim Kuipers
847ab01272 Revert "JSON: feat: modifier mesh setting (83"
This reverts commit 682ef482af.
2016-02-08 10:21:53 +01:00
fieldOfView
2f022244c1 Edit UM2Extender+ profiles to use UM2+ profiles 2016-02-08 09:20:47 +01:00
fieldOfView
277dd71759 Align variant naming in profiles and machine definitions 2016-02-08 09:18:33 +01:00
fieldOfView
9bd13cf9a7 Add JARJAR machine definitions from cura-private-data 2016-02-08 09:18:32 +01:00
Tim Kuipers
682ef482af JSON: feat: modifier mesh setting (83
CURA-833)
2016-02-04 20:20:45 +01:00
Tim Kuipers
fd5d029c4b infill overlap % ==> mm (CURA-786) 2016-02-01 11:53:19 +01:00
Tim Kuipers
319d8197ab fix: bq_hephestos profile syntax error 2016-01-28 15:29:20 +01:00
Tim Kuipers
8a48791a0b Merge branch '2.1' 2016-01-28 15:25:18 +01:00
Tim Kuipers
d6bd59da0e made some settings max value warning instead of impossible 2016-01-27 10:21:34 +01:00
Tim Kuipers
7c652ed069 JSON: refactor: moved draft shield options to Cooling category 2016-01-26 15:55:00 +01:00
Jaime van Kessel
6ce25a0369 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 11:38:07 +01:00
Jaime van Kessel
414be1f851 Added ultimaker2 plus definitions 2016-01-22 11:37:18 +01:00
Ghostkeeper
0a07449759 Realign BQ Hephestos 2 platform
Contributes to issue #595.
2016-01-22 10:57:15 +01:00
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
02b4b9439b fix: all dual extrusion settings now have min_value(_warning) and max_value(_warning) specifications (CURA-666) 2016-01-07 19:16:56 +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
Jaime van Kessel
b2ef5c1afb Changed manufacturer for M180 to "other" 2016-01-05 17:20:12 +01:00
Ghostkeeper
0e22fdab19 Add machine Malyan M180
This is a translation of the machine that Malyan made for version 15.06. The settings should be the same as what Malyan provided back then.
2016-01-05 00:57:49 +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
Tim Kuipers
cde6e4c655 JSON: extruder trains were reversed (CURA-494) 2015-12-14 15:20:09 +01: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
99d9348c38 extruder trains can now be overridden (CURA-494) 2015-12-09 16:28:48 +01: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
ff500e4315 JSON: machine_extruder_trains array refactored to objcet with int children (CURA-494) 2015-12-09 14:15:23 +01:00
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +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