Commit graph

158 commits

Author SHA1 Message Date
Ghostkeeper
0989f8ced7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 09:31:15 +01:00
Tim Kuipers
a168eab140 JSON: fix: cone angle sign inverted compared to description (CURA-869) 2016-02-22 16:51:56 +01:00
Ghostkeeper
cbcbf3c971 Improve default support settings
These were found by Paul to be better. I agree on the Touching Buildplate option being the one that the user most likely would use most often, and I am inclined to take his word on the support angle.
2016-02-22 15:45:21 +01:00
Ghostkeeper
2aac62f55b Remove variant setting overrides from machine settings
These will be implemented by the new profiles.

Contributes to issue CURA-892.
2016-02-22 14:20:35 +01:00
Tim Kuipers
7425c32aa4 JSON: moved Standby Temp to dual_extrusion_settings (CURA-868) 2016-02-19 16:08:40 +01:00
Tim Kuipers
f0e60d65ff JSON: disable Extrusion Cool Down Speed Modifier when no auto temp or single extrusion (CURA-868) 2016-02-19 15:56:14 +01:00
Tim Kuipers
765185364f JSON: quickfix: made Auto Temp always not displayed (CURA-868) 2016-02-17 10:36:30 +01:00
fieldOfView
09c04d7c68 Add sidebar header icon for "machine" category 2016-02-16 22:43:36 +01:00
Ghostkeeper
4ccf4fe718 Change global-only behaviour of some adhesion settings
They don't always work when set per-object. So don't allow it.

Contributes to issue CURA-458.
2016-02-15 15:30:52 +01:00
Ghostkeeper
69331696f0 Revert UM2+ machine names
This was causing problems in the listing of the printers due to the variants. I still don't really know why it was causing these problems but I've reverted the changes and it seems to have been fixed now.

Contributes to issue CURA-440.
2016-02-15 11:03:44 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
2016-02-12 17:09:42 +01:00
Tim Kuipers
07d0e433a8 JSON: made some essential settings visible by default: conical support, brim settings, raft settings (CURA-877) 2016-02-12 16:19:00 +01:00
Tim Kuipers
ed5e59df57 JSON: made some settings not visible by default (CURA-877) 2016-02-12 16:04:17 +01:00
Tim Kuipers
58238a5933 JSON: made line_width max value warning depend on nozzle size (CURA-876) 2016-02-12 15:56:03 +01:00
Tim Kuipers
5614302f74 JSON: made layer height max value warning depend on nozzle size (CURA-876) 2016-02-12 15:54:06 +01:00
Tim Kuipers
9545f7da36 JSON: fix: retraction settings not visible for UM2 anymore (CURA-875) 2016-02-12 15:44:04 +01:00
Tim Kuipers
1271a7407e JSON: support tower settings disabled if use_tower=Flase (CURA-870) 2016-02-12 15:26:56 +01:00
Tim Kuipers
18ef6f9a69 JSON: default tower diam and support minimal diam changed to 3mm (CURA-870) 2016-02-12 13:58:23 +01:00
Tim Kuipers
14b6ae2a4c JSON: made support_minimal_diameter child of support_tower_diameter (CURA-870) 2016-02-12 13:52:41 +01:00
Tim Kuipers
42e6d88e7f JSON: default cone angle inversed to get less support by default (CURA-869) 2016-02-12 13:39:19 +01:00
Ghostkeeper
29e01a698b Match MIME types in printers with writer plugins
The MIME types as specified in the printer definitions need to match the MIME types specified in the mesh writer plugins.

Contributes to issue CURA-611.
2016-02-09 17:16:38 +01:00
Ghostkeeper
0fc17ffda0 Move file types to machine metadata
Much better place than machine settings...

Contributes to issue CURA-611.
2016-02-09 15:25:49 +01:00
Ghostkeeper
80698c47de Add machine_file_format setting
This will determine which file formats a machine is able to save to. The setting is currently not yet used. It will be used to filter the output formats under the Save to File dialogue.

Contributes to issue CURA-611.
2016-02-09 13:50:02 +01:00
Ghostkeeper
5693d639f1 Merge pull request #618 from Ultimaker/feature_profiles
Profiles rework
2016-02-09 09:49:28 +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
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
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
Tim Kuipers
788a40c656 lil fix 2015-12-17 12:45:35 +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