6396 commits

Author	SHA1	Message	Date
Diego Prado Gesto	c31d329657	Remove preference 'arrange models on load' since it was experimental and ... now the arranger makes the job.	2018-06-12 13:20:20 +02:00
Diego Prado Gesto	3be58e7d6b	CURA-5462 Change Low name to Normal	2018-06-11 17:04:18 +02:00
Andreea Scorojitu	8cd46d2b58	Merge branch 'master' of https://github.com/Ultimaker/Cura	2018-06-11 16:59:21 +02:00
Diego Prado Gesto	bdd215ec8d	Merge pull request #3916 from Ultimaker/formulafy_speed_settings2 ... CURA-5342 replace speed setting constants in profiles to formulas	2018-06-11 16:51:01 +02:00
Andreea Scorojitu	a8b27905c8	Cleaned_up_profiles_name_UM2, CURA-5462 ... Quality was removed from the name and Low Quality is now Normal.	2018-06-11 15:46:42 +02:00
Jack Ha	359506874a	CURA-5342 replace speed setting constants in profiles to formulas; also adds necessary settings for um2p if the setting is also defined in ultimaker2	2018-06-11 13:45:52 +02:00
Lipu Fei	a04bf7d814	Merge remote-tracking branch 'origin/3.4'	2018-06-11 11:32:51 +02:00
Ghostkeeper	b55d2eda4f	Remove Polish translation option ... The translator said he won't be maintaining this language any more. Someone else can pick it up now if he wants to, but we'll disable the language until it is complete again. Contributes to issue CURA-5451.	2018-06-11 09:14:48 +02:00
Ghostkeeper	8438406d8b	Revert "CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly" ... This reverts commit 9432252de4. It was assuming the wrong default speed_print value of 60. It's not always 60. We need to find a different solution or modify the script. Reverts the fix for issue CURA-5342.	2018-06-08 13:44:40 +02:00
Ghostkeeper	fd19f8791e	Merge branch '3.4'	2018-06-08 11:47:29 +02:00
Ghostkeeper	79fb1bb2bd	Correction to translation of Retraction Extra Prime Amount ... Thanks to @getget1980. Fixes #3789.	2018-06-08 11:47:07 +02:00
Lipu Fei	12a406529e	Fix inconsistent curaproject mimetype definition ... CURA-5334 - In project file writer, it says the mime type is "application/x-curaproject+xml", and we decided to use this as THE mime type. - Pass preferred_mimetype to save project file dialog so it automatically adds the file extension upon open.	2018-06-07 14:42:36 +02:00
Ghostkeeper	af2d05ebfa	Remove superfluous 'enabled' field	2018-06-07 13:40:16 +02:00
Lipu Fei	3a7a1dbc6d	Fix inconsistent curaproject mimetype definition ... CURA-5334 - In project file writer, it says the mime type is "application/x-curaproject+xml", and we decided to use this as THE mime type. - Pass preferred_mimetype to save project file dialog so it automatically adds the file extension upon open.	2018-06-07 12:51:54 +02:00
Ghostkeeper	8202b62343	Merge branch '3.4'	2018-06-07 11:38:13 +02:00
Jack Ha	f828c135f8	CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle.	2018-06-07 11:35:09 +02:00
Lipu Fei	04ecc55e3c	Merge pull request #3850 from Ultimaker/uranium_package_manager ... Move package manager to Uranium	2018-06-07 11:03:45 +02:00
Diego Prado Gesto	97a1aa1a2b	Fix a crash in MaterialManager when the brand of the material is None. ... Fix other possible cases when the type or the color are also None.	2018-06-07 10:54:23 +02:00
Lipu Fei	bf9581e068	Merge pull request #3903 from Ultimaker/formulafy_speeds ... CURA-5342 formulafy speed settings	2018-06-07 10:48:25 +02:00
Diego Prado Gesto	fbdf950a7b	Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint ... Remove vestigial references to "monitoringPrint"	2018-06-06 19:08:58 +02:00
Jack Ha	9432252de4	CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly	2018-06-06 17:07:04 +02:00
Ghostkeeper	c42b275c5d	Merge branch '3.4'	2018-06-06 16:58:01 +02:00
Ghostkeeper	a15831c486	Update translation templates per language ... These are the templates from 3.4. Contributes to issue CURA-5451.	2018-06-06 16:57:33 +02:00
Ghostkeeper	0faaf3cd22	Update translation templates for Cura 3.4 ... These are the translations for Cura 3.4. Fixed and in-place. Can't change translated texts any more. Contributes to issue CURA-5451.	2018-06-06 16:57:32 +02:00
Jack Ha	96f2e6e1ed	CURA-5402 hopefully solved merge conflicts	2018-06-06 14:39:53 +02:00
fieldOfView	19b8ca7c70	Remove vestigial references to "monitoringPrint"	2018-06-06 11:22:35 +02:00
Jack Ha	87293e089d	Merge branch 'master' of github.com:Ultimaker/Cura	2018-06-06 11:02:10 +02:00
Jack Ha	17b127e8c1	CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle.	2018-06-06 11:00:09 +02:00
Ghostkeeper	4b581d09e7	Merge branch '3.4'	2018-06-06 10:59:14 +02:00
Ghostkeeper	da4932435c	Add fan speed to basic setting visibility ... It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker.	2018-06-06 10:56:58 +02:00
Aleksei S	dbd286e1cc	Save as project the extruder counter starts from 1	2018-06-06 10:47:12 +02:00
Mark	c5929ce26c	Revert "The prepare button slices, so it should be a slice button" ... This reverts commit a0263676e1.	2018-06-05 12:00:21 +02:00
Mark	59602d8013	Revert "The prepare button slices, so it should be a slice button" ... This reverts commit a479176c63.	2018-06-05 11:56:41 +02:00
Jack Ha	70d78f3cab	CURA-5119 move settings out of wall overlap compensation	2018-06-05 10:36:34 +02:00
Lipu Fei	4598b7a831	Merge remote-tracking branch 'origin/3.4'	2018-06-05 09:55:57 +02:00
Lipu Fei	96ddf61f81	Merge pull request #3878 from Ultimaker/feature_update_old_plugins ... Feature update old plugins	2018-06-05 09:55:07 +02:00
Lipu Fei	7f7a195627	Fix merge conflicts from 3.4	2018-06-05 09:02:52 +02:00
Lipu Fei	bbd019f9e5	Fix job name UI binding ... CURA-5367 UI should always refer to PrintInformation for the job name.	2018-06-05 08:58:09 +02:00
Ian Paschal	71f41b8ada	CURA-5442 Final fixes	2018-06-04 17:00:59 +02:00
Ghostkeeper	02a3067a0c	Reset infill line distance when changing density via recommended mode ... Otherwise the change has no effect. Contributes to issue CURA-5324.	2018-06-04 16:58:13 +02:00
Ghostkeeper	bd145c451b	Brackets on new line ... As far as I've seen them when I scrolled through this. Contributes to issue CURA-5324.	2018-06-04 16:49:49 +02:00
Diego Prado Gesto	dfd9fc2ae9	Revert "CURA-5404 Remove retraction_amount values that must be in the material" ... This reverts commit a969d3c5ea.	2018-06-04 14:43:00 +02:00
Diego Prado Gesto	36e72ae744	Merge branch '3.4' into fix_retraction_amount	2018-06-04 14:42:39 +02:00
Lipu Fei	61a3668a4f	Merge remote-tracking branch 'origin/3.4'	2018-06-01 13:51:00 +02:00
Mark	a479176c63	The prepare button slices, so it should be a slice button	2018-06-01 13:42:48 +02:00
Mark	a0263676e1	The prepare button slices, so it should be a slice button	2018-06-01 13:36:50 +02:00
Diego Prado Gesto	a4b46be2c5	CURA-5427 Force the material models to update when the machine changes and so ... when the extruder stack changes. - What happen was that when the extruder model needed to update, the material model was not updated correctly and so when changing a material, the node was incorrect.	2018-06-01 12:58:08 +02:00
Lipu Fei	bb313c45a9	Set job name to "unnamed" if user types in nothing ... CURA-5367	2018-05-31 16:25:58 +02:00
Lipu Fei	7d8472e588	Merge remote-tracking branch 'origin/3.4'	2018-05-31 12:25:33 +02:00
Diego Prado Gesto	931d4716e1	CURA-5404 Retrieve the material settings' values from the variant before ... retrieving it from the definition if there are not defined in the material.	2018-05-30 16:58:11 +02:00