10639 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	85bcc56a64	Update TPU profiles ... These profiles are improved by the materials team. This is directly copied from them and should now be optimised for our use. Contributes to issue CURA-3960.	2017-06-23 11:05:33 +02:00
Jaime van Kessel	217eecccb9	Merge branch 'master' of github.com:Ultimaker/Cura	2017-06-23 09:57:34 +02:00
Jaime van Kessel	3049fb4da2	Made setting warning colors for dark theme a bit darker.	2017-06-23 09:57:07 +02:00
Ghostkeeper	13c9519a7c	Fix deprecated decorator ... Contributes to issue CURA-2822.	2017-06-23 09:42:08 +02:00
Lipu Fei	b958e30fe6	Add machine_disallowed_areas and turn off nozzle offsetting for disallowed areas calculation ... CURA-3663 We don't need to calculate the disallowed areas for certain machines because they have taken into account the nozzle offsets. This commit does the following: - Add machine_disallowed_areas - Add a flag in definition so that disallowed areas calculation with nozzle offsets becomes optional in Cura. Update documentation for no offsetting for nozzles Contributes to issue CURA-3663.	2017-06-23 08:33:03 +02:00
Tim Kuipers	67a4ec2a9e	dark layer view	2017-06-22 18:56:55 +02:00
Jaime van Kessel	9e275cd41c	Merge branch 'feature_dark_theme' of https://github.com/fieldOfView/Cura	2017-06-22 18:44:16 +02:00
fieldOfView	b324e90ba5	Show hover state on active focus	2017-06-22 18:33:30 +02:00
Ghostkeeper	bc219a06fe	Add MaterialsModel to make material list update upon metadata change ... This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	0e23930bfe	Fix checking whether the old material diameter was the same ... Getting the old material diameter wasn't working properly. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	1d048f39db	Fix getting old material diameter ... This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	7ea1d4cc5a	Add getContainerProperty function ... The opposite of setContainerProperty. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	f041473465	Fix applying material diameter undo ... Somehow it seems to get the wrong value there though. Debugging that next... Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	c192d37daa	Fix connecting undo action to undo button ... Also hiding the message afterwards. Apparently that's not done automatically. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	b37fa6f718	Implement warning message when you change material diameter ... The undo functionality currently gives an error though. Investigating... Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	121bf5897d	Deprecate _updateMaterialContainer ... There are better alternatives nowadays. Discovered during CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	fc96dfec4e	Expose approximateMaterialDiameter of the definition ... This way we can request that from QML. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
fieldOfView	8a887915ac	Add tab navigation to sidebar	2017-06-22 18:07:34 +02:00
Jaime van Kessel	503aa00137	Added rough dialog for the PluginBrowser ... CURA-3856	2017-06-22 17:55:45 +02:00
Jaime van Kessel	d1e1265215	Merge branch 'master' of github.com:Ultimaker/Cura	2017-06-22 17:26:31 +02:00
Jaime van Kessel	8f1608bc3b	Added model to PluginBrowser ... We need the model to display items in the popup view. CURA-3856	2017-06-22 17:25:48 +02:00
Jaime van Kessel	b9241e8070	PluginBrowser now retrieves list of plugins from the server ... CURA-3856	2017-06-22 16:13:33 +02:00
fieldOfView	48efcdf6e4	Use a PointingRectangle for the LayerView pane	2017-06-22 14:59:15 +02:00
Tim Kuipers	fad78c20b5	fix: copy global settings into extruder msessage for SE (CURA-3930)	2017-06-22 14:40:12 +02:00
Jaime van Kessel	b9e863a953	Added PluginBrowser stub ... CURA-3856	2017-06-22 14:39:46 +02:00
fieldOfView	29e152582f	Make layerview panel hug the bottom of small windows ... Fixes https://github.com/Ultimaker/Cura/issues/2013	2017-06-22 14:30:26 +02:00
Lipu Fei	293c1690c6	Change to use machine_nozzle_id ... CURA-3872 We cannot assume that all nozzles will have IDs like "<type> <size>" such as "AA 0.4", so we should use a complete string as the nozzle IDs.	2017-06-22 14:00:04 +02:00
Lipu Fei	46b6e5b0a1	Add machine_nozzle_type and set them in UM3 and UM3XL variants ... CURA-3872 We add a new setting "machine_nozzle_type" to give the engine information about the nozzle type, such as "AA" and "BB". This is applicable to UM3 and UM3XL.	2017-06-22 14:00:04 +02:00
Lipu Fei	6be76ec806	Fix code style ... CURA-3872	2017-06-22 14:00:04 +02:00
Lipu Fei	81323e555a	Make LayerView work with "Purge" line type ... CURA-3094 In CuraEngine, we created a new line type called "Purge" to make Prime Tower Purge work. This commit makes the LayerView plugin to handle "Purge" lines correctly.	2017-06-22 11:39:49 +02:00
Lipu Fei	8393a0efb4	Use resolveOrValue(prime_tower_enable) for prime tower purge "enabled" field ... CURA-3094	2017-06-22 11:37:17 +02:00
Ghostkeeper	b05f1654f8	Fix spelling of Prime Tower Purge Volume description ... 'Useful' is spelled with only one L. Contributes to issue 3094.	2017-06-22 11:37:17 +02:00
Jaime van Kessel	1ec9987cc2	Removed prime tower wipe enabled setting ... CURA-3094	2017-06-22 11:37:17 +02:00
Jaime van Kessel	151d7d285b	Added default values & some warnings ... CURA-3094	2017-06-22 11:37:17 +02:00
Jaime van Kessel	11dad711e6	Added two new required settings for prime tower purge ... CURA-3094	2017-06-22 11:37:16 +02:00
Jaime van Kessel	14fb01ee46	Merge branch '2.6' of github.com:Ultimaker/Cura	2017-06-22 10:24:36 +02:00
Jaime van Kessel	7b7580daaf	Merge branch 'fix_single_extrusion_multiple_stacks' of https://github.com/fieldOfView/Cura into 2.6	2017-06-22 10:12:49 +02:00
Lipu Fei	5900bb8622	Use "Ultimaker" as the author for ultimaker plugins ... CURA-3712	2017-06-22 08:58:54 +02:00
Lipu Fei	4ea8cc448a	Use semantic versioning for all plugin.json ... CURA-3712	2017-06-22 08:57:47 +02:00
Lipu Fei	73f598ff9f	Fix code style ... CURA-3712	2017-06-22 08:54:04 +02:00
fieldOfView	de01155630	Add documentation	2017-06-21 19:15:05 +02:00
fieldOfView	adc547fa36	Don't send extruder stack settings to CuraEngine when there is just one extruder ... When there is 1 extruder, the frontend stores all settings in the global stack. Sending an extruder stack confuses CuraEngine into using the values of the extruder stack, which results in defaults being used.	2017-06-21 19:00:18 +02:00
Tim Kuipers	cfe1dd4fb6	fix: group selection box uses proper rendermode now (CURA-3846) ... Renderer.RenderMode doesn't exist any more. This should have been fixed way back when RenderBatch was introduced	2017-06-21 15:05:49 +02:00
Lipu Fei	7fe5c2ad07	Fix code style ... CURA-3663	2017-06-21 14:48:54 +02:00
Jaime van Kessel	827ec9b6a5	Merge branch 'master' of github.com:Ultimaker/Cura	2017-06-21 14:28:10 +02:00
Jaime van Kessel	e3629cec39	Replaced catalog metadata entry with i18n-catalog ... CURA-3712 & Cura-3856	2017-06-21 14:24:00 +02:00
Ghostkeeper	1d23d659f0	Merge branch '2.6'	2017-06-21 12:29:23 +02:00
Ghostkeeper	8aa420be62	Fix location of log on Windows ... It's a bit longer, but hopefully clear for both advanced system engineers and for rookies.	2017-06-21 11:53:38 +02:00
Ghostkeeper	e7d5618148	Re-enable Japanese translation ... Note that this only includes the setting descriptions. Contributes to issue CURA-3950.	2017-06-21 11:30:16 +02:00
Ghostkeeper	24b19fa0a5	Convert tab to spaces ... We indent with spaces, not tab. This one was mixed.	2017-06-21 11:29:35 +02:00