16433 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Remco Burema	c8d9ad37ff	Add Printing Guidelines links to materials in Marketplace. [CURA-5922]	2018-11-09 13:49:14 +01:00
Remco Burema	21d4cd8f9f	Add Safety Data Sheet links to materials in Marketplace. [CURA-5922]	2018-11-09 13:44:42 +01:00
Lipu Fei	80bf7bb989	Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade ... Add version upgrade for quality profiles	2018-11-09 09:20:45 +01:00
Jaime van Kessel	d3302938b2	Fix technical data sheet not showing if there is no support_configs	2018-11-08 16:38:38 +01:00
Diego Prado Gesto	94e27fbbdb	Add the quality folder to the version upgrade in order to update quality ... profiles. Contributes to CURA-5915.	2018-11-08 15:42:39 +01:00
Simon Edwards	69c9ffaf61	Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor ... CL-1140 Show print time in monitor tab	2018-11-08 11:53:47 +01:00
Ian Paschal	aa6ec9e44b	Make text black ... Contributes to CL-1040	2018-11-08 11:48:22 +01:00
Lipu Fei	de6ab02422	Merge pull request #4678 from fieldOfView/fix_networkprinter_post ... Fix type error in NetworkedPrinterOutputDevice.post	2018-11-08 11:05:47 +01:00
Ian Paschal	35ed234991	Show print time in monitor tab ... Contributes to CL-1040	2018-11-08 10:49:22 +01:00
Ghostkeeper	c5a9c6c6cc	Add translation for missing line in Korean ... This one was not translated. Contributes to issue CURA-5870.	2018-11-08 09:48:52 +01:00
Lipu Fei	32cb7a78e8	Merge pull request #4749 from Ultimaker/CURA-5900_remove_CC0.6_PLA_profiles ... Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core.	2018-11-07 13:52:16 +01:00
Diego Prado Gesto	58a01816aa	Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core. ... PLA is compatible with the print core but we don't want to provide profiles because they were not fully tested. Contributes to CURA-5900.	2018-11-07 13:39:06 +01:00
Jaime van Kessel	68512a2184	Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6	2018-11-07 12:35:25 +01:00
Jaime van Kessel	9a93f6866a	Fix crash of toolbox when metadata got corrupted	2018-11-07 12:03:32 +01:00
Diego Prado Gesto	44ab6dee77	Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06 ... [3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"	2018-11-07 11:21:09 +01:00
Diego Prado Gesto	2c28e931ea	Rename CC Red 0.6 to CC 0.6 in the Changelog. ... Contributes to CURA-5900.	2018-11-07 11:06:40 +01:00
Lipu Fei	982123a04e	Update bundled package versions for materials using CC 0.6	2018-11-07 10:32:30 +01:00
Remco Burema	c262635144	Merge pull request #4743 from Ultimaker/CURA-5896_strip_exra_curaproject_extensions ... [3.6] [CURA-5896] Try to strip extra curaproject extensions	2018-11-07 09:08:39 +01:00
Remco Burema	94924783b6	Defensive coding: Old file-extensions may have been saved as all-caps. [CURA-5896]	2018-11-06 17:16:29 +01:00
Ghostkeeper	021ae92da8	Merge branch '3.6' of ssh://github.com/Ultimaker/Cura into 3.6	2018-11-06 17:15:36 +01:00
Ghostkeeper	5701f64d14	Merge branch 'update_translations_3.6' into 3.6	2018-11-06 17:15:22 +01:00
Simon Edwards	7ecffdef3d	Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6	2018-11-06 17:06:04 +01:00
Ian Paschal	4c831de06c	Remove console logs ... Contributes to CL-1126	2018-11-06 16:41:59 +01:00
Ian Paschal	dc4b69c386	Show context menu at the right times ... Contributes to CL-1126	2018-11-06 16:37:47 +01:00
Diego Prado Gesto	ce7d2c36d0	Fix the width of the slider label when the number of layers was exactly ... 10, 100, 1000 and so on. The calculation was using the maximumValue that is 9 in case we have 10 layers, since we start counting from 0 but showing from 1. Now it uses maximumValue + 1.	2018-11-06 16:15:32 +01:00
Ghostkeeper	bca3af16e0	Merge branch 'Patola-3.6' into 3.6	2018-11-06 16:09:45 +01:00
Ghostkeeper	9fa9c04517	Fix translation mistakes found in Cura 3.6 ... These mistakes were found in the translations. In many cases it makes the text closer to the original rather than more consistent with the environment. If the environment is inconsistent then we should fix the original string in our source code rather than in the translations. Contributes to issue CURA-5870.	2018-11-06 16:07:41 +01:00
Ghostkeeper	8ef8639e29	Merge branch '3.6' of https://github.com/Patola/Cura into Patola-3.6	2018-11-06 16:06:50 +01:00
Ghostkeeper	52c2723990	Make corrections to translation mistakes ... These are all the mistakes that we found in the translations to Cura 3.6. Contributes to issue CURA-5870.	2018-11-06 16:03:00 +01:00
Diego Prado Gesto	27e2cc8dc5	Merge pull request #4742 from Ultimaker/CURA-5899_fix_custom_quality_handling_in_project_loading ... [3.6] [CURA-5899] Fix quality changes lookup in project loading	2018-11-06 15:55:56 +01:00
Lipu Fei	ef3bb044f4	Rename CC Red 0.6 to CC 0.6	2018-11-06 15:31:51 +01:00
Lipu Fei	3db85b2493	Try to strip extra curaproject extensions ... CURA-5896	2018-11-06 13:48:22 +01:00
Ghostkeeper	d3ace436e6	Update translations for some more languages ... Russian, Turkish and Chinese. Contributes to issue CURA-5870.	2018-11-06 13:33:48 +01:00
Lipu Fei	8e33a19ca7	Fix quality changes lookup in project loading ... CURA-5899 Should always use custom quality profile names to look up.	2018-11-06 13:31:04 +01:00
Ghostkeeper	e45924b6fb	Update translations for some languages ... German, Spanish, French, Italian, Japanese, Korean, Dutch and European Portuguese. Contributes to issue CURA-5870.	2018-11-06 13:30:09 +01:00
Ghostkeeper	b0384bf10e	Update Taiwanese translations ... These were e-mailed to me by the volunteer translator, @Dinowchang. Contributes to issue CURA-5870.	2018-11-06 13:15:02 +01:00
Lipu Fei	fad8ad5d47	Merge pull request #4730 from Ultimaker/CURA-5898-duplicating-material-results-in-not-supported-warning ... Make quality manager also include profiles with same GUID in fallback.	2018-11-06 11:23:10 +01:00
Lipu Fei	9c9e81b30c	Move InstanceContainer import into type checking closure ... CURA-5898	2018-11-06 11:04:18 +01:00
Simon Edwards	6304dde5a9	Merge branch 'CL-1124_configuration_override_improvements' into 3.6	2018-11-06 10:19:32 +01:00
Cláudio 'Patola' Sampaio	ee2a34d647	Updated pt_BR strings for 3.6	2018-11-06 04:44:05 -02:00
Jaime van Kessel	93467dc29f	Ensure that weeding out the duplicates doesn't mess up the order ... CURA-5898	2018-11-05 17:33:12 +01:00
Ian Paschal	c84aa9cf21	Use default font for configuration override ... Contributes to CL-1124	2018-11-05 17:19:22 +01:00
Ian Paschal	1abd0b3499	Show "Pausing...", "Aborting...", and "Resuming..." texts ... Contributes to CL-1126	2018-11-05 15:45:17 +01:00
Lipu Fei	3f1e0cc610	Fix delayed convex hull recomputation ... CURA-5896 If the current tool operation is still active, we need to delay the convex hull recomputation after the tool becomes inactive.	2018-11-05 14:25:18 +01:00
Lipu Fei	93afaf64c6	Strip the old "curaproject" extension from project name ... CURA-5896	2018-11-05 13:28:21 +01:00
Ian Paschal	4f10b7809a	Configuration override improvements ... Contributes to CL-1124	2018-11-05 12:15:17 +01:00
Jaime van Kessel	412e5977a6	Fix type issues	2018-11-05 11:30:02 +01:00
Jaime van Kessel	eded0f0297	Make quality manager also include profiles with same GUID in fallback. ... This ensures that if a (duplicated) material does not have a generic variant, that the material it was copied from will be added to the fallback list. CURA-5898	2018-11-05 11:17:39 +01:00
Jaime van Kessel	90726ecbff	Fix situation where the setting visibility model could cause a crash. ... Yay for crash logging	2018-11-01 15:28:08 +01:00
Ghostkeeper	4dc248a631	Rename Open Marketplace to just Marketplace ... Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace. Contributes to issue 5870.	2018-11-01 14:43:22 +01:00