12754 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Diego Prado Gesto	e38cf957bb	CURA-4839 Avoid creating unique names for the extruder instance ... containers if the strategy is upgrade existing	2018-01-24 16:04:11 +01:00
ChrisTerBeke	9af3a5faa6	Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2	2018-01-24 14:02:54 +01:00
ChrisTerBeke	d1f2d6f45d	Fix checking material_used per extruder for analytics - CURA-4858	2018-01-24 14:02:44 +01:00
Ghostkeeper	3f7eaaae94	Move HTML tags out of translated text ... We always want the same HTML tag around it. There's no need to allow the translator to change that. Discovered during issue CURA-4692.	2018-01-24 13:52:31 +01:00
Ghostkeeper	d6182c8c49	Fix extra space in translation ... The only mistake I found, really. Contributes to issue CURA-4692.	2018-01-24 13:52:31 +01:00
Ghostkeeper	5b90bb3c5a	Update Portuguese translations by Utópica3D ... These people did a pass on the Portuguese translations and made a lot of improvements. Contributes to issue CURA-4692.	2018-01-24 13:52:31 +01:00
ChrisTerBeke	c471991044	Update plugin browser version to 4 as network rewrite has another set of breaking changes	2018-01-24 13:30:08 +01:00
ChrisTerBeke	b41d8eb0dd	Merge branch '3.2'	2018-01-24 13:29:30 +01:00
ChrisTerBeke	9488c39f68	Update plugin browser version as we have breaking changes in Cura 3.2	2018-01-24 11:07:13 +01:00
Lipu Fei	a6f5f8ea68	Revert "Revert "Rename Enable Travel Optimization to Infill Travel Optimization"" ... This reverts commit 3ec4cc6a0b.	2018-01-23 20:37:24 +01:00
Ghostkeeper	2f61c4436f	Merge branch 'master' of https://github.com/pouncingiguana/Cura into pouncingiguana-master	2018-01-23 16:37:43 +01:00
Ian Paschal	dcb1ac5deb	Plugin browswer updates ... - Partial refactor - Preparation for merge with plugins in preferences	2018-01-23 16:20:19 +01:00
Jack Ha	994969634e	Merge branch '3.2'	2018-01-23 16:17:50 +01:00
Jack Ha	def86defe6	CURA-4848 Global stack now does its infinite resolve prevention on per thread basis	2018-01-23 16:17:38 +01:00
Ghostkeeper	f88df7e5cd	Remove overzealous log entry ... This was in the happy path and gets executed for every material profile in every material file, which is hundreds of times. Better not. Found during development of CURA-4797.	2018-01-23 15:45:12 +01:00
Jack Ha	cde3799702	CURA-4848 removing the debugging list because it's not a threading issue	2018-01-23 14:46:44 +01:00
Jack Ha	b0d0b75662	Merge branch '3.2'	2018-01-23 14:25:11 +01:00
Jack Ha	e561217415	Merge branch 'master' of github.com:Ultimaker/Cura	2018-01-23 14:25:05 +01:00
Jack Ha	e3bffb0b1d	Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2	2018-01-23 14:24:07 +01:00
Jack Ha	07e6875199	CURA-4848 added logging for when the crash occurs	2018-01-23 14:24:00 +01:00
Lipu Fei	710e3c1629	Revert "Simplify check for _outside_buildarea" ... This reverts commit 5c8d46b5c2.	2018-01-23 12:39:15 +01:00
Lipu Fei	f45de9654b	Revert "Remove unused import" ... This reverts commit cf556ccf8f.	2018-01-23 12:39:07 +01:00
Lipu Fei	d3e85e6370	Revert "Do boundary checks on nodes for which the boundary check is unknown" ... This reverts commit 27e441ecd9.	2018-01-23 12:38:59 +01:00
Lipu Fei	3ec4cc6a0b	Revert "Rename Enable Travel Optimization to Infill Travel Optimization" ... This reverts commit a31d65786b.	2018-01-23 12:38:51 +01:00
Diego Prado Gesto	7a84712fc9	CURA-4854 Revert some changes in 619a8cc that make that issue not working	2018-01-23 12:13:26 +01:00
Jack Ha	1efc92ddbe	CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug	2018-01-23 11:46:59 +01:00
Ghostkeeper	f5e40c2281	Merge branch '3.2' ... Contributes to issue CURA-4797.	2018-01-23 11:27:17 +01:00
Ghostkeeper	a31d65786b	Rename Enable Travel Optimization to Infill Travel Optimization ... Because it's now no longer in the Infill category this is unclear.	2018-01-23 11:24:43 +01:00
Aleksei S	54dc63a596	Add missing changes ... CURA-3710	2018-01-23 11:24:27 +01:00
Ghostkeeper	27e441ecd9	Do boundary checks on nodes for which the boundary check is unknown ... Just before deciding whether to drop down the node on the build plate. Contributes to issue CURA-4797.	2018-01-23 11:22:24 +01:00
Ghostkeeper	cf556ccf8f	Remove unused import ... Contributes to issue CURA-4797.	2018-01-23 11:22:24 +01:00
Ghostkeeper	5c8d46b5c2	Simplify check for _outside_buildarea ... There is a getter function that has a default if the attribute doesn't exist. Contributes to issue CURA-4797.	2018-01-23 11:22:24 +01:00
Lipu Fei	b14fdb1d0d	Merge remote-tracking branch 'origin/3.2'	2018-01-23 11:20:49 +01:00
Aleksei S	8fe6e82459	Added Setting visibility preset ... CURA-3710	2018-01-23 11:14:57 +01:00
Lipu Fei	1c605a5108	Fix different strategies for machine and quality in project loading ... CURA-4839	2018-01-23 10:58:43 +01:00
Lipu Fei	c0bce6ffd4	Move Jenkins timeout into parallel_nodes block	2018-01-23 10:26:39 +01:00
ChrisTerBeke	53d097b138	Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2	2018-01-23 09:49:33 +01:00
ChrisTerBeke	6c9d7b5a2e	Fixes for resetting print time information when removing all or last model, reduce signals being used for print time resetting - CURA-4852	2018-01-23 09:49:26 +01:00
Jack Ha	92e99012d3	CURA-4785 now actually checking for extruder position, improved logs	2018-01-23 09:33:52 +01:00
Jack Ha	dc119d74bd	CURA-4785 added logging for measuring time for validation check	2018-01-23 09:21:38 +01:00
Lipu Fei	3fb9877a30	Add call_on_qt_thread to fix project loading crashing on rendering ... CURA-4839 See comments...	2018-01-22 17:22:27 +01:00
ChrisTerBeke	2eef282b40	Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2	2018-01-22 17:18:19 +01:00
ChrisTerBeke	129f9cc16c	Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835	2018-01-22 17:18:09 +01:00
Jack Ha	46c154ef98	Merge branch '3.2'	2018-01-22 16:18:09 +01:00
Jack Ha	956b793b6b	Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2	2018-01-22 16:17:44 +01:00
Jack Ha	204af1b6ed	CURA-4785 fix slow cura for Custom FDM printer: now it's not checking for errors in unused extruders	2018-01-22 16:17:37 +01:00
Diego Prado Gesto	d8ae78d80c	CURA-4821 Select the groups to be deleted also when clearing the scene	2018-01-22 16:12:11 +01:00
ChrisTerBeke	e17fbb0db2	Remove copying 1st extruder value to all extruders as that breaks re-loading from files	2018-01-22 16:05:43 +01:00
Jaime van Kessel	1f8d7dfacb	Merge branch 'master' of github.com:Ultimaker/Cura	2018-01-22 15:48:07 +01:00
Jaime van Kessel	dcfab2f923	Failed state in printjobs is now handled correctly	2018-01-22 15:47:37 +01:00