8188 Commits

Author SHA1 Message Date
Jaime van Kessel
c83c6b0068 Merge branch 'CURA-8510_version_upgrade' of github.com:Ultimaker/Cura 2021-09-28 10:31:56 +02:00
Jaime van Kessel
f3e2e7f6ac Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura 2021-09-27 14:43:07 +02:00
Jaime van Kessel
20b76c12a7 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-8510_version_upgrade 2021-09-27 10:20:50 +02:00
Ghostkeeper
ef568ce622
Only get quality-changes fields for quality-changes profiles
And make the upgrade more robust against weird input, too.

Contributes to issue CURA-8510.
2021-09-24 16:32:38 +02:00
Jaime van Kessel
fa3f3efbec
Merge pull request #10289 from fieldOfView/feature_material_type_name_patterns
Add {material_type}, {material_name}, {material_id} and {material_brand} as replacement patterns

CURA-8598
2021-09-24 16:17:12 +02:00
Ghostkeeper
413913a5a8
Modernise logging
Hopefully this prevents issues like Sentry issue CURA-2WB.
2021-09-24 15:00:03 +02:00
Ghostkeeper
026c4062ce
Add logging for when the user encounters errors in setting values
We want to be able to see this from the log file, to help debug issues.

Done to help with cases like #10475.
2021-09-24 14:08:55 +02:00
Ghostkeeper
0bcd5eba48
Add print_temperature to print temperature settings
This way it is recognised as a command to set the printing temperature, and will prevent Cura from putting its own temperature commands in.

Fixes issue reported here: https://www.reddit.com/r/Cura/comments/pu98kc/stop_initial_hotend_heatup/
2021-09-24 13:09:37 +02:00
Konstantinos Karmas
ad6a8d828e Merge branch 'master' into CURA-8510_version_upgrade 2021-09-23 17:01:00 +02:00
Konstantinos Karmas
b322edfa53 Update the flsun quality_changes profiles during version upgrade
So that they are also mapped from the global qualities to the flsun_sr-specific ones. This way they will be able to still be used in the newer Cura versions.

CURA-8510
2021-09-23 16:21:46 +02:00
Ghostkeeper
426e3064d2
Don't crash when material file can't be opened for sending to printer
It seems that due to the threaded nature, the limit to the number of open file handlers could be reached here. Or it could just be locked or something of course.

Fixes Sentry issue CURA-2V2.
2021-09-22 14:59:27 +02:00
Ghostkeeper
0a080a1def
Increase SDK version to 7.8.0
We need to check for this new version because of the new functionality needed by the Digital Library plug-in.

Contributes to issue CURA-8566.
2021-09-17 15:15:25 +02:00
Barnaby Gray
59c8858559 FilamentChange: Fix unload on marlin based printers
See related #10038. This fixes the issue by referencing the gcode flavor set for the machine.
2021-09-16 07:14:52 +01:00
Konstantinos Karmas
3e143a012a Change the setting version to 19
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
2021-09-15 16:25:04 +02:00
Konstantinos Karmas
87add2c8de Revert "Revert "Use optional last output (file) name from output-dev to set project name.""
This reverts commit 24ff3692bd5b73828a1c5a58cdd55400cdddad9c.
2021-09-15 12:26:18 +02:00
Ghostkeeper
7521e174b0
Add version upgrade for Cura 4.12
Yep, there's gonna be a 4.12.

Contributes to issue CURA-8510.
2021-09-14 16:23:38 +02:00
Konstantinos Karmas
4e89ee0ccc Check against the correct SDK version
Since the `self.setLastOutputName` is available in 4.12 (SDK 7.8.0) onwards.

CURA-8566
2021-09-14 16:05:04 +02:00
Jaime van Kessel
c593f62271 Only set the lastOutputName if the SDK is high enough
This ensures that the DF plugin is backwards compatible

