6270 Commits

Author	SHA1	Message	Date
Ian Paschal	0561c66e47	CURA-5096 Remove unused leftovers	2018-05-08 15:38:18 +02:00
Ian Paschal	0accdc6320	Cura-5296 Use separate packages.json files in app and user data	2018-05-08 11:54:19 +02:00
Diego Prado Gesto	b8d442a1ac	Merge pull request #3760 from fieldOfView/fix_missing_units ... Add some missing units to machine settings	2018-05-04 15:07:09 +02:00
Ian Paschal	858108920a	Merge pull request #3765 from fieldOfView/fix_toolbox_appearance ... Fix toolbox appearance	2018-05-04 14:25:01 +02:00
Ghostkeeper	736f28bdb9	Move platform model slightly further down ... Otherwise it clips with the build volume. This looks much nicer.	2018-05-04 13:30:28 +02:00
fieldOfView	89322b9db6	Move toolbox button style into theme	2018-05-04 10:41:45 +02:00
Diego Prado Gesto	c8f73d303e	Merge pull request #3699 from Ultimaker/M&P-Setting-Optimization ... PP formula based temperatures fix	2018-05-04 09:43:30 +02:00
Ian Paschal	0872d499f8	CURA-5035 Add compatibility chart	2018-05-02 18:43:12 +02:00
Ruben D	0c51173bed	Disable Connect Infill Lines when using gradual infill ... Gradual infill causes infill to break up into lots of different areas with different infill densities. Because Connect Infill Lines connects those lines along the border of an infill area, you sometimes get very thin areas with lots of lines going back and forth connecting extremely thin pieces of infill. Sometimes it works fantastically (esp. with mechanical models) but sometimes it really messes up the print. Contributes to issue CURA-5319.	2018-05-02 17:45:45 +02:00
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
fieldOfView	51ebb351eb	Add some missing units to machine settings	2018-05-01 12:35:02 +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
THeijmans	352d32b116	Added 0.25mm temperature formulas	2018-05-01 09:31:54 +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
THeijmans	2db98c18cd	PP formula based temperatures fix	2018-04-23 17:07:31 +02: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