22028 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	be0e1f7284	Ensure that all updates from settingInheritance are on a timer	2019-11-01 15:14:33 +01:00
Ghostkeeper	1f4c863683	Also assert that the extruder_nr setting matches	2019-11-01 15:08:09 +01:00
Ghostkeeper	d145945b25	Fix mistakes in extruder-definition inter-referencing	2019-11-01 15:02:14 +01:00
Ghostkeeper	069dc6e65d	Add test to see if definition's extruder number matches up ... ...with its machine definition's metadata.	2019-11-01 14:52:41 +01:00
Ghostkeeper	6e6c510dcd	Test extruders for correctness but not for validity ... The validity can't be tested using the built-in validator since that one checks if there are no settings that 'override' non-existing settings. And some of the settings overridden in an extruder are not in the inheritance stack since fdmextruder doesn't inherit from fdmprinter. We'll check though that all settings that are overridden don't override a default_value while there is a value, and whether they don't have IDs.	2019-11-01 14:34:07 +01:00
Ghostkeeper	174b326f57	Also test validity and correctness of extruder definitions ... This makes a few things slightly simpler as well since it now parameterises the tests with the entire path of the definition file so we don't have to reconstruct that in every test.	2019-11-01 14:18:35 +01:00
Ghostkeeper	852da51f65	Fix tests for exact matching on preferred material ... I don't know why the CI system was only complaining about it several commits later. Could be troublesome. Fixes a bug introduced by 1284d9fe8d726e46b556caa8f2f390dc7d65220c.	2019-11-01 13:56:29 +01:00
Nino van Hooff	23843b0944	Merge remote-tracking branch 'origin/master'	2019-11-01 13:55:05 +01:00
Nino van Hooff	315b93a152	Draw the NoIntentIcon over the intent description hover area. ... This fixes a bug where the NoIntent tooltip was hidden by the intent description CURA-6936	2019-11-01 13:54:52 +01:00
Ghostkeeper	2fea780fd2	Merge branch '4.4'	2019-11-01 13:19:34 +01:00
Ghostkeeper	36d4162f35	Fix fallback to global if extruder_nr doesn't exist ... Fixes #6590.	2019-11-01 13:19:16 +01:00
Ghostkeeper	cf2108ec4a	Merge branch '4.4'	2019-11-01 11:55:42 +01:00
Ghostkeeper	eaedca1917	Convert unit of adaptive layers threshold and change name ... This usage is hopefully more intuitive than the previous one.	2019-11-01 11:54:17 +01:00
Nino van Hooff	96bd641d93	Fix: upper/lower handle not losing focus when range handle pressed	2019-11-01 11:06:16 +01:00
Nino van Hooff	94d291a20c	Merge branch 'master' into CURA-6854_align_layer_label_top_bottom ... # Conflicts: # plugins/SimulationView/SimulationViewMainComponent.qml	2019-11-01 10:51:21 +01:00
ChrisTerBeke	b919be48bc	Introduce new API call for fetching package updates	2019-11-01 10:50:02 +01:00
Lipu Fei	71fe01d7f2	Merge remote-tracking branch 'origin/4.4'	2019-11-01 10:42:35 +01:00
ninovanhooff	1cdad60b5b	Merge pull request #5765 from Ultimaker/log_litho ... Logarithmic lithophane thickness	2019-11-01 10:32:39 +01:00
Nino van Hooff	90f580494b	Change default image reader algorithm from logarithmic to linear ... The log curve might have some benefits but is also harder to understand and configure, so let's keep the default at linear. CURA-6540	2019-11-01 10:31:34 +01:00
Kaz	2818a24516	Update Makeblock mCreate define files name	2019-11-01 11:40:39 +08:00
Remco Burema	aca7f4551e	Make verified material containers read-only, even for variants. ... part CURA-6856	2019-10-31 19:01:23 +01:00
Remco Burema	5908ff60ee	Move verification check from plugin to the import of containers. ... part of CURA-6856	2019-10-31 18:50:24 +01:00
THeijmans	05b1ce9658	Removes 0.2mm layer height visual intent profiles	2019-10-31 17:06:05 +01:00
WalshJames	b388246659	Add files via upload	2019-10-31 15:15:50 +01:00
WalshJames	5c3167be07	Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg	2019-10-31 15:15:30 +01:00
Jaime van Kessel	1af1a8ddcb	Rename "smooth" intent to draft ... CURA-6890	2019-10-31 13:26:49 +01:00
Jaime van Kessel	355ebd4e71	Remove override for prime tower position ... The formula in the fdmprinter definition does it's job, so no need to change it! CURA-6943	2019-10-31 13:20:35 +01:00
Jaime van Kessel	9dccbcdd8e	Merge branch 'CURA-6874_path_slider_layout' of github.com:Ultimaker/Cura	2019-10-31 13:15:01 +01:00
Jaime van Kessel	33a748b800	Merge branch '4.4' of github.com:Ultimaker/Cura	2019-10-31 13:14:25 +01:00
Jaime van Kessel	f679b557dc	Add visual quality to model to be translatable ... CURA-6942	2019-10-31 11:54:06 +01:00
THeijmans	ce31e9cffe	Adds visual intents ... and create subdirectories per printer. As discussed 31-10-2019.	2019-10-31 11:48:40 +01:00
Jaime van Kessel	1dcc93586c	Merge branch 'CURA-6934_caligraphy' of github.com:Ultimaker/Cura	2019-10-31 11:37:32 +01:00
Kaz	6a028ac6ec	Update makeblock.def.json ... update start gcode and end gcode	2019-10-31 17:32:32 +08:00
Ghostkeeper	60d59148e8	Fix typo in the R ... Contributes to issue CURA-6934.	2019-10-30 14:05:35 +01:00
Ghostkeeper	d8e1402b68	Make logo larger ... Seems to be more towards what the rest of the products show. Contributes to issue CURA-6934.	2019-10-30 13:50:42 +01:00
Ghostkeeper	d3809f8830	Replace logo in the top left corner ... This aligns it with the other Ultimaker products. Sorry, overruled by higher up. Corporate things. Contributes to issue CURA-6934.	2019-10-30 13:42:33 +01:00
Jaime van Kessel	1284d9fe8d	Fix setting prefered material on machine creation ... The previous check would occasionaly set duplicated materials	2019-10-30 11:27:46 +01:00
skriDude	fe86bc1bc2	updated machine_start_gcode	2019-10-30 11:18:22 +01:00
Nino van Hooff	d63499fb24	Remove redundant visibility properties from Items ... CURA-6874	2019-10-30 10:57:03 +01:00
Nino van Hooff	958a922808	Cleanup debugging things for cura-6874 ... CURA-6874	2019-10-30 10:54:22 +01:00
ninovanhooff	cc221f6295	Merge pull request #6581 from Ultimaker/CURA-6557_options_to_exclude_plugins ... CURA-6557 Add CMake options to exclude plugins for installation	2019-10-30 10:39:33 +01:00
THeijmans	7cd4158ac1	Adds Ultimaker S3 intent profiles ... As discussed 29-10-2019.	2019-10-30 09:09:17 +01:00
Remco Burema	298eb27c7f	Add possibility to check material-profiles. ... Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow. part of CURA-6856	2019-10-29 17:45:19 +01:00
Nino van Hooff	888c3f51a5	Show both handle labels instead of the range label ... Now that the labels are horizontally centered with the handles, the range label would overlap the bottom handle. So instead, delete the range handle and show both other handles instead. CURA-6854	2019-10-29 14:11:09 +01:00
Nino van Hooff	3db5abbd3a	Move layer slider range handle label to below the vertical center ... CURA-6854	2019-10-29 13:39:52 +01:00
Nino van Hooff	ba766c3a19	Move lower layer slider handle label to the bottom ... CURA-6854	2019-10-29 13:23:43 +01:00
Nino van Hooff	e152529b5e	Increase layer slider margins to accomodate labels ... CURA-6854	2019-10-29 13:03:53 +01:00
Nino van Hooff	5ebdae9f1a	Move upper layer slider handle label to the top ... CURA-6854	2019-10-29 11:47:39 +01:00
Lipu Fei	7b9ababc11	Use Doxygen-style docs ... CURA-6557	2019-10-29 11:14:51 +01:00
Ghostkeeper	18167c7a71	Fix prime position of right extruder	2019-10-29 11:03:11 +01:00