24910 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nino van Hooff	d110d04c36	Make loading messages more consistent and cleanup usages. ... CURA-6823	2019-12-24 10:43:21 +01:00
Nino van Hooff	07fb775ac1	Preload theme in QtApplication ... Fixes an error where theme was loaded before the engine is initialized CURA-6823	2019-12-24 09:51:37 +01:00
Dimitriovski	8c0f64633b	Removed comments ... CURA-7038	2019-12-23 18:08:22 +01:00
Dimitriovski	4b86400661	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7038	2019-12-23 17:48:15 +01:00
Nino van Hooff	6a0fba060e	Add loading hint for replacing the global stack ... Displayed as a splash message when the application is starting, logged (not displayed to the user) otherwise CURA-6823	2019-12-23 17:32:20 +01:00
Jaime van Kessel	36364ea59b	Fix identation	2019-12-23 17:24:00 +01:00
Dimitriovski	12be21e594	Reworked the flow to show only not installed packages for installing in the Compatibility Dialog ... CURA-7038	2019-12-23 17:23:26 +01:00
Jaime van Kessel	973685701c	Remove removed setting	2019-12-23 17:19:31 +01:00
Jaime van Kessel	58a20fc110	Remove themed color from machinesettings action ... Since it's partially in a system themed style, it shouldn't use color. If it does use color, it gets messed up if the user uses dark theme (white text on gray background doesn't work) CURA-7059	2019-12-23 17:08:48 +01:00
Dimitriovski	4375118a9f	Refactored most of the code into separate functions ... CURA-7038	2019-12-23 16:58:44 +01:00
Nino van Hooff	81976cfd1a	Add a few splash loading messages for a better sense of progress ... CURA-6823	2019-12-23 16:31:55 +01:00
Ghostkeeper	8a9b791298	Merge branch '4.4' ... Conflicts: cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.	2019-12-23 16:26:25 +01:00
Ghostkeeper	ce5f7ce821	Make support wall line count visible when tree support is enabled ... Oops, otherwise this can't be used (found during testing). Contributes to issue CURA-7077.	2019-12-23 16:22:17 +01:00
Ghostkeeper	a3c5435a1d	Remove support_tree_wall_thickness ... This setting will not be automatically translated to support_wall_thickness if it's overwritten, because that would require knowing the line width and we don't know that here. So it's hard to do. Contributes to issue CURA-7077.	2019-12-23 16:22:17 +01:00
Ghostkeeper	50f64ca696	Merge support_tree_wall_count into support_wall_count ... So now the two settings are used as one. Contributes to issue CURA-7077.	2019-12-23 16:22:17 +01:00
Ghostkeeper	dbda415bba	Make merged settings extensible ... This way it's: - documented at the top of the file to make it easier to find all the changes, and - easier to extend the list of merged settings. Contributes to issue CURA-7077.	2019-12-23 16:22:16 +01:00
Ghostkeeper	824dd59e76	Code style: Spaces around binary operators	2019-12-23 16:22:16 +01:00
Ghostkeeper	71a10a262a	Move documentation nearer to code it applies to ... Contributes to issue CURA-6522.	2019-12-23 16:22:16 +01:00
Jaime van Kessel	8398384af1	Merge branch 'master' of github.com:Ultimaker/Cura	2019-12-23 15:58:44 +01:00
Jaime van Kessel	580b544642	Convert stl to binary (instead of ASCII)	2019-12-23 15:58:13 +01:00
Jaime van Kessel	19e659735d	Change extension of lotmaxx extruders so they actually work	2019-12-23 15:53:51 +01:00
Jaime van Kessel	cce7af9cb2	Merge branch 'add-lotmaxx-printers' of https://github.com/sm3dp/Cura	2019-12-23 15:48:51 +01:00
Dimitriovski	bd8c1e4c96	Initial implementation for the Compatibility Dialog window ... CURA-7038	2019-12-23 15:18:09 +01:00
konskarm	4dbc56f09b	Merge pull request #6831 from springtiger/master ... Hopefully Adding the Anet 3d Printer files to the latest version	2019-12-23 14:17:43 +01:00
Ghostkeeper	f02d4f5e43	Fix spelling ... Help, I'm forced to do this by the Apostrophe Protection Society!	2019-12-23 14:01:06 +01:00
Jaime van Kessel	2108d408e4	Merge branch 'master' of github.com:Ultimaker/Cura	2019-12-23 11:14:17 +01:00
Jaime van Kessel	f983990ac1	Fix some codestyle issues	2019-12-23 11:13:59 +01:00
Jaime van Kessel	5061a36aba	Fix mesh_type being reset when adding a setting	2019-12-23 11:11:09 +01:00
Ghostkeeper	8218d62e20	Add change log entry for 4.4.1 ... Contributes to issue CURA-7047.	2019-12-23 10:52:51 +01:00
Ghostkeeper	0028cc85ed	Remove comment documenting commit history ... Use the commit history to document the commit history. This solves a log warning about unknown data type for skin_edge_support_thickness.	2019-12-23 09:08:47 +01:00
tiger.he	133e300f5e	fix miss delimiter error	2019-12-21 23:07:53 +08:00
tiger.he	dda67cde1a	add machine_extruder_trains in machine definitions	2019-12-21 23:04:02 +08:00
tiger.he	17d9aa7450	remove extruders definitions	2019-12-21 22:53:36 +08:00
tiger.he	d67dae2140	delete unused definitions	2019-12-21 22:35:28 +08:00
sm3dp	658604404c	Change head polygon profile name	2019-12-21 15:18:22 +08:00
Jaime van Kessel	4ce086d5c3	Cut op beginRendering of solidView	2019-12-20 16:44:12 +01:00
Jaime van Kessel	24a5cbfacb	Make test a bit more readable	2019-12-20 15:21:59 +01:00
Dimitriovski	9cf5a388f3	Change for CURA-6979. Check for packages installed in Cloud MP but not in Cura MP. ... CURA-7038	2019-12-20 13:59:45 +01:00
Jaime van Kessel	ed9d79feed	Add some extra drawings regarding the profiles	2019-12-20 13:50:05 +01:00
Dimitriovski	dc20db393e	Initial work for Compatiility Dialog done ... CURA-7038	2019-12-20 13:10:22 +01:00
Ghostkeeper	15ba762847	Fix spelling of error message in the log ... Found during investigation of #6828.	2019-12-20 09:54:07 +01:00
tiger.he	45a659ab49	Hopefully Adding the Anet 3d Printer files to the latest version	2019-12-20 14:30:18 +08:00
jos@mauk.cc	47f4a329ff	Merge branch 'master' of https://github.com/maukcc/Cura	2019-12-19 15:51:56 +01:00
jos@mauk.cc	f5f86e8e4b	HMS434 update ... Material exclusion update	2019-12-19 15:49:15 +01:00
ninovanhooff	4773c4eaf3	Merge pull request #6803 from Ultimaker/sentry_crash_integration ... Sentry crash integration	2019-12-19 14:29:07 +01:00
Nino van Hooff	2f628bbfd3	Merge branch 'voron2_duplicated'	2019-12-19 14:06:43 +01:00
Remco Burema	894e678d84	Merge pull request #6820 from Ultimaker/CURA-7041_add_misp_material_settings ... CURA-7041_add_misp_material_settings	2019-12-19 11:51:54 +01:00
Remco Burema	f05f4ff244	Fix typo. ... part of CURA-7041	2019-12-19 11:38:53 +01:00
ninovanhooff	e8823d3529	Merge pull request #6821 from Ultimaker/CURA-7070_fix_quality_search ... CURA-7070 fix quality search	2019-12-19 11:34:54 +01:00
Jaime van Kessel	0295113b31	Add user (identified by MAC) & ensure that no personal info is in server_name	2019-12-19 11:23:39 +01:00