23772 Commits

Author SHA1 Message Date
Nino van Hooff
92d605f022 Update wording for authorization server error message
CURA-7346

(cherry picked from commit ea00ff3c4742d7c9f7f9574f72e24e3255641ef6)
2020-04-09 17:05:26 +02:00
Jaime van Kessel
cf6ad0736a Gracefully handle binding erorr for local OAUTH2 Server
CURA-7346

(cherry picked from commit 849e012756595e266be66d60c32beebbbe61beac)
2020-04-09 17:05:19 +02:00
Nino van Hooff
ea00ff3c47 Update wording for authorization server error message
CURA-7346
2020-04-09 16:59:43 +02:00
Jaime van Kessel
d1337c9e22
Prevent printer from being added twice if it's in cloud and local
CURA-7055
2020-04-09 16:39:47 +02:00
Ghostkeeper
1047cdd76c
Catch OSError when actually writing the UFP stream
This includes getting an error message when we don't have write access any more or when the file was deleted or connection lost while we were writing to it.

Fixes Sentry issue CURA-GX.
2020-04-09 14:55:14 +02:00
Ghostkeeper
54b6c2a54e
Merge branch '4.6' 2020-04-09 12:55:50 +02:00
Ghostkeeper
953630ad0b
Be robust against some objects not having an extruder assigned
This could happen for instance when a plug-in adds a model.

Fixes Sentry issue CURA-GR.
2020-04-09 12:55:07 +02:00
skriDude
53c7bfff1d
Update in print quality 2020-04-09 12:36:21 +02:00
Ghostkeeper
c79d7d89b3
Merge branch '4.6' 2020-04-09 11:29:27 +02:00
Ghostkeeper
d5166030d7
Don't detect retractions if E is almost equal, but rounding errors
Contributes to issue CURA-7351.
2020-04-09 11:27:40 +02:00
Ghostkeeper
9b997d421b
Keep current_e updated even if not finding retractions
Otherwise the new E is never going to be lower than the current E. I don't know how this ever worked then.

Contributes to issue CURA-7351.
2020-04-09 11:22:05 +02:00
Ghostkeeper
d9649dc3dd
Reduce indentation and complexity by using a pre-check
Contributes to issue CURA-7351.
2020-04-09 11:03:10 +02:00
fieldOfView
d1c79a3af2 Mark models that are outside the buildarea in the objectlist 2020-04-09 10:53:43 +02:00
Ghostkeeper
40cb3e37a9
Also actually update global stacks for Deltacomb
Really hope that this works.
2020-04-09 01:48:15 +02:00
Ghostkeeper
18ebdfafb7
Upgrade other per-extruder instance containers too
Global instance containers will also go through this function but won't get picked out by the if statement here.
2020-04-09 01:23:11 +02:00
Ghostkeeper
2410d05100
Upgrade extruder stacks
Stupid stuff. All of these containers need to be copied. It's not possible to work this out for all materials properly, since we can't read into these materials what their GUIDs and material types are.
2020-04-09 01:04:53 +02:00
Jaime van Kessel
cfc2cc3692
Fix crash when printer definition could not be found 2020-04-08 17:14:58 +02:00
Jaime van Kessel
7a11a183a8
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-08 17:02:26 +02:00
Jaime van Kessel
caa348265d
Add check to prevent unknown materials from being active
This should really resolve the key error for anycubics
2020-04-08 17:00:11 +02:00
Jaime van Kessel
e21262f0b3
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-08 16:33:20 +02:00
Jaime van Kessel
f8326d2a6e
Fix setting of sentry_env for betas 2020-04-08 16:32:47 +02:00
Nino van Hooff
74253e420a
Merge pull request #7441 from Ultimaker/xray_in_solid_sidequest
CURA-7262 X-Ray in solid-view (colors instead)
2020-04-08 15:45:00 +02:00
Ghostkeeper
a2a77804cb
Correct Spanish translation
It's not the temperature of the print layer. It's the temperature of the build plate.

