22237 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	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
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
tiger.he	45a659ab49	Hopefully Adding the Anet 3d Printer files to the latest version	2019-12-20 14:30:18 +08: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
sm3dp	0256e39601	update definitions format	2019-12-17 23:10:32 +08:00
sm3dp	da4eeaa622	Added LotMaxx sc10 and sc20 profile	2019-12-17 22:27:09 +08: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