6258 Commits

Author	SHA1	Message	Date
Aleksei S	b1c9b04a7a	Fix: filenames cut by first dot, remove only file extension because file might have dot in name ... CURA-5323	2018-05-02 17:17:45 +02:00
Lipu Fei	050d7ec5f1	Update the rest to version 5 ... CURA-4644	2018-05-02 14:07:24 +02:00
Lipu Fei	8d547010fb	Update all inst.cfg files to version = 4 ... CURA-4644	2018-05-02 14:04:34 +02:00
Diego Prado Gesto	8a768b8a96	CURA-5322 Add the resources deleted by mistake in 62aeb6c9541101740206176eb82b3568a43fbf7b	2018-05-02 13:45:23 +02:00
Ian Paschal	87e1f98156	Merge pull request #3663 from Ultimaker/feature_material_marketplace ... Feature material toolbox; all changes made	2018-05-02 12:23:13 +02:00
Ian Paschal	62aeb6c954	CURA-5035 Review feedback	2018-05-02 12:01:29 +02:00
Lipu Fei	41092b4d48	Merge pull request #3599 from jwalt/master ... Fixes for cura on ARM/Mali-based systems	2018-05-02 10:18:24 +02:00
jack	10e83e8653	Merge pull request #3477 from smartavionics/mb-retract-on-long-combs ... Added retraction_combing_max_distance setting	2018-05-01 15:34:54 +02:00
Lipu Fei	9a5fb47a6e	Merge master into material marketplace	2018-05-01 11:56:34 +02:00
Ghostkeeper	21bbfe1313	Set maximum travel resolution depending on travel speed ... To ratio of travel speed vs. print speed. Contributes to issue CURA-5171.	2018-05-01 11:01:14 +02:00
Ghostkeeper	ebca457f39	Add setting for maximum travel resolution ... I'm making this settable per extruder since a travel move is made with a certain active nozzle but can be between meshes so it can't be a per-mesh setting. I wouldn't know why you would want to set it differently per extruder though, but you can... Contributes to issue CURA-5171.	2018-05-01 09:21:36 +02:00
Diego Prado Gesto	d91dabb087	Merge branch 'master' of github.com:Ultimaker/Cura	2018-04-30 15:16:23 +02:00
Diego Prado Gesto	b582ac7526	CURA-5253 Initialize UI elements right after the qml files were loaded.	2018-04-30 15:09:52 +02:00
Lipu Fei	3e37487632	Merge pull request #3626 from kaleidoscopeit/patch-1 ... Update deltacomb.def.json	2018-04-30 10:19:37 +02:00
Gabriele Rossetti	b16cee5892	Fixed values with double-quotes	2018-04-26 14:36:08 +02:00
Ian Paschal	2751299fd3	CURA-5035 Remove un-used base_unit in theme	2018-04-26 13:24:15 +02:00
Lipu Fei	93b2a4f774	Merge pull request #3688 from kerog777/Felix_Profile ... Felix profile	2018-04-26 08:55:36 +02:00
kerog777	88dc33a288	Corrected preferred variant name ... Made it match the name field in the variant file	2018-04-25 20:29:09 -07:00
Lipu Fei	ec9be7a103	Merge remote-tracking branch 'origin/3.3'	2018-04-25 12:55:21 +02:00
Lipu Fei	491e0c83ba	Allow to select custom profiles based-on not supported ... CURA-5285	2018-04-25 12:38:57 +02:00
Lipu Fei	a6b62656c7	Fix quality profiles for Vertex Delta K8800 ... CURA-5284 quality_type "extreme" is used but not defined.	2018-04-25 12:01:41 +02:00
kerog777	9d9a238b2c	Update start gcode ... bed_temperature should have been print_bed_temperature. Refined heating steps and added a purge line.	2018-04-24 21:30:54 -07:00
kerog777	616d3f9ea8	Fixed version numbers and moved hardware_type = nozzle to metadata ... section.	2018-04-24 17:11:17 -07:00
Ian Paschal	236e2db47e	CURA-5035 Fixed selection header	2018-04-24 16:59:23 +02:00
Lipu Fei	585888f84a	Merge remote-tracking branch 'origin/3.3'	2018-04-24 14:28:50 +02:00
Diego Prado Gesto	06b9e5240e	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-24 12:43:49 +02:00
Diego Prado Gesto	0fa4df4193	Adjust Spanish and French translations to correctly fit in the space for ... the compatibility message. Contributes to CURA-5166.	2018-04-24 12:42:12 +02:00
Lipu Fei	9b77484e96	Translate adhesion sheet warning text ... CURA-5166	2018-04-24 11:59:43 +02:00
LukeChen-Ultimaker	10616bd4a0	Chinese translation for one string	2018-04-24 11:58:48 +02:00
Diego Prado Gesto	d6dcb995bf	Add Spanish and Italian translations to a string added after the string ... freeze. Contributes to issue CURA-5166.	2018-04-24 11:35:21 +02:00
Ghostkeeper	fad7885ba7	Add Dutch, German and French translations of string that broke freeze ... These are the languages other than English that I trust myself to translate properly... Contributes to issue CURA-5166.	2018-04-24 11:01:38 +02:00
Ghostkeeper	db0288fec4	Merge branch '3.3'	2018-04-24 10:49:30 +02:00
Ghostkeeper	403051e0b2	Merge branch 'CURA-5143_3.3_send_gz' into 3.3	2018-04-24 10:48:31 +02:00
Lipu Fei	0852cd2c20	WIP: Fix hanging upon send gz	2018-04-24 10:34:08 +02:00
Ghostkeeper	55e3c5c6d2	Update template with string break ... This new string broke the string freeze. We'll translate it for our most commonly used languages.	2018-04-24 10:22:53 +02:00
kerog777	930b716cc2	Fix brackets in start_gcode ... Had square brackets instead of curly brackets in M109 commands. Still worked OK from SD, but not from Octoprint.	2018-04-23 21:06:52 -07:00
kerog777	e8b37ea39c	Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile	2018-04-23 21:05:34 -07:00
Diego Prado Gesto	609d51e52e	CURA-5250 Remove buildplate menu entry temporary. Add back when the ... whole feature is back again.	2018-04-23 14:41:43 +02:00
Ghostkeeper	acd38b365a	Merge branch '3.3'	2018-04-23 14:15:38 +02:00
Ghostkeeper	47101cc1ca	Merge branch 'master' of github.com:Ultimaker/Cura	2018-04-23 14:14:12 +02:00
Ghostkeeper	5648bc82e7	Merge branch '3.3'	2018-04-23 14:07:46 +02:00
Lipu Fei	0a1fd51b2f	Prefer gcode for UM3 ... CURA-5143	2018-04-23 13:40:19 +02:00
Diego Prado Gesto	5333ca5aa8	Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data ... Show information dialogue on what usage data is sent	2018-04-23 13:32:22 +02:00
Lipu Fei	4c61e190ae	Add exclude materials for UMO, UM2, and UM2+ ... CURA-5271	2018-04-23 12:51:06 +02:00
Ghostkeeper	7c3fe6ac93	Publish Tough PLA profiles ... The Tough PLA material is now published, so we can publish these files too. Contributes to issue CURA-5272.	2018-04-23 11:28:33 +02:00
Ghostkeeper	aec2b9dafe	Add Ultimaker S5 resources ... The Ultimaker S5 has now been published, so these files may be published as well. Contributes to issue CURA-5272.	2018-04-23 11:27:13 +02:00
Ghostkeeper	d857541677	Update PO headers ... We're releasing 3.3 now.	2018-04-23 10:29:59 +02:00
Cláudio Sampaio (Patola)	b4ddeab47e	updated pt-br translations	2018-04-21 21:16:03 -03:00
kerog777	85fb9441ea	Made requested changes to version numbers, etc. per comments fro ... previous pull request.	2018-04-21 09:34:41 -07:00
Diego Prado Gesto	dbd30abd86	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-20 17:06:09 +02:00