14139 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	94b2209b49	Merge remote-tracking branch 'origin/3.3'	2018-04-19 09:40:30 +02:00
Lipu Fei	aab87a5558	Merge pull request #3584 from ohrn/zyyx ... Add ZYYX Agile printer.	2018-04-19 09:38:19 +02:00
Lipu Fei	db5c18295b	Merge remote-tracking branch 'origin/3.3'	2018-04-19 09:20:22 +02:00
Lipu Fei	f24e1da934	Always update job name for gcode files ... CURA-5246	2018-04-19 09:17:22 +02:00
Jinbuhm Kim	0a5f1878b7	Update Korean translation for Cura 3.3	2018-04-19 16:13:40 +09:00
Lipu Fei	d56e726507	Merge pull request #3685 from Ultimaker/fix_support_eraser_3.3 ... [3.3] Fix support eraser	2018-04-19 08:34:24 +02:00
fieldOfView	57404deba6	Prevent scaling support eraser with scaled parent	2018-04-19 08:32:50 +02:00
fieldOfView	a52eaa98f1	When multiplying a parented node, multiply the parent instead (like groups)	2018-04-19 08:32:50 +02:00
fieldOfView	ea6d4d96f9	Exclude non-printing-meshes from bounding box of parents ... Non-printing-meshes inside a group should not affect push apart or drop to build plate	2018-04-19 08:32:50 +02:00
fieldOfView	0e85802f9c	Only respond to left mouse button	2018-04-19 08:32:50 +02:00
Jinbuhm Kim	76211fc07b	Fix and add Korean translation	2018-04-19 12:31:13 +09:00
Diego Prado Gesto	9a389bdcdd	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-18 16:55:18 +02:00
Diego Prado Gesto	ee359571c0	CURA-5246 Start the timer for updating the platform activity also when ... the node that changed is a GCode, that has layer data.	2018-04-18 16:53:33 +02:00
Lipu Fei	2ba7a6e462	Revert "Fix gcode.gz double extension problem on Mac" ... This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc. CURA-5228	2018-04-18 16:00:08 +02:00
Lipu Fei	9e7c417801	Revert "Fix gcode.gz double extension problem on Mac" ... This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc. CURA-5228	2018-04-18 15:59:28 +02:00
Lipu Fei	e7ec767cb7	Merge pull request #3545 from fieldOfView/fix_support_eraser_related ... [3.3] Support Eraser related fixes	2018-04-18 15:14:44 +02:00
Lipu Fei	340916179a	Small typo fixes for preheat timeout ... CURA-5227	2018-04-18 12:00:50 +02:00
Lipu Fei	dc52678c05	Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print ... [3.3] Prevent preheat timeout from occurring during a print	2018-04-18 11:59:54 +02:00
Lipu Fei	64274b78b0	Merge pull request #3675 from Ultimaker/PC_setting_changes ... PC profile adjustment	2018-04-18 11:28:47 +02:00
Lipu Fei	372419c223	Fix fallback quality setting ... CURA-5218	2018-04-18 11:24:09 +02:00
Lipu Fei	650638fcdd	Fix setting default quality ... CURA-5218	2018-04-18 11:20:43 +02:00
Lipu Fei	7326ee8c40	Fix typo ... CURA-5218	2018-04-18 11:19:04 +02:00
Lipu Fei	bae1d2a59d	Switch to a default quality if the specified is not available ... CURA-5218	2018-04-18 11:16:19 +02:00
Ghostkeeper	7ce7b53098	Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3	2018-04-18 11:03:28 +02:00
Lipu Fei	1fefc05698	Fix UM2 custom profile upgrade from 2.7 ... CURA-5218	2018-04-18 10:54:54 +02:00
Ghostkeeper	c49f912276	Merge branch '3.3'	2018-04-18 10:43:31 +02:00
Ghostkeeper	2f14274b87	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-18 10:41:17 +02:00
Ghostkeeper	f19b717503	Corrections to Polish translations ... One small correction that seems to have been a typo (and the header wasn't up to date yet). Contributes to issue CURA-5166.	2018-04-18 10:40:49 +02:00
Ghostkeeper	921ef993c7	Update Polish translations for Cura 3.3 ... These are the translations received from Anraf1001, the unmodified files. Contributes to issue CURA-5166.	2018-04-18 10:37:39 +02:00
Lipu Fei	1d4a70e839	Show all quality_changes on the quality management page ... CURA-5218	2018-04-18 10:35:53 +02:00
Lipu Fei	83c728c89e	Update job name when pre-sliced flag changes ... CURA-5246	2018-04-18 10:24:58 +02:00
Ghostkeeper	b8920b290f	Merge branch '3.3'	2018-04-18 09:47:06 +02:00
Ghostkeeper	407b453ba5	Corrections to European Portuguese translation ... These corrections are necessary to make the text fit better.	2018-04-18 09:41:54 +02:00
Ghostkeeper	d28c94a000	Make corrections from Utopica3D ... Paulo made a bunch of corrections to our European Portuguese translation. These are his files. Contributes to issue CURA-5166.	2018-04-18 09:40:23 +02:00
Lipu Fei	35e7be1d41	Use pyqtSlot to show more info dialog ... CURA-5204	2018-04-17 16:43:41 +02:00
Lipu Fei	0d5b21932e	Use "More information" for button ... CURA-5204	2018-04-17 16:13:13 +02:00
Lipu Fei	4d3acddfa4	Update text and fix qml code styles ... CURA-5024	2018-04-17 16:08:43 +02:00
Lipu Fei	50153b43a8	Fix license banner for MoreInfoWindow.qml ... CURA-5204	2018-04-17 16:08:05 +02:00
Lipu Fei	4aab395b71	Update example_data.json ... CURA-5204	2018-04-17 16:06:44 +02:00
Lipu Fei	fa90fcf18e	Fix gcode.gz double extension problem on Mac ... CURA-5228	2018-04-17 15:03:17 +02:00
Ghostkeeper	c4b15b02d4	Merge branch '3.3'	2018-04-17 14:32:15 +02:00
Ghostkeeper	1b173e8119	Correct translation of 'Affects' ... Apparently 'touché' means something more like a human touching it, rather than something affecting something else. Fixes #3489.	2018-04-17 14:32:02 +02:00
Ghostkeeper	0f39b36bd6	Correction to French translation of 'Hollow Out Objects' ... Fixes #3489.	2018-04-17 14:30:08 +02:00
Ghostkeeper	e43e9ad117	Merge branch '3.3'	2018-04-17 13:56:46 +02:00
Ghostkeeper	b744302557	Merge branch 'M&P-Setting-Optimization' into 3.3	2018-04-17 13:56:11 +02:00
Diego Prado Gesto	94cad851a4	Use the correct filament diameter to calculate line width in the gcode ... parser.	2018-04-17 13:39:22 +02:00
Diego Prado Gesto	2ebf6e8d51	CURA-5232 Renaming variable since it was on conflict with a new variable ... introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b	2018-04-17 13:07:15 +02:00
Ghostkeeper	d13fa3a6aa	Merge branch '3.3'	2018-04-17 11:40:29 +02:00
Ghostkeeper	4c75d78f26	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-17 11:36:45 +02:00
Diego Prado Gesto	96dcff8ba5	Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3	2018-04-17 11:25:01 +02:00