15087 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lipu Fei	e5a11c1f7b	Fix getContainerMetaDataEntry() ... CURA-5408	2018-07-09 15:12:53 +02:00
Ghostkeeper	4dcb6c685e	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2018-07-09 15:03:01 +02:00
Ian Paschal	a596c5a034	Code-style fixes ... Contributes to CURA-5408	2018-07-09 14:39:13 +02:00
Ghostkeeper	588991660e	Merge branch 'CURA-5548_fix_sync_button_for_downloaded_materials'	2018-07-09 14:39:04 +02:00
Aleksei S	52f6037576	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-09 14:21:17 +02:00
Aleksei S	77bd6cf749	Read material weight from container ... CURA-5408	2018-07-09 14:20:51 +02:00
Ian Paschal	881449d380	Do not sync only with read_only material groups ... Fixes CURA-5548.	2018-07-09 14:12:54 +02:00
Ghostkeeper	f59f23c027	Fix sending print job name via USB	2018-07-09 11:41:02 +02:00
Ghostkeeper	dec9d7cac6	Still store disabled extruders as a set ... They should be unique anyway. Contributes to issue CURA-5456.	2018-07-09 11:32:53 +02:00
Ghostkeeper	54b990c0bd	Retract further if we can't set the temperature to stand-by temp ... Because we can't set the temperature and we don't know the correct temperature to set it back to, we will just retract further in order to prevent damage to the material. Contributes to issue CURA-5491.	2018-07-09 11:21:34 +02:00
Lipu Fei	1fdac63168	Merge pull request #4038 from Ultimaker/CURA-5545_fix_3mf_reader ... CURA-5545 Fix 3MF Reader	2018-07-09 11:00:13 +02:00
Lipu Fei	853266e8a8	Fix upgrade from 3.4 to 4.0	2018-07-09 10:58:04 +02:00
Ghostkeeper	533bd1a79c	Merge branch 'master' of ssh://github.com/Ultimaker/Cura ... Contributes to issue CURA-5491.	2018-07-09 09:47:49 +02:00
Ghostkeeper	41857338cb	Use firmware retraction and temperature control settings ... Instead of deriving this from the g-code flavour, just use the actual settings that are made to control these two properties. Contributes to issue CURA-5491.	2018-07-09 09:27:11 +02:00
Ghostkeeper	b67339c3bf	Merge branch 'CURA-5491-pause-at-height' ... Contributes to issue CURA-5491.	2018-07-09 09:17:49 +02:00
Ghostkeeper	6977b8de6e	Make getValue return an int if it's an integer number ... This is a more generic solution to what's done in 7058ddbb66. Contributes to issue CURA-5491.	2018-07-09 09:01:52 +02:00
Ian Paschal	9bf4541e06	Merge pull request #3697 from smartavionics/mb-supported-skin-fan ... Added support_fan_enable and support_supported_skin_fan_speed settings.	2018-07-06 23:17:42 +02:00
Lipu Fei	9c40b1de92	Remove code that is likely for debugging ... CURA-5545	2018-07-06 15:13:07 +02:00
alekseisasin	a499a6bb66	Merge pull request #4027 from Ultimaker/feature_prime_tower_shells ... Prime Tower Shells	2018-07-06 14:39:29 +02:00
Mark	183cd0182d	Merge pull request #4028 from Ultimaker/fix_style ... Fix code style	2018-07-05 21:22:53 +02:00
Ghostkeeper	afd3ce205a	Use double quotes ... As per our code style.	2018-07-05 20:19:40 +02:00
Ghostkeeper	96896088c3	Add spaces around equals operators ... As per our code style regulations.	2018-07-05 16:27:52 +02:00
Diego Prado Gesto	87261b2754	Merge pull request #4020 from Ultimaker/add_test_versionupgrade_version ... Add test for the version number being incremented	2018-07-05 15:36:15 +02:00
Diego Prado Gesto	c0985bec2a	Add the data to the tests.	2018-07-05 15:32:43 +02:00
Ghostkeeper	7b284355fb	Revert "Fix code-style in CuraEngineBackend" ... This reverts commit 7d7a51d772. That commit broke the start-up sequence.	2018-07-05 15:24:55 +02:00
Diego Prado Gesto	8afc49e902	Add style to a variable in X3Reader	2018-07-05 14:41:49 +02:00
Lipu Fei	b0f1a6d859	Use Label delegate to avoid overlapping texts ... CURA-5544	2018-07-05 14:36:41 +02:00
Diego Prado Gesto	c738f306fb	Fix style in some components	2018-07-05 14:35:12 +02:00
Diego Prado Gesto	ab339e7784	Merge pull request #4024 from Ultimaker/fix_use_engine_ready ... Use _engine_ready to detect if there is a QML engine	2018-07-05 13:57:53 +02:00
Ghostkeeper	ec00e5b721	Remove references to deleted settings ... Also convert the values for prime_tower_min_volume to make it behave similar to what the minimum volume used to be. This feature fixed a bug with the computation from volume to thickness. Now it's correct but we have to correct the old values to be still the same (approximately) as what used to be the end result. Contributes to issue CURA-5457.	2018-07-05 13:22:17 +02:00
Mark	4157cffdbd	Merge branch 'master' into fix_use_engine_ready	2018-07-05 13:18:12 +02:00
Ghostkeeper	8f8c515438	Fix bug when default_extruder_nr is not provided ... Then this would not slice because of a KeyError that is not caught. Contributes to issue CURA-5457.	2018-07-05 12:51:27 +02:00
Andreea Scorojitu	87fd4c9e70	Add color to text in toolboxFooter, CURA-5544 ... "You will need to restart Cura before changes in packages have effect." wasn't visible in Ultimaker darktheme, color has been added to the label, CURA-5544.	2018-07-05 12:44:11 +02:00
Diego Prado Gesto	a27ec30575	Merge pull request #4021 from Ultimaker/add_types_for_backup_metadata ... Add types for backup metadata	2018-07-05 12:33:26 +02:00
Ghostkeeper	ef2250b889	Don't check if keys are str ... Our type checking should take care of that.	2018-07-05 12:31:42 +02:00
Diego Prado Gesto	3d549d0fb0	Merge pull request #4023 from Ultimaker/add_types_volume_dimensions ... Add types for width, height, depth and shape	2018-07-05 12:29:51 +02:00
Diego Prado Gesto	20a9d8568f	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-05 12:09:32 +02:00
Ghostkeeper	807e8410c0	Give warning when sum of volumes exceeds volume of prime tower ... It could happen that the desired volume is not entirely reached in the inner shells because of rounding the volume up to the nearest perimeter on the outer shells. Contributes to issue CURA-5457.	2018-07-05 10:31:23 +02:00
Lipu Fei	e87f3d7ca9	Fix plugins import in CuraApplication ... CURA-5543 Only import types for type checking when TYPE_CHECKING is true.	2018-07-05 10:23:20 +02:00
Ghostkeeper	192a581d6d	Don't round the warning threshold ... The threshold is not visible. It's not necessary to round. Contributes to issue CURA-5457.	2018-07-05 09:50:05 +02:00
Ghostkeeper	4f1b2d51cc	Remove old commented code ... This is not valid any more by a long shot.	2018-07-05 09:45:20 +02:00
Mark	20180e3804	Merge pull request #4022 from Ultimaker/remove_id_raise3d ... Remove ID from Raise3D definition	2018-07-05 09:44:42 +02:00
Diego Prado Gesto	7d7a51d772	Fix code-style in CuraEngineBackend	2018-07-05 08:04:19 +02:00
Ghostkeeper	2023973e98	Use _engine_ready to detect if there is a QML engine ... We already have this variable. Let's not use a private variable from another class.	2018-07-04 17:39:24 +02:00
Ghostkeeper	b812989f1c	Add types for width, height, depth and shape	2018-07-04 17:34:26 +02:00
Ghostkeeper	9e18bb8b4c	Remove ID from Raise3D definition ... These IDs are not used and should never be added again.	2018-07-04 17:31:58 +02:00
Ghostkeeper	c9480f2f2b	Add types for backup metadata	2018-07-04 17:30:01 +02:00
Diego Prado Gesto	efb9fcb645	Merge branch '3.4'	2018-07-04 17:28:08 +02:00
Diego Prado Gesto	ed882b917e	Merge branch 'check_before_install_packages' into 3.4	2018-07-04 17:20:03 +02:00
Ghostkeeper	b149ef57fd	Add test for the version number being incremented	2018-07-04 17:18:01 +02:00