23379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt Jani	fd9bd3c123	Updated "What's New?"change log for 4.6 ... CURA-7299	2020-04-03 10:58:57 +02:00
Ghostkeeper	4f50f42796	Merge branch '4.6'	2020-04-02 17:21:03 +02:00
Ghostkeeper	f5669a5a27	Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6	2020-04-02 17:20:45 +02:00
Ghostkeeper	97324be971	Merge branch 'fieldOfView-fix_jogging_layout'	2020-04-02 17:10:01 +02:00
Ghostkeeper	b86b6a9449	Merge branch 'fix_jogging_layout' of https://github.com/fieldOfView/Cura into fieldOfView-fix_jogging_layout	2020-04-02 17:07:42 +02:00
Jaime van Kessel	6df2f84c07	Prevent crash when releasing released lock ... CURA-C2	2020-04-02 16:51:32 +02:00
Jaime van Kessel	c6dfb6e4cf	Set FirmwareUpdater in error state if file is empty ... CURA-6Q	2020-04-02 16:44:18 +02:00
Nino van Hooff	9d9753cb45	Fix: Using onCompleted would break the binding. So Use a Binding instead	2020-04-02 16:31:29 +02:00
Nino van Hooff	6d56b52913	Revert "Fix binding loop in action panel widget" ... Fix improper player slider layout which was introduced in 5cfe71e5	2020-04-02 15:15:05 +02:00
Jaime van Kessel	8ba71fde44	Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura	2020-04-02 14:34:17 +02:00
Tom Hofman	f3927115d6	Infill wipe distance reduced ... Since it was protruding the shell	2020-04-02 09:45:11 +02:00
Kostas Karmas	5bdcc2e5ba	Add type to objects_in_filenames ... CURA-7333	2020-04-01 18:41:04 +02:00
Remco Burema	8d6cbdf673	Fix long materials title causes misalign. ... CURA-7240	2020-04-01 17:57:33 +02:00
Remco Burema	07569c6b88	Fix extra line after plugin/materials list. ... CURA-7240	2020-04-01 17:54:56 +02:00
Ghostkeeper	da2723f81f	Merge branch '4.6'	2020-04-01 17:52:17 +02:00
Kostas Karmas	99a762bcb9	Avoid warning for object in position 0 ... CURA-7333	2020-04-01 17:42:26 +02:00
Ghostkeeper	4edef85346	Code style: Space around binary operators ... Contributes to issue CURA-7240.	2020-04-01 17:35:40 +02:00
Remco Burema	175121e86c	Fix add printer scrollview overlaps buttons. ... CURA-7336	2020-04-01 17:31:23 +02:00
Kostas Karmas	97199d72ad	Reload nodes based on object index ... Refactored the code in order to extract the index of the node inside the file and then use that index to reload the correct object from the file. CURA-7333	2020-04-01 17:08:30 +02:00
Ghostkeeper	869f26a5ba	Fix crash when entering nonsense numbers like '-' ... We shouldn't accept those in the input field at all in my opinion but that is for another time. Fixes Sentry issue CURA-F5.	2020-04-01 16:34:49 +02:00
Ghostkeeper	565ce0f4b9	Forgot to increment setting version in definitions ... Contributes to issue CURA-7282.	2020-04-01 15:51:14 +02:00
Ghostkeeper	8c74429ffc	Halve the defaults in Cura's built-in profile for maximum deviation too ... Apply the version upgrade to these profiles too, essentially. Contributes to issue CURA-7282.	2020-04-01 15:30:04 +02:00
Ghostkeeper	e2e69f6646	Increment setting version to 13 ... Contributes to issue CURA-7282.	2020-04-01 15:14:01 +02:00
Ghostkeeper	2aeca3ef8c	Add version upgrade for 4.6 to 4.7 to halve the maximum deviation ... Contributes to issue CURA-7282.	2020-04-01 15:05:18 +02:00
Ghostkeeper	81df313f3a	Fix documentation for upgrade functions ... There are no settings to rename. That documentation was outdated.	2020-04-01 14:58:30 +02:00
Kostas Karmas	b118a46630	Remove TODO message from 3mf reload function ... CURA-7333	2020-03-31 18:02:13 +02:00
Kostas Karmas	134541ee6e	Fix reloading multiple objects from 3mf file ... CURA-7333	2020-03-31 17:57:23 +02:00
Remco Burema	90ffa2a772	Explain empty installed materials/plugins brackets. ... part of CURA-7240	2020-03-31 16:56:45 +02:00
Jaime van Kessel	c764326c25	Fix marketplace installed plugins/materials empty rectangle ... CURA-7240	2020-03-31 15:57:08 +02:00
Kostas Karmas	07e6cfa693	Merge branch '4.6'	2020-03-31 14:48:26 +02:00
konskarm	cbccb08103	Merge pull request #7370 from Ultimaker/CURA-7328_remove_unused_machine_settings ... Remove unused machine settings	2020-03-31 14:41:41 +02:00
Tim Kuipers	a7acee1123	Merge pull request #7374 from fieldOfView/fix_xray_in_solid_view into my PR ... Remove extraneous preference	2020-03-31 12:09:15 +02:00
Remco Burema	d89fce6240	Order bundled/installed packages/materials section. ... And other finishing touches. part of CURA-7240	2020-03-31 12:02:46 +02:00
fieldOfView	1b3c51d98a	Remove extraneous preference	2020-03-31 11:57:45 +02:00
Remco Burema	85490dc58a	[Marketplace] De-emphasize pre-installed packages. ... Tried to do it the elegant way, couldn't get that to work within timebox. part of CURA-7240	2020-03-31 11:52:55 +02:00
Tim Kuipers	2a1423d7b9	Merge pull request #7373 from fieldOfView/fix_xray_in_solid_view into my PR ... Fix xray in solid view	2020-03-31 11:51:23 +02:00
fieldOfView	ccc0589495	Remove the checkbox option to set the preference to hide the messagebox	2020-03-31 11:50:16 +02:00
Kostas Karmas	189c734145	Changed wrapMode to WordWrap, similar to master ... CURA-7332	2020-03-31 11:41:03 +02:00
fieldOfView	b7898b5a97	Change preference to only hide the xray message, not the visualization	2020-03-31 11:39:05 +02:00
Kostas Karmas	5581705a0f	Revert "Wrap the restart prompt text in Marketplace" ... This reverts commit 2978b09e26b30b3ce007db04fdb8ce05026f35fa.	2020-03-31 11:32:34 +02:00
fieldOfView	a2f9eac23b	Remove unused import	2020-03-31 11:29:34 +02:00
fieldOfView	4638e2b72b	Fix resetting show xray warning	2020-03-31 11:27:25 +02:00
fieldOfView	b2fc155c3b	Fix legacy glsl shaders ... By @smartavionics	2020-03-31 11:26:21 +02:00
Kostas Karmas	2978b09e26	Wrap the restart prompt text in Marketplace ... CURA-7332	2020-03-31 11:24:23 +02:00
Kostas Karmas	6b6446e201	Wrap the restart prompt text in Marketplace ... CURA-7332	2020-03-31 11:22:07 +02:00
Jaime van Kessel	da4bb127df	Add wordWrap to restart required message ... In some languages (and on some operating systems) the text would be cut off by the button	2020-03-31 10:56:03 +02:00
Jaime van Kessel	329c5c5c11	Rename pause duration to disarm timeout and set default to give same behavior as before ... The name wasn't really covering what it was doing. It wasn't setting the duration of the pause, it was setting the timeout for the stepper disarm. Also, ive set the defaults so that the behavior remains the same, unlesss a user explicitly enables this CURA-7331	2020-03-30 17:20:59 +02:00
Jaime van Kessel	4682b9c4ae	Merge branch 'pp-plugin_pause-a-h_disarm' of https://github.com/ilyko96/Cura	2020-03-30 17:12:54 +02:00
konskarm	95cefbe895	Merge pull request #7368 from maukcc/master ... HMS434 update	2020-03-30 15:53:09 +02:00
konskarm	bba6a5cc39	Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder ... CURA-7162/Replace the default logobot.svg with a new placeholder	2020-03-30 15:05:37 +02:00