15129 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	d8f8f3f77e	Fix type of self._application ... Since the function is now typed, it actually checks for this. UM.Application has no function getMachineManager. cura.CuraApplication does. Contributes to issue CURA-5460.	2018-07-10 15:36:19 +02:00
Ghostkeeper	f603b4c426	Also remove comma ... This makes the review task less, actually. Contributes to issue CURA-5460.	2018-07-10 15:29:58 +02:00
Ghostkeeper	d7eb5a76be	Remove compatible role ... It is no longer used. Contributes to issue CURA-5460.	2018-07-10 15:26:24 +02:00
Ghostkeeper	f5c9458e86	Remove mechanism for exclude_materials ... The fields were gone from the data, but now we remove the mechanism too. Contributes to issue CURA-5460.	2018-07-10 15:26:23 +02:00
Ghostkeeper	a18f77abdd	Move exclude_materials into material profiles ... They are there not 'hardware compatible' any more. Contributes to issue CURA-5460.	2018-07-10 15:26:23 +02:00
Ghostkeeper	f712fc0f36	No longer add incompatible materials to materials menus ... This removes the need for the 'compatible' role but I'll keep it in for now in case we want to change the design of this later. Contributes to issue CURA-5460.	2018-07-10 15:26:23 +02:00
Ghostkeeper	c0fc0a7eba	Disable material if not compatible ... Similar to how it's displayed in the printer. Contributes to issue CURA-5460.	2018-07-10 15:26:23 +02:00
Ghostkeeper	16226bdd48	Move exclude_materials into the material profiles ... An accompanying commit should be done in the fdm_materials repository. Contributes to issue CURA-5460.	2018-07-10 15:26:23 +02:00
Ghostkeeper	f0ef236df0	Change tab to spaces	2018-07-10 13:33:30 +02:00
Ghostkeeper	c4236d375b	Merge branch '3.4'	2018-07-10 13:01:51 +02:00
Ghostkeeper	33f7430798	Update change log for Cura 3.4.1 3.4.1	2018-07-10 12:03:59 +02:00
Ian Paschal	c36d089113	Merge pull request #4032 from Ultimaker/fix_tests_cura_engine_backend ... Fix MyPy issues	2018-07-10 11:19:18 +02:00
Ian Paschal	d709650def	Try to ignore _process variable	2018-07-10 11:04:17 +02:00
Lipu Fei	de551ccf51	WIP: Fix run_mypy on Windows via cmake	2018-07-09 16:46:53 +02:00
Lipu Fei	08249a8b06	WIP: Fix run_mypy.py for Windows	2018-07-09 16:18:43 +02:00
Lipu Fei	1a32e90cd0	WIP: Fix run_mypy.py for Windows	2018-07-09 16:13:40 +02:00
Ian Paschal	5e30fdf0fe	Make sure searchPath is always a string	2018-07-09 15:54:54 +02:00
Ian Paschal	8dab2a6696	Do not attempt to discard changed build plates	2018-07-09 15:33:41 +02:00
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
Ian Paschal	1c1b45541f	Merge branch 'master' into fix_tests_cura_engine_backend	2018-07-09 12:38:54 +02:00
Ian Paschal	413965a0ee	Fighting muscle memory	2018-07-09 11:51:53 +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
Ian Paschal	ac0192f01f	Improve fixes	2018-07-09 11:29:25 +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 7058ddbb66084bee9cd507ed69f031ec1262163e. 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
Lipu Fei	c3cd6f8052	Restore Jenkinsfile	2018-07-06 12:36:20 +02:00
Lipu Fei	c7b7521a30	WIP: Use shell to run make test on Jenkins	2018-07-06 11:21:54 +02:00
Lipu Fei	1483571fda	Show verbose msg when cmake test fails on Jenkins	2018-07-06 11:14:10 +02:00
Ian Paschal	c6b290e1e5	Fix broken slicing	2018-07-06 11:03:32 +02:00
Ian Paschal	b8a670a15a	Merge branch 'fix_tests_cura_engine_backend' of https://github.com/Ultimaker/Cura into fix_tests_cura_engine_backend	2018-07-06 11:03:20 +02:00
Mark	8e7399c442	Add correct typing	2018-07-06 10:56:09 +02:00
Ian Paschal	2c291e02be	Revert "Fixes for StartSliceJob" ... This reverts commit 9ec5770a1c2f64c50aee6a279645320e5bff8fe0.	2018-07-06 10:54:24 +02:00
Ian Paschal	75d5828f5f	Merge branch 'master' into fix_tests_cura_engine_backend	2018-07-06 09:48:07 +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