15371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Diego Prado Gesto	ac413b00a2	Merge pull request #4068 from Ultimaker/CURA_5458_Change_naming_file_menu ... CURA-5458 Use Save and Export in the File menu	2018-07-12 15:24:40 +02:00
Jack Ha	abbbdb17e6	Fix if you randomly click around in the materials then some spool_weights of 0 gets mixed up. The cause was that base.containerId was not updated at the same time as properties.guid. CURA-5408	2018-07-12 15:17:46 +02:00
Diego Prado Gesto	395c5d3a8b	CURA-5458 Add three dots in the options that will open a new window. ... Add the Save option together with the New and Open, and then separate it from the Export options.	2018-07-12 15:16:01 +02:00
Mark	e53e62ccab	CURA-5458 Use Save and Export	2018-07-12 14:54:10 +02:00
Jack Ha	23d4e835ed	Merge branch 'master' into CURA-5408-material-profiles	2018-07-12 14:44:50 +02:00
Jack Ha	56d5fc8a62	Merge branch 'master' into CURA-5408-material-profiles	2018-07-12 14:43:33 +02:00
Diego Prado Gesto	e88362930d	CURA-5562 Don't trigger the stop slicing if some nodes without build ... plate associated with it changes in the scene, such as the NozzleNode in the SimulationView.	2018-07-12 14:34:42 +02:00
jack	461b191648	Merge pull request #4044 from Ultimaker/remove-package-check ... CURA-5389 Check and confirmation before Remove package	2018-07-12 14:15:13 +02:00
Jack Ha	2bd8350141	Added error checking, added typing, renamed function. CURA-5389	2018-07-12 14:06:34 +02:00
Ghostkeeper	abf1610923	Rename Custom FDM Printer to Custom FFF printer ... FFF is easier to type... But that's probably not the real reason why we need to do this. Contributes to issue CURA-5461.	2018-07-11 13:30:27 +02:00
Aleksei S	995a95b8ab	Merge branch 'master' of github.com:Ultimaker/Cura	2018-07-11 13:24:12 +02:00
Aleksei S	596a7b7169	Added signal to prevent window closing if USB printer is printing ... CURA-5384	2018-07-11 13:23:30 +02:00
jack	a20cf2e750	Merge pull request #4059 from Ultimaker/fix_missing_layer_view ... Fix missing layer view	2018-07-11 11:37:39 +02:00
Jack Ha	993dd7a90e	Check for None instead of evaluating the variable as True/False.	2018-07-11 11:34:31 +02:00
Ian Paschal	6a5c0b608d	Fix missing layer view	2018-07-11 11:24:16 +02:00
Lipu Fei	af02dc2758	Only use setMetaDataEntry()	2018-07-11 11:14:57 +02:00
Lipu Fei	76417b7fb2	Hide materials belong to a to-be-removed package	2018-07-11 10:57:57 +02:00
fieldOfView	aa259cfb06	Enforce focus on save button to ensure edits to jobname happen before saving ... Fixes #4007	2018-07-11 09:28:40 +02:00
Andreea Scorojitu	07195cc95c	Merge pull request #3976 from MarmaladeForMeat/master ... Update Chinese translation	2018-07-10 16:54:49 +02:00
Lipu Fei	e2f9444b92	Merge pull request #4049 from Ultimaker/revert-4047-feature_remove_exclude_materials ... Revert "Move "Exclude Materials" metadata to materials"	2018-07-10 16:27:22 +02:00
Lipu Fei	7658ad34e2	Revert "Move "Exclude Materials" metadata to materials"	2018-07-10 16:27:07 +02:00
Lipu Fei	5255d6ca2a	Better height for dialog	2018-07-10 16:11:56 +02:00
Lipu Fei	33a6c8bb8e	Merge pull request #4047 from Ultimaker/feature_remove_exclude_materials ... Move "Exclude Materials" metadata to materials	2018-07-10 15:48:26 +02:00
Jack Ha	e739a74900	Merge branch 'master' into CURA-5408-material-profiles	2018-07-10 15:48:10 +02:00
Jack Ha	5eb2230d82	Fix default value for getMaterialPreferenceValue other than spool_weight, added cleanup code for saving default values. CURA-5408	2018-07-10 15:40:13 +02:00
Ghostkeeper	3ee2b753e6	Fix circular import ... Yeah, running tests is not enough when it doesn't catch these. Contributes to issue CURA-5460.	2018-07-10 15:40:08 +02:00
Ghostkeeper	7434033405	Add type for item_list ... Just to be complete. Contributes to issue CURA-5460.	2018-07-10 15:36:52 +02:00
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
Lipu Fei	3a1d57a725	Increase dialog height	2018-07-10 15:32:39 +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
Lipu Fei	328fd9081e	Merge remote-tracking branch 'origin/master' into remove-package-check	2018-07-10 14:57:46 +02:00
Lipu Fei	cc5f35dd91	Rename some functions and variables	2018-07-10 14:57:01 +02:00
Ghostkeeper	f0ef236df0	Change tab to spaces	2018-07-10 13:33:30 +02:00
Jack Ha	e7c1d31bee	Fixed change material diameter, changed signature of getContainerMetaDataEntry. CURA-5408	2018-07-10 13:14:11 +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