16749 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lipu Fei	b45311fb34	Update 3.4 changelog ... CURA-5433	2018-06-04 15:39:47 +02:00
Andreea Scorojitu	cec8881506	Update_changelog_3.4_Cura-5433 ... Updated the 3.4 change log to match the release notes	2018-06-04 15:21:36 +02:00
Lipu Fei	d80e66af02	Fix 21to22 upgrade ... CURA-5440	2018-06-04 15:18:33 +02:00
Diego Prado Gesto	dfd9fc2ae9	Revert "CURA-5404 Remove retraction_amount values that must be in the material" ... This reverts commit a969d3c5ea.	2018-06-04 14:43:00 +02:00
Diego Prado Gesto	36e72ae744	Merge branch '3.4' into fix_retraction_amount	2018-06-04 14:42:39 +02:00
Lipu Fei	e518d07f5a	No need to give parent to ExtruderStack	2018-06-04 13:22:08 +02:00
Ghostkeeper	258a90d850	Fix parameter ... Oops again. I should not do this when I have 30 seconds left on the clock. Contributes to issue CURA-5330.	2018-06-04 13:00:57 +02:00
Ghostkeeper	360d4f14e4	Fix broken import ... Oops. Contributes to issue CURA-5330.	2018-06-04 12:59:44 +02:00
Ghostkeeper	68ddf443a1	Use explicit key-word arguments instead of kwargs ... Makes it easier to use, and better self-documenting. Contributes to issue CURA-5330.	2018-06-04 12:58:56 +02:00
Jack Ha	f29b4326cc	Merge branch '3.4'	2018-06-04 12:54:07 +02:00
Jack Ha	402015aa05	Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4	2018-06-04 12:53:21 +02:00
Jack Ha	79d6a9a614	CURA-5434 fixed arrange to all build plates by reversing hull_shape and offset_shape	2018-06-04 12:53:13 +02:00
Ian Paschal	096f0775a8	CURA-5442 Compare plugin registry to package manager	2018-06-04 11:49:42 +02:00
Aleksei S	8113481b94	Merge branch '3.4' of github.com:Ultimaker/cura into 3.4	2018-06-04 11:48:19 +02:00
Aleksei S	a9095f2b77	After command "Undo" the project name was empty ... CURA-5367	2018-06-04 11:46:51 +02:00
Jack Ha	c6ac344ed5	Merge branch '3.4'	2018-06-04 11:40:03 +02:00
Jack Ha	4ddbf44373	Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4	2018-06-04 11:39:45 +02:00
Jack Ha	14294936c5	CURA-5434 reversed the role of offset_shape_arr and hull_shape_arr, to fix one-at-a-time arranging	2018-06-04 11:39:37 +02:00
Aleksei S	4922988e7d	Added .3mf extension to the MimeType ... CURA-5367	2018-06-04 11:11:02 +02:00
Ghostkeeper	e5d1a53dd6	Add missing return type ... Contributes to issue CURA-5330.	2018-06-04 09:55:17 +02:00
Ghostkeeper	51f24bc8c8	Call getMachineManager on CuraApplication ... Because Application doesn't have it. Its child class has. Contributes to issue CURA-5330.	2018-06-04 09:53:20 +02:00
Ghostkeeper	49c684a741	Add function typing ... Contributes to issue CURA-5330.	2018-06-04 09:51:34 +02:00
Ghostkeeper	8ba592b593	Fix circular import with CuraApplication again ... Contributes to issue CURA-5330.	2018-06-04 09:48:50 +02:00
Ghostkeeper	aff341eac9	Add casts for result of deepcopy ... Because deepcopy should return the same object as what is provided as input. Contributes to issue CURA-5330.	2018-06-04 09:48:30 +02:00
Ghostkeeper	9fb4511f52	Add function typing ... This causes MyPy to discover errors in this file. Contributes to issue CURA-5330.	2018-06-04 09:43:13 +02:00
Ghostkeeper	f544e3d5c0	Fix @override decorator ... They need a parameter and they need to be the last decorator. Contributes to issue CURA-5330.	2018-06-04 09:02:57 +02:00
Ghostkeeper	5a5d07865b	Fix circular imports with CuraApplication ... Contributes to issue CURA-5330.	2018-06-04 09:01:30 +02:00
Mark	0e11a165a3	add typing	2018-06-03 18:14:34 +02:00
Mark	30a05e6ba6	make sure old plugins are updatable	2018-06-03 12:57:08 +02:00
Ghostkeeper	84d69fcd97	Add missing type for locally created list ... MyPy isn't clever enough to figure this out. ...but I am. Contributes to issue CURA-5330.	2018-06-01 16:50:58 +02:00
Ghostkeeper	da285a33d5	Fix types ... Added the missing ones and fixed the broken ones. Contributes to issue CURA-5330.	2018-06-01 16:47:46 +02:00
Ghostkeeper	e4a0345fe4	Fix more minor typing mistakes ... Contributes to issue CURA-5330.	2018-06-01 16:40:57 +02:00
Ghostkeeper	c3bac474ab	Use CuraContainerRegistry instead of ContainerRegistry ... Because we're calling functions of CuraContainerRegistry. Contributes to issue CURA-5330.	2018-06-01 16:33:32 +02:00
Ghostkeeper	ff4a214c24	Add function typing ... This makes MyPy discover a lot of typing errors because it now starts analysing all of these functions. Contributes to issue CURA-5330.	2018-06-01 14:53:54 +02:00
Ghostkeeper	b920b9de4f	Fix type of setProperty ... And properly pass on the extra parameters. Contributes to issue CURA-5330.	2018-06-01 14:53:54 +02:00
Ghostkeeper	e38228ac24	Remove unused target_container parameter ... It's not compatible with ContainerInterface anyway. Contributes to issue CURA-5330.	2018-06-01 14:53:54 +02:00
Ghostkeeper	a6ffbbde8f	Add missing typing ... Contributes to issue CURA-5330.	2018-06-01 14:53:54 +02:00
Ghostkeeper	e77592d718	Add missing typing for CuraContainerStack ... This was already largely done, but not 100%. Contributes to issue CURA-5330.	2018-06-01 14:53:13 +02:00
Ghostkeeper	a98b4fe35c	Fix unknown model ... My IDE didn't indicate this because it is imported fine, but only if MYPY. Contributes to issue CURA-5330.	2018-06-01 14:53:13 +02:00
Ghostkeeper	b3f73594bf	Fix types of on_finished callback ... It only has a QNetworkReply argument. Contributes to issue CURA-5330.	2018-06-01 14:53:13 +02:00
Ghostkeeper	8ed3bd29cb	Don't return any boolean in _update ... Nothing listens to that return value, and its parent classes say that this must return None. Contributes to issue CURA-5330.	2018-06-01 14:53:13 +02:00
Ghostkeeper	a946a8aaed	Add function typing for PrinterOutputDevice ... This causes a lot of typing errors to surface. We'll fix this later though, when we get to it. Contributes to issue CURA-5330.	2018-06-01 14:53:13 +02:00
Ghostkeeper	a55cf0678e	Add missing function types ... The class is typed now. There's some bugs though. Contributes to issue CURA-5330.	2018-06-01 14:53:12 +02:00
Ian Paschal	74ba10444e	CURA-5357 Prevent uninstall of plugins that are not-yet-installed	2018-06-01 14:31:52 +02:00
Ghostkeeper	4157636552	Merge branch '3.4'	2018-06-01 14:03:05 +02:00
Ghostkeeper	2fbcc22123	Fix adding printers due to unused 'parent' parameter ... The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder. Contributes to issue CURA-5330.	2018-06-01 14:02:32 +02:00
Lipu Fei	e859861517	No need to set parent for ExtruderStack	2018-06-01 13:55:28 +02:00
Lipu Fei	41e94cd2a1	Fix merge problems from 3.4	2018-06-01 13:51:43 +02:00
Lipu Fei	61a3668a4f	Merge remote-tracking branch 'origin/3.4'	2018-06-01 13:51:00 +02:00
Mark	a479176c63	The prepare button slices, so it should be a slice button	2018-06-01 13:42:48 +02:00