22219 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
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
Jaime van Kessel	ed9d79feed	Add some extra drawings regarding the profiles	2019-12-20 13:50:05 +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
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
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
Ghostkeeper	5ef7fe56be	Remove unnecessary override of expansion angle to 45 degrees ... Found in #6823.	2019-12-19 09:58:42 +01:00
Nino van Hooff	8dc6e7a386	Add encvironment variable to Sentry crash logging ... CURA-7050	2019-12-19 09:45:35 +01:00
Lipu Fei	5476d430d1	Fix cicd.yaml	2019-12-18 16:51:32 +01:00
Lipu Fei	d74b2db8b8	Only run CI for master, WIP, and release branches on push	2019-12-18 16:50:33 +01:00
Lipu Fei	1eada1dc9b	Update setting_version to 11 for Strateo3d ... CURA-7064	2019-12-17 15:26:17 +01:00
Lipu Fei	6cf9b40f77	Merge pull request #6678 from eMotion-Tech/master ... Add_hips_&_08_nozzle	2019-12-17 15:25:28 +01:00
Koub	2fcc5d8fd2	Merge branch 'master' into master	2019-12-17 14:57:22 +01:00
Lipu Fei	7f053c8d2a	WIP: Fix git ref	2019-12-17 12:35:41 +01:00
Lipu Fei	de9a07e6c1	WIP: Fix GH Actions for Uranium fetching	2019-12-17 12:28:27 +01:00
Lipu Fei	d12edaff10	WIP: Fix fetching Uranium	2019-12-17 11:57:36 +01:00
Lipu Fei	dc7ec41b12	WIP: Fix fetching Uranium	2019-12-17 11:55:06 +01:00
Lipu Fei	208ab6421f	WIP: Fix fetching Uranium	2019-12-17 11:52:32 +01:00
Lipu Fei	88196fa62b	Correct GH Actions steps name	2019-12-17 11:36:42 +01:00
Lipu Fei	c1aa556a59	chmod 644 *.inst.cfg	2019-12-17 11:21:19 +01:00
KOUBeMT	97d21a8013	Adding_ASA-X_profiles	2019-12-17 11:07:15 +01:00
Lipu Fei	8b256f3efc	Merge pull request #6694 from maukcc/master ... HMS434 update	2019-12-17 11:00:46 +01:00
KOUBeMT	1e851647be	ABS_04&06_support_tuning	2019-12-17 10:57:57 +01:00
Ghostkeeper	bec513aa8a	Alternatively allow backspace to delete selection ... I thought we already had this? Fixes #6475.	2019-12-17 10:35:59 +01:00
Lipu Fei	dd5c6c892c	chmod 644 for def.json files	2019-12-17 10:35:23 +01:00
Lipu Fei	3ddc2466f8	Fix typing	2019-12-17 10:27:05 +01:00
ninovanhooff	ed838baafa	Merge pull request #6577 from Ultimaker/litho_alpha ... make lithophane alpha channel control total final width multiplier.	2019-12-16 14:21:15 +01:00
Mark Burton	678ba61bca	Add brim gap setting (#6279) ... Added brim_gap setting to space brim away from edge of model.	2019-12-16 13:55:08 +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
Ghostkeeper	1dc39dba71	Move prime speed override to definition file ... To reduce the number of overrides. You'd only need to change it in one place, next time. It was being overridden in the quality profile in every supported configuration.	2019-12-16 13:15:40 +01:00
Ghostkeeper	d85dcf0d8f	Also set a limit to retraction prime speed for original Jellybox	2019-12-16 13:15:40 +01:00
Ghostkeeper	a9849be1b2	Code style: Space around binary operators	2019-12-16 13:15:40 +01:00
Ghostkeeper	eb54a62eca	Add minima for retraction prime speed ... Otherwise the automated inheritance function makes it negative sometimes. Contributes to issue #6806.	2019-12-16 13:15:39 +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	c15599f1c4	Add some extra info to crash handler screen	2019-12-16 11:23:12 +01:00
Lipu Fei	8b9e5c5154	Merge pull request #6594 from fieldOfView/fix_jobname_editing ... Make jobname less sensitive to being touched	2019-12-16 11:20:36 +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	8fa6239365	Fix spelling mistake	2019-12-16 11:08:09 +01:00
Jaime van Kessel	157a25a992	Fix minor codestyle issues	2019-12-16 11:06:48 +01:00
Lipu Fei	20971cecc9	Merge branch 'master' into master	2019-12-16 10:47:29 +01:00
Lipu Fei	dd9395792f	Merge branch 'master' into fix_jobname_editing	2019-12-16 10:40:03 +01:00
ninovanhooff	51de4173e7	Merge pull request #6802 from Ultimaker/CURA-6127_settings_lost_when_sync_to_diff_printer_type ... Cura 6127 settings lost when sync to diff printer type	2019-12-16 09:57:13 +01:00
ninovanhooff	f77832315a	Merge branch 'master' into CURA-6127_settings_lost_when_sync_to_diff_printer_type	2019-12-16 09:48:32 +01:00