17119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jack Ha	b43806fd4b	Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4	2018-05-30 09:45:11 +02:00
Jack Ha	3395610b67	CURA-5357 fix boo boo, rename variable	2018-05-30 09:44:59 +02:00
Jack Ha	a616e92367	CURA-5357 fix boo boo, rename variable	2018-05-30 09:44:33 +02:00
Lipu Fei	f1bb0e58e7	Do not use CuraVersion data if strings are empty ... CURA-5357	2018-05-30 09:20:02 +02:00
Lipu Fei	fae9bc838b	Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt ... CURA-5357	2018-05-30 09:18:45 +02:00
Lipu Fei	9223122fc8	Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt ... CURA-5357	2018-05-30 09:13:27 +02:00
Jack Ha	16b8d3f137	Merge branch '3.4'	2018-05-30 09:12:28 +02:00
Ian Paschal	13b3e4afa5	CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo ... Also improved interfacing with `CuraVersion.py`	2018-05-30 09:11:49 +02:00
Lipu Fei	11db13aa28	Clear is_user_specified_job_name flag when setting a project file name ... CURA-5280	2018-05-30 09:07:02 +02:00
Lipu Fei	80d4989843	Show keep/discard user settings dialog upon variant change ... CURA-5417	2018-05-30 09:03:36 +02:00
Aleksei S	4d6753a1f1	remove unused code lines in firmware checker ... CURA-4952	2018-05-29 18:33:38 +02:00
Aleksei S	b46a08f566	Add Reft and Right side aligned action buttons to the message box ... CURA-4952	2018-05-29 18:15:16 +02:00
Ian Paschal	c77ea76b21	CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo ... Also improved interfacing with `CuraVersion.py`	2018-05-29 16:34:36 +02:00
Lipu Fei	fed0a015ee	Clear is_user_specified_job_name flag when setting a project file name ... CURA-5280	2018-05-29 15:56:01 +02:00
Diego Prado Gesto	9873d57286	CURA-5404 Change default retraction distance to 6.5mm for ultimaker3 and ... S5	2018-05-29 14:48:34 +02:00
Diego Prado Gesto	a969d3c5ea	CURA-5404 Remove retraction_amount values that must be in the material ... profile.	2018-05-29 14:37:13 +02:00
Diego Prado Gesto	cc42d993d3	Merge pull request #3854 from fieldOfView/fix_configurationmenu_text ... Fix configurationmenu text	2018-05-29 13:50:03 +02:00
Lipu Fei	7cf2832183	Fix quality_group is None check in _setQualityGroup() ... CURA-5423	2018-05-29 13:43:32 +02:00
Diego Prado Gesto	77826b5a7d	Merge pull request #3863 from fieldOfView/fix_toolbox_compatibility_headers ... Make headers non-transparent	2018-05-29 13:37:53 +02:00
Ghostkeeper	3614da0f9d	Replace infill_hollow by infill_support_enabled ... It's not the exact same functionality, but very similar and equally expert. Contributes to issue CURA-5108.	2018-05-29 13:22:59 +02:00
Ian Paschal	47bd94608a	Merge pull request #3413 from BagelOrb/infill_support ... settings for infill support	2018-05-29 13:13:35 +02:00
Ghostkeeper	0d89240bca	Copy support angle to infill support angle if used for hollow infill ... This keeps the new profile as close to the profile in the previous version as possible. Contributes to issue CURA-5108.	2018-05-29 12:51:41 +02:00
Ghostkeeper	db16a6275f	Add version upgrade for infill_hollow -> infill_support ... The functionality is more or less the same, so in an attempt to keep people's profiles as similar as possible we translate this setting to the newer implementation.	2018-05-29 12:51:31 +02:00
Ghostkeeper	ab2503834b	Remove Hollow Out Objects setting ... It has been replaced by Infill Support. Contributes to issue CURA-5108.	2018-05-29 12:51:21 +02:00
Tim Kuipers	373555fa4a	settings for infill support	2018-05-29 12:50:51 +02:00
Ghostkeeper	77feb95191	Don't crash when failing to reload file ... Now it shows a message that it failed to load the file.	2018-05-29 11:06:07 +02:00
Lipu Fei	1c3bae3fe4	Show keep/discard dialog upon material change if there are user changes ... CURA-5417	2018-05-29 10:52:06 +02:00
Lipu Fei	9627eb0fc1	Only exclude explicitly specified materials in the "exclude_materials" field ... CURA-5344	2018-05-29 10:46:42 +02:00
Jack Ha	09452b65df	Merge branch 'master' of github.com:Ultimaker/Cura	2018-05-29 09:32:14 +02:00
Jack Ha	8a6996e920	If an object does not have a convex hull, it does not crash the ArrangeObjectsJob	2018-05-29 09:32:06 +02:00
Ghostkeeper	504889b472	Remove Alternate Cross 3D Pockets setting ... It is no longer used in the new implementation of cross infill.	2018-05-29 07:31:59 +02:00
fieldOfView	ac1dfcf15d	Make headers non-transparent	2018-05-28 22:52:49 +02:00
Lipu Fei	3b0b6d300b	Only set user-specified job name when the editting is finished ... CURA-5280	2018-05-28 17:35:22 +02:00
Ian Paschal	8a35d52ddd	Rename "cura_version" to "sdk_version"	2018-05-28 17:21:08 +02:00
Aleksei S	6a3eec07e2	Message stack shows properly messages ... CURA-4952	2018-05-28 16:03:05 +02:00
Mark	6a7812a18f	Textual fix for Marketing	2018-05-28 15:27:22 +02:00
Lipu Fei	f395f1eebc	Merge branch 'master' into WIP_improve_initialization	2018-05-28 13:37:26 +02:00
Lipu Fei	24b8ea4a4b	Quality changes are now in the quality_changes folder ... CURA-5296	2018-05-28 13:22:27 +02:00
Lipu Fei	57ca41291a	Fix package upgrade ... CURA-5296 The removal of already installed package is already handled by the package manager in the package upgrade. Removing the package before the download starts will make the package to be removed before the new content is available and its license gets approved by the user.	2018-05-28 13:10:42 +02:00
Lipu Fei	43fcb183ae	Remove unnecessary code ... CURA-5296	2018-05-28 13:10:32 +02:00
Lipu Fei	ad131ab30c	Fix downgrade packages to bundled version ... CURA-5296	2018-05-28 11:18:24 +02:00
Lipu Fei	689b88a024	Do not change prefix for user-specified job names ... CURA-5280	2018-05-28 09:53:49 +02:00
Jorge García	4bd87e2164	Fix for showing temperatures for Malyan M200 and Monoprice Mini	2018-05-26 13:15:36 +02:00
Jorge García	dc9813b916	Fix for detecting Malyan M200 and Monoprice Mini	2018-05-26 01:56:57 +02:00
fieldOfView	94813d9e0d	Fix untranslatable text	2018-05-25 21:40:57 +02:00
fieldOfView	87555a38c4	Fix text rendering in the ConfigurationMenu	2018-05-25 21:40:30 +02:00
Ghostkeeper	0d55b8b440	Resume after pausing without waiting for next ok ... Previously the resume only worked because in the message receiving loop it would no longer ignore the next 'ok'. It doesn't actually send a message that would trigger an 'ok'. This only worked because we are polling every 2 seconds for the nozzle temperature which also happens to trigger an 'ok' response, which we interpret as a go-ahead for being able to send the next g-code line. Now it's no longer dependent on the fact that we happen to also poll the temperatures, so the code is more stable. And it also resumes immediately instead of waiting for up to 2 seconds.	2018-05-25 12:04:00 +02:00
Ghostkeeper	7c0eb43a23	Fix unpausing after cancelling a print ... The variable name is self._paused, not self._is_paused. This was doing nothing at all.	2018-05-25 11:44:37 +02:00
Ghostkeeper	f5a7707139	Show ConfigurationErrorMessage when loading faulty XML files ... This is consistent with the rest of Cura's behaviour.	2018-05-25 11:24:31 +02:00
Ghostkeeper	d6e7b96437	Set machine preset to be equal to Replicator 1 Dual ... This was in the original Cura 15.06 plug-in.	2018-05-25 10:49:16 +02:00