14661 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Ian Paschal	220c99cf3b	Merge pull request #3613 from maximkulkin/avoid-printed-supports ... Add travel_avoid_supports setting support	2018-05-24 15:36:40 +02:00
ChrisTerBeke	fd2e692440	Merge branch '3.3'	2018-05-24 14:33:55 +02:00
ChrisTerBeke	965a24b225	Merge pull request #3691 from ohrn/usb-gcode-check ... Only open USB ports if the printer understands gcode.	2018-05-24 14:08:52 +02:00
Ian Paschal	26e32dc08a	Added missing colon	2018-05-24 11:46:46 +02:00
ChrisTerBeke	717c11005b	Codestyle changes after merge	2018-05-24 10:58:55 +02:00
ChrisTerBeke	7d0b664c53	Merge pull request #3648 from JPFrancoia/master ... Bug fixes and improvements for PauseAtHeight plugin	2018-05-24 10:56:16 +02:00
ChrisTerBeke	c491cb4707	Merge pull request #3597 from fieldOfView/fix_multiextruder_usb_temperatures ... [3.3] Fix getting multiple extruder temperatures from USB printer	2018-05-24 10:52:30 +02:00
ChrisTerBeke	3045007f5b	Small codestyle changes after merge	2018-05-24 10:39:37 +02:00
ChrisTerBeke	25d9b875ea	Merge pull request #3593 from fieldOfView/feature_separate_stage_qml ... Separate qml files for Prepare and Monitor stages	2018-05-24 10:37:02 +02:00
ChrisTerBeke	2422ee38e8	Fix init py in backups module	2018-05-24 09:46:18 +02:00
ChrisTerBeke	809cab4ea5	Cleanup for cfd1b7b813ccdac76c623243a03633b2059d9a0e	2018-05-23 19:18:11 +02:00
Jack Ha	260dee54fb	CURA-5370 also take into account the machine size when Arranging in readMeshFinished	2018-05-23 16:57:50 +02:00
Lipu Fei	a0a8af07dc	Upon manual job name change, only save the real base name ... CURA-5280 Remove the machine prefix in the base name, otherwise when the machine gets changed, the job name will become "<new-machine>_<old_machine>_basename".	2018-05-23 16:42:13 +02:00
Ian Paschal	fb307fbbf5	Merge pull request #3846 from Ultimaker/improve-arranger ... CURA-5370 Small refactor for Arranger:	2018-05-23 16:40:19 +02:00
Lipu Fei	196bd3a730	Add non-thumbnail-visible flag for creating previews ... CURA-5373 Addition to the non-slicable meshes, the support meshes should also not be included in the previews.	2018-05-23 16:32:38 +02:00
Ian Paschal	e89bd91960	CURA-5280 Preserve manually entered project name ... Heeeehhhhh? Why didn't this line get staged with the file?	2018-05-23 16:31:22 +02:00
Ian Paschal	d14f4ac678	CURA-5280 Preserve manually entered project name ... Manual override of job name should also set the base name so that when the printer prefix is updated, it the prefix can be added to the manually added name, not the old base name. This was a bit tricky because if you enter a job name, is that the job name or the base name? My answer is that it's both, and if you update your printer for the job, it will append a new prefix. If this is not the desired behavior, and in fact once a custom name is set nothing can change it, then line 78 should be removed.	2018-05-23 16:28:35 +02:00
Jack Ha	827cb33b6e	CURA-5370 Update copyright and comments	2018-05-23 16:04:18 +02:00
Lipu Fei	de455a9a64	Use gcode.gz as extension for GzWriter ... CURA-5343 We have the custom save file dialog on OS X now so there is no need to use .gz to bypass the extension problem on the native dialog.	2018-05-23 15:48:30 +02:00
Jack Ha	a3ac20172b	CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting	2018-05-23 12:54:18 +02:00
Lipu Fei	44b046e401	Merge pull request #3786 from Ultimaker/feature-backup-manager ... Backup Manager and API	2018-05-23 11:28:43 +02:00
Ian Paschal	775ec91762	Merge pull request #3848 from fieldOfView/feature_select_after_loading ... Select models after loading	2018-05-23 11:26:07 +02:00
Lipu Fei	cfd1b7b813	Fix AutoSave conflicts with BackupManager ... - Move AutoSave out of the plugins. It's a built-in module now. - Add enable/disable saving data on CuraApplication. - Avoid saving data in backup restore	2018-05-23 11:25:47 +02:00
ChrisTerBeke	41aa31cb2d	Merge branch 'master' into feature-backup-manager	2018-05-23 11:07:02 +02:00
Jack Ha	7136b8649a	CURA-5388 disable automatic_push_free / Ensure models are kept apart by default	2018-05-23 10:48:19 +02:00
fieldOfView	6b0045265c	Move getting preference out of for loop	2018-05-23 10:07:17 +02:00
fieldOfView	fb8f735566	Make selecting objects on load optional and opt-in	2018-05-23 10:05:08 +02:00
Lipu Fei	92fa725ad6	Application.saveSettings() should save everything	2018-05-23 10:00:21 +02:00
Diego Prado Gesto	ba234f5c8a	Remove debug prints	2018-05-23 09:38:16 +02:00
Diego Prado Gesto	b8417bcccb	If the label tag exists in the xml material file, but without any string ... in it, the label.text return None and then it makes Cura crashing when creating the models. This is intended to fix the issue #3750	2018-05-23 09:34:21 +02:00
fieldOfView	f67261488f	Select models after loading ... Fixes #356	2018-05-22 22:24:57 +02:00
ChrisTerBeke	2c896010c7	Merge branch 'feature-backup-manager' of https://github.com/Ultimaker/Cura into feature-backup-manager ... * 'feature-backup-manager' of https://github.com/Ultimaker/Cura: Save settings before moving config file on Linux	2018-05-22 19:03:14 +02:00
ChrisTerBeke	a91916cc1d	Merge branch 'master' into feature-backup-manager ... * master: Adds release notes link in version upgrade messagebox CURA-5348 CURA-5385 Project summary should use scroll view CURA-5296 Small QML bug fix Enabled drag-n-drop for curapackages CURA-5296 Added "canDowngrade" functionality Fix CURA_PACKAGES_VERSION CURA-5254 Keep track of the latest manual entry key, so it is then selected in the list. CURA-5296 Improve button styling Add CURA_PACKAGES_VERSION to CMakeLists.txt Add CuraPackageVersion Remove extra "if" statement and unused code Fix support blocker on older (legacy) opengl Correct the test to hide bed temperature when no heated bed is present.	2018-05-22 19:03:09 +02:00
ChrisTerBeke	2bbcb2dd7d	Save settings before moving config file on Linux	2018-05-22 17:45:30 +02:00
Aleksei S	403129e2d6	Merge branch 'master' of github.com:Ultimaker/cura	2018-05-22 17:33:41 +02:00
Aleksei S	36c2e80121	Adds release notes link in version upgrade messagebox ... CURA-5348	2018-05-22 17:32:38 +02:00
Jack Ha	f5bed242ed	CURA-5370 Small refactor for Arranger: make x and y consistent (numpy arrays start with y first in general), faster, cleanup, more unit tests, take actual build plate size in Arranger instances	2018-05-22 17:13:35 +02:00
ChrisTerBeke	dd581b59e4	Merge branch 'master' into feature-backup-manager	2018-05-22 17:05:40 +02:00
Ian Paschal	0a395a7305	CURA-5385 Project summary should use scroll view	2018-05-22 16:29:04 +02:00
Ian Paschal	7861840886	CURA-5296 Small QML bug fix	2018-05-22 16:04:38 +02:00
Ian Paschal	d4c5be0455	Merge pull request #3845 from Ultimaker/CURA-5357_drag_n_drop_curapackage_hack_no2 ... CURA-5357 Drag-n-drop for curapackages	2018-05-22 15:20:10 +02:00