6854 Commits

Author	SHA1	Message	Date
Lipu Fei	dcaa10e409	Handle error due to missing quality_changes in 3MF loading ... CURA-7078	2019-12-24 10:59:09 +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
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	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
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	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
Jaime van Kessel	4ce086d5c3	Cut op beginRendering of solidView	2019-12-20 16:44:12 +01:00
ninovanhooff	4773c4eaf3	Merge pull request #6803 from Ultimaker/sentry_crash_integration ... Sentry crash integration	2019-12-19 14:29:07 +01:00
Remco Burema	f05f4ff244	Fix typo. ... part of CURA-7041	2019-12-19 11:38:53 +01:00
Nino van Hooff	ff01b1dab9	Add 6 Material Station specific material settings. ... These settings are currently unused by cura, but passed into the PPA output. Some considerations: - material_ prepended to all. Even though they are not all material specific. The consistency is more developer-friendly imho - defaults taken from generic_pla - type is float for all, consistent with what I found in this file CURA-7041	2019-12-18 11:46:40 +01:00
Lipu Fei	f9739e2af8	Fix typing	2019-12-17 11:33:39 +01:00
Lipu Fei	3ddc2466f8	Fix typing	2019-12-17 10:27:05 +01:00
Tim Kuipers	a7e4d76d05	make lithophane alpha channel control total final width multiplier. ... That way the picture is not always square. We can use the alpha channel to encode the actual shape	2019-12-16 13:31:11 +01:00
Jaime van Kessel	4de28bed28	Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration	2019-12-16 11:28:04 +01:00
Jaime van Kessel	ffccca257f	Add some documentation to SentryLogger	2019-12-16 11:15:25 +01:00
Jaime van Kessel	62ea766880	Rename <censored_path> to <user_home>	2019-12-16 11:12:19 +01:00
Jaime van Kessel	7c9d7a3aef	Clean up the _translateLogType ... This makes it a bit easier to read	2019-12-16 11:11:28 +01:00
Jaime van Kessel	157a25a992	Fix minor codestyle issues	2019-12-16 11:06:48 +01:00
Jaime van Kessel	6a36a71c2c	Prune user paths from the sentry logs	2019-12-13 16:25:58 +01:00
Jaime van Kessel	93ee111566	Add missing typing	2019-12-13 15:20:43 +01:00
Ghostkeeper	5ea60823f5	Don't crash if address is still none after getting info ... This can happen (starting somewhere between zeroconf version 21.0 and 24.0). Contributes to issue CURA-7032.	2019-12-13 10:54:27 +01:00
Ghostkeeper	e54ce8643b	Don't wrap str unnecessarily ... Just an inefficiency that I found.	2019-12-13 10:44:48 +01:00
Remco Burema	8cc054cecc	Add missing 'material break preparation temperature'. ... part of CURA-6971 (cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)	2019-12-12 14:09:46 +01:00
Lipu Fei	849ac3551d	Merge branch 'master' into master-1	2019-12-11 10:57:50 +01:00
Nino van Hooff	8aae5f7563	Fix: extra ConfigParsaer arg added to wrong call ... CURA-6522	2019-12-10 16:33:47 +01:00
Jaime van Kessel	f66b1e6fde	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack	2019-12-10 13:06:37 +01:00
Jaime van Kessel	4811f15a7b	Merge pull request #6662 from Ultimaker/CURA-6981_add_build_type ... CURA-6981 Add build_type into crash reports and stats	2019-12-05 15:09:38 +01:00
Ghostkeeper	250774c4cd	Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master	2019-12-05 11:19:42 +01:00
Nino van Hooff	b30b641034	Merge remote-tracking branch 'origin/CURA-6522_one_at_a_time_overlapping_build_area' into CURA-6522_one_at_a_time_overlapping_build_area	2019-12-04 14:28:48 +01:00
Nino van Hooff	e2db4e873d	Add paramteter to Config Parser constructor to prevent comments in ... Gcode to be remnoved by upgrade, as in CURA-6994 CURA-6522	2019-12-04 14:28:30 +01:00
Dimitriovski	74d919a5d2	Prevent deleting comments from Start/End G-codes by changing the comment_prefixes in ConfigParser ... CURA/6994	2019-12-03 14:40:54 +01:00
translucentfocus	4fc32b036e	Fixed typo ... Only correcting in master; may want to consider correcting in other branches	2019-11-27 11:46:07 -06:00
Mathias Lyngklip Kjeldgaard	8835a0cb99	Fixed a typo in the title ... I noticed a typo in the title of the plugin, so that is fixed. I also added more info to the description.	2019-11-26 20:20:45 +01:00
Jaime van Kessel	b1072029ba	Merge branch 'CURA-6971_add_break_prep_temp' of github.com:Ultimaker/Cura	2019-11-25 13:48:27 +01:00
Jaime van Kessel	6c8fddc765	Add sentry logger to display breadcrumbs	2019-11-22 13:26:17 +01:00
Remco Burema	25f0460231	Add missing 'material break preparation temperature'. ... part of CURA-6971	2019-11-22 12:01:46 +01:00
Remco Burema	432ed02aa6	Fix skip (or late) pause at height. ... Previously, the line after the layer change would also contain the z height. If not found, the could would break the per-line reading, and skip to the next layer. However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses). I just ignored the optimization and made it a continue. I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once. CURA-6965	2019-11-21 14:08:51 +01:00
Jaime van Kessel	50d72692d8	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area	2019-11-20 16:48:00 +01:00
Dimitriovski	94a5b5ef90	CURA-6522_one_at_a_time_overlapping_build_area ... Changed the setting_version to 11	2019-11-19 15:27:17 +01:00
Jaime van Kessel	c6f42766c7	Remove hardcoded sizes from dialogs & popups ... Contributes to #6670	2019-11-19 13:00:39 +01:00
Lipu Fei	a6203f462d	Add build_type into crash reports and stats ... CURA-6981	2019-11-15 15:00:46 +01:00
Jaime van Kessel	c65ccf29b0	Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura	2019-11-14 11:06:12 +01:00
Nino van Hooff	c31c1dd6fb	Refactor: simplify SimulationSliderLabel font metrics	2019-11-12 14:56:56 +01:00
Nino van Hooff	27b4e9a063	Refactor: simplify SimulationSliderLabel width	2019-11-12 14:55:00 +01:00
Nino van Hooff	f4b9c0fdd4	Fix SimulationSliderLabel width	2019-11-12 14:52:11 +01:00