20119 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	efc6ef2905	Add missing typing	2019-06-28 13:44:47 +02:00
Lipu Fei	67f10d8bc3	Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting ... Add deprime settings	2019-06-27 16:09:36 +02:00
Ghostkeeper	fe0fcc6eec	Change human-readable names of renamed settings too ... Forgot about those. Contributes to issue CURA-6329.	2019-06-26 16:43:11 +02:00
Ghostkeeper	faf256b2f0	Rename deprime settings with the new name ... These have been renamed for greater clarity. We also have to rename them on this side now. Contributes to issue CURA-6329.	2019-06-26 16:41:51 +02:00
pkuiper-ultimaker	67191c4040	Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time ... Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]	2019-06-25 17:44:51 +02:00
Ian Paschal	48a69afbcf	Merge pull request #5912 from Ultimaker/cloud-print-job-actions ... CS-134: Print job actions via cloud	2019-06-25 15:52:10 +02:00
Lipu Fei	934248e218	Merge pull request #5578 from curso007/master ... Adding Geeetech A30 & FLSUN QQ-S machine definitons	2019-06-24 13:27:03 +02:00
Lipu Fei	92d029d18f	Update flsun_qq_s.def.json	2019-06-24 13:22:18 +02:00
Lipu Fei	7bd297bef5	Fix setting_version	2019-06-24 13:21:04 +02:00
Jaime van Kessel	d9358d56cc	Update issue templates ... Added a bit more clarification to the issue template.	2019-06-24 13:20:05 +02:00
Lipu Fei	544e7a1614	Rename Geeetech_A30.def.json to geeetech_a30.def.json	2019-06-24 13:20:04 +02:00
Lipu Fei	6a7da56057	geeetech_a30.def.json ... Fix geeetech_a30.def.json	2019-06-24 13:19:24 +02:00
ChrisTerBeke	1d09cb5b9c	Fix typing for optional data argument ... Co-Authored-By: Jaime van Kessel <nallath@gmail.com>	2019-06-24 13:18:27 +02:00
Jaime van Kessel	9e4f2a441b	Revert "Also upgrade profiles if only the setting version is incorrect" ... This reverts commit 77d396b9bd. The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a regular setting version upgrade, this does not need to be run (and breaks importing profiles). Fixes CURA-6592	2019-06-24 11:59:13 +02:00
Jaime van Kessel	0a0b4821ef	Added logging for cases where the upgrade of the profile failed ... CURA-6592	2019-06-24 11:32:43 +02:00
Ghostkeeper	6273d34eae	Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master	2019-06-21 11:33:07 +02:00
Робокинетика	f5d94b9646	Fixed the value of "retraction_amount"	2019-06-21 11:53:06 +03:00
Diego Prado Gesto	efa42ccbd1	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-20 14:06:18 +02:00
ChrisTerBeke	1ab109ade0	Fix 'resume' action	2019-06-20 13:46:20 +02:00
ChrisTerBeke	baf9dc041c	Fix typing of Any	2019-06-20 12:56:45 +02:00
ChrisTerBeke	0513322f86	Fix expected controller options in test	2019-06-20 12:36:56 +02:00
ChrisTerBeke	93351ec9b9	Show context menu on printers with firmware 5.3 or later	2019-06-20 12:36:15 +02:00
Remco Burema	9845178d26	Remove superfluous bracket (causing 'EOF'). [CURA-6460]	2019-06-20 09:44:19 +02:00
Ghostkeeper	15997685df	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-06-20 09:18:16 +02:00
ChrisTerBeke	6cbe89f832	Remove weird file	2019-06-19 13:58:26 +02:00
ChrisTerBeke	eb8d353e11	Add basic support for print job actions via Cloud output device	2019-06-19 13:58:11 +02:00
Ghostkeeper	23abcd6fd6	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-19 10:49:20 +02:00
Remco Burema	c65fefce67	Merge pull request #5909 from Ultimaker/CURA-6590_fix_value_update_material ... CURA-6590 Fix value update in material profile	2019-06-18 16:56:45 +02:00
Ghostkeeper	adc6f79c9c	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-18 15:50:48 +02:00
Ghostkeeper	77d396b9bd	Also upgrade profiles if only the setting version is incorrect ... We need to check both version numbers.	2019-06-18 12:00:23 +02:00
Ghostkeeper	0498d43834	Run upgrader on imported profiles from >2.1 ... Oops... It should upgrade the old profiles so that they have the correct version and setting version.	2019-06-18 12:00:23 +02:00
Ghostkeeper	7fbdccffdb	Add typing	2019-06-18 12:00:22 +02:00
pkuiper-ultimaker	6a65045587	Merge pull request #5862 from Ultimaker/CURA-6460_remove_square_tower ... Remove square prime tower. [CURA-6460]	2019-06-18 11:49:43 +02:00
Lipu Fei	51dc7b1b8e	Fix value update in material profile ... CURA-6590	2019-06-18 11:23:28 +02:00
Ghostkeeper	487673e780	Always uncheck zoom to mouse if preference is disabled	2019-06-18 11:19:41 +02:00
Ghostkeeper	7f559987a0	Disable move to mouse position preference in orthogonal view	2019-06-18 11:16:21 +02:00
maukcc	c2ad542e21	HMS434 update ... start gcode exruder gcode	2019-06-18 10:56:04 +02:00
Lipu Fei	d1e7648f0e	Fix merge conflicts	2019-06-18 09:45:06 +02:00
pkuiper-ultimaker	9236f21d67	Merge pull request #5888 from Ultimaker/rename_minimum_diameter ... Rename Minimum Diameter to Maximum Tower-Supported Diameter	2019-06-17 15:39:44 +02:00
Lipu Fei	927135e0da	Fix typing ... CURA-6460	2019-06-17 13:44:08 +02:00
Lipu Fei	1d85e60a6b	Merge remote-tracking branch 'origin/master' into CURA-6460_remove_square_tower	2019-06-17 13:11:07 +02:00
Ghostkeeper	669b1021c0	Add reproduction steps to the bug report template ... It's like the most important part of a bug report, in my opinion.	2019-06-17 11:54:58 +02:00
Ghostkeeper	edcf905870	Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master	2019-06-17 09:38:12 +02:00
Lipu Fei	42b1e4f8f6	Fix typing ... CURA-6311	2019-06-17 08:48:15 +02:00
Робокинетика	c96777cb9e	Indentation fixes ... All tabs are replaced by 4 spaces	2019-06-16 19:38:20 +03:00
Робокинетика	f95bac436e	Update erzay3d.def.json	2019-06-16 19:33:30 +03:00
Ghostkeeper	0190247c5a	Don't show tooltip if it shows the same text as the button ... It's only useful if the text on the button gets elided.	2019-06-14 14:17:10 +02:00
Ghostkeeper	a39ac2ca22	Reduce travel jerk/acceleration and reduce print jerk slightly ... These settings are preventing layer shifts on the Tevo Tornado according to our users at #5694.	2019-06-14 11:50:58 +02:00
Remco Burema	fd8dfb4185	Fix resolve/value/warning definition for enable prime blob. [CURA-6414]	2019-06-14 11:39:48 +02:00
Ghostkeeper	a89465afa1	Build volume temperature should not be settable per extruder ... Just like build plate temperature, the per-extruder profiles can still override it but it will be resolved to a single global value.	2019-06-14 11:38:18 +02:00