Fixes #7422.
2020-04-08 15:28:51 +02:00
Jaime van Kessel
849e012756
Gracefully handle binding erorr for local OAUTH2 Server
CURA-7346
2020-04-08 13:08:12 +02:00
Nino van Hooff
e43768ebde Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects""
This reverts commit 4f55c8d8
2020-04-08 11:06:31 +02:00
Ghostkeeper
a5b4b15ae4
Add theoretical upgrade for definition changes
It's a LOT more work than I thought, because the new printer has 4 extruders instead of 2. That means that files have to be copied for the other two extruders. A big hassle.
2020-04-08 01:58:03 +02:00
Ghostkeeper
69b1c1fe74
Upgrade Deltacomb profiles to setting version 13
This would halve the maximum resolution setting, but they don't override that setting so there is no actual change to these profiles.
2020-04-07 23:55:31 +02:00
Ghostkeeper
309d3fc56f
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master
Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
2020-04-07 23:40:10 +02:00
Ghostkeeper
be8f8a308e
Merge branch 'master' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-master 2020-04-07 18:07:39 +02:00
Jaime van Kessel
33b3bb77c3
Fix typing
List wasn't added, so mypy borked. CURA-7055
2020-04-07 16:58:08 +02:00
Nino van Hooff
ff017e6a52 Remove unnecessary call to remove printer from qt model
Since cloud printers are not added to that model anymore

CURA-7055
2020-04-07 14:44:24 +02:00
Nino van Hooff
99b4b86052 Display max 3 printer names in the printer discover message
CURA-7055
2020-04-07 14:43:26 +02:00
Nino van Hooff
22a06fca3b Shorten new cloud printers message
So the plural form also fits on one line

CURA-7055
2020-04-07 13:50:24 +02:00
Ghostkeeper
3d399672d0
Select default extruder if a setting has an extruder nr that's not available
Fixes Sentry issue CURA-G2.
2020-04-07 13:45:41 +02:00
Ghostkeeper
ea31d9d41b
Don't crash on moving empty groups down to build plate
Empty groups don't have a bounding box. I don't know how an empty group could've gotten there but maybe there is something happening with a plug-in or something.

Fixes Sentry issue CURA-FM.
2020-04-07 13:16:48 +02:00
Remco Burema
b7e6b2888a
Actually remove xray error image (because colors).
part of CURA-7262
2020-04-07 12:57:07 +02:00
Remco Burema
5494a09eef
Make sure warning works for greyscale colors.
part of CURA-7262
2020-04-07 12:46:32 +02:00
Remco Burema
b59d38e6c9
Replace warning image with triadic colors.
part of CURA-7262
2020-04-07 12:06:13 +02:00
Nino van Hooff
0ec3e0972b Add an image to the cloud printer sync message
CURA-7055
2020-04-06 18:01:57 +02:00
Ghostkeeper
fc8cc3187d
Merge branch '4.6' 2020-04-06 17:20:34 +02:00
Ghostkeeper
95b5a176b8
Update translation file headers for Cura 4.6
Contributes to issue CURA-7344.
2020-04-06 17:19:59 +02:00
Ghostkeeper
e676308241
Update translation files with new strings in Cura 4.6
Contributes to issue CURA-7344.
2020-04-06 16:52:06 +02:00
Ghostkeeper
859adbf347
Update translation templates for Cura 4.6
These are the new translations for the next release of Cura. I generated them from my computer at home now, so all of the paths have changed... But they are just indications anyway.
2020-04-06 16:48:13 +02:00
Nino van Hooff
b141bb139e Update documentation of _connectToActiveMachine
CURA-7055
2020-04-06 15:04:39 +02:00
Nino van Hooff
52ef794c4d Add a Message informing users of progress on cloud syncing printers.
CURA-7055
2020-04-06 14:49:45 +02:00
Nino van Hooff
a80a5f36ff Add a Message informing users of progress on cloud syncing printers.
CURA-7055
2020-04-06 13:44:48 +02:00
Jaime van Kessel
02202328d8
Add Versionupgrader to bundled plugin list 2020-04-06 11:20:44 +02:00
Jaime van Kessel
82fa1823cc
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-04-06 11:11:43 +02:00
Jaime van Kessel
ddc826af44
Add VersionUpgrade45 package to bundled list 2020-04-06 11:06:26 +02:00
Ghostkeeper
01ec607d40
Merge branch '4.6'
Conflicts:
	resources/texts/change_log.txt: Both modified but had different wording for the pause-at-height bugfix with motor timeout. I used the wording in 4.6 since it was more extensive.
2020-04-06 09:20:18 +02:00