CURA-8358
2021-09-14 14:43:10 +02:00
Ghostkeeper
8ed2e7bd44
Increment version number of Digital Library plug-in to 1.1
Contributes to issue CURA-8551.
2021-09-10 16:49:14 +02:00
Ghostkeeper
24ff3692bd
Revert "Use optional last output (file) name from output-dev to set project name."
This reverts commit c2c53d51c1954315324982bd916b8aad5c19946d.
2021-09-10 16:46:53 +02:00
Ghostkeeper
9e2b556ce8
Revert "Only change project name when saving to project files."
This reverts commit b97920e5b155caaab6a8b3bb167853a00ae4b604.
2021-09-10 16:46:39 +02:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Ghostkeeper
30b8293c51
Merge branch '4.11' 2021-09-07 14:28:52 +02:00
Ghostkeeper
534e119e72
Fix translations of log-in page and sync message
The French and Italian translations didn't have proper newlines there.
The message for the sync progress wasn't translated because it didn't properly get the catalog.

Contributes to issue CURA-8472.
2021-09-07 14:26:43 +02:00
Jaime van Kessel
3caee3f143
Merge pull request #10328 from Ultimaker/CURA-8358_Retain_last_saved_filename
Retain the last saved filename after saving a file
2021-09-02 09:54:35 +02:00
Remco Burema
b97920e5b1
Only change project name when saving to project files.
CURA-8358
2021-09-01 18:11:10 +02:00
Remco Burema
c2c53d51c1
Use optional last output (file) name from output-dev to set project name.
Instead of relying on the filename emitted when the workspace is changed. This is done so the user can also change the project name when saving to an output device, such as a local file, or the digital library, that supports changeing the (file)name.

CURA-8358
2021-09-01 16:04:05 +02:00
Ghostkeeper
15fcad454d
Merge branch '4.11' 2021-08-31 13:35:58 +02:00
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
Ghostkeeper
d08d5d6625
Merge branch '4.11' 2021-08-31 12:07:42 +02:00
Ghostkeeper
9ea025885a
Update links to network troubleshooting page
The new links also have campaign identifiers. Because apparently the website doesn't read the HTTP metadata information saying that it redirected from Cura, and it adds information which button it came from.
The old links will remain working via redirects, for older Cura versions.

Contributes to issue CURA-8528.
2021-08-31 12:07:11 +02:00
Konstantinos Karmas
b3af6f3ec5
Merge pull request #10366 from Ultimaker/CURA-8214_use_new_controlstyle_for_cluster_printer_selecter
Fix greyed out cluster printers
2021-08-31 09:45:33 +02:00
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
2021-08-30 13:41:55 +02:00
Konstantinos Karmas
9504ee60d4
Merge pull request #10358 from Ultimaker/CURA-8521_Add_missing_preference_vesion_upgrade
Add the missing preference upgrade for 4.9 to 4.10
2021-08-30 13:17:08 +02:00
Jaime van Kessel
b2c6063b61 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:11:21 +02:00
Jaime van Kessel
43fd38e48e Add missing return
This caused the slicing to not be correctly aborted when the primetower was
in the wrong location

CURA-8499
2021-08-30 13:10:10 +02:00
Jaime van Kessel
f12f1ea438 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:04:48 +02:00
Jaime van Kessel
183fbfad41 Disable save to DF if the textfield is in an invalid state
CURA-8502
2021-08-30 11:09:55 +02:00
Jaime van Kessel
9bdeb82314 Add the missing preference upgrade for 4.9 to 4.10
This could break backups in certain cases

CURA-8521
2021-08-30 10:51:27 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
2021-08-30 10:45:45 +02:00
Jaime van Kessel
6feaecc450 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 17:10:09 +02:00
Jaime van Kessel
88b5c4c8be Merge branch 'CURA-8497_Image_spacing_is_misaligned_in_messages' of github.com:Ultimaker/Cura into 4.11 2021-08-25 16:57:50 +02:00
Konstantinos Karmas
bbada73550 Remove outdated image from "new printers added" message
CURA-8497
2021-08-25 15:32:42 +02:00
Jaime van Kessel
deab3fd32b Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 13:01:27 +02:00
Konstantinos Karmas
99f8c85065 Style the "no plugin/material installed" texts in the installed tab
The default black text color was invisible in the dark theme.
2021-08-24 13:33:05 +02:00
Konstantinos Karmas
d24d520db0 Change background of Premium plugins and materials
Or else the link "Search materials" in the materials tab was very hard to see.

CURA-8380
2021-08-24 13:32:25 +02:00
fieldOfView
2238234741 Add id & brand and don't send material properties to CuraEngine 2021-08-24 09:57:30 +02:00
Ghostkeeper
6b5ea9086f
Fix spelling in documentation
Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess.
2021-08-23 14:40:57 +02:00