23175 Commits

Author SHA1 Message Date
Ghostkeeper
168c55ce70
Optimise all OBJ meshes
The resolution of the coordinates in these meshes is now reduced to 1 micron. Any unnecessary trailing zeros are removed. Any unnecessary data is removed (like object name). Any comments are removed. All normals are removed and no longer used by the faces.
This should save 10MB on the download and installation size or so.
2020-04-10 18:01:25 +02:00
Ghostkeeper
96003c1335
Fix unassigned variable 'theme'
Contributes to issue CURA-7357.
2020-04-10 11:53:54 +02:00
Ghostkeeper
2f4a702606
Merge branch '4.6' 2020-04-10 11:25:17 +02:00
Ghostkeeper
9c55ae5ac5
Allow print job actions from 5.2.12
This feature was backported to 5.2 so that UM3 can actually do this as well.
2020-04-10 10:39:18 +02:00
Nino van Hooff
95a8eb6ace Merge remote-tracking branch 'origin/4.6' into 4.6 2020-04-09 17:06:06 +02:00
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
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
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
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
be8f8a308e
Merge branch 'master' of https://github.com/PurpleHullPeas/Cura into PurpleHullPeas-master 2020-04-07 18:07:39 +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
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
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
Ghostkeeper
7be6412ef3
Correct heating up nozzle instead of build plate
Otherwise this print won't work at all. It'll just keep waiting forever until the build plate has reached a temperature that is way out of spec.

Applied at request of MaximeGL in #7280.
2020-04-06 09:19:08 +02:00
Ghostkeeper
de220a74bc
Don't update build volume when prime Z position is changed
It doesn't affect the build volume, since we don't need to move the prime blob disallowed area. It is projected onto the build plate after all.
Most likely this won't affect anyone since the prime Z position is a machine setting that can't normally be modified. But hey, it's a bit more precise anyway.

Found during work on the Settings Guide.
2020-04-06 00:29:48 +02:00
PurpleHullPeas
3cc6b0cb9a
Simplifying mp_mini_delta.def.json
Removing minimum/maximum nozzle size, minimum layer_height, and minimum layer_height_0.
2020-04-04 23:22:17 -05:00
PurpleHullPeas
a1a7d48e46
Merge pull request #1 from Ultimaker/master
Update to master
2020-04-04 22:42:50 -05:00
Remco Burema
60bd676b44
Shader: More use builtin rather than adhoc mix.
part of CURA-7262
2020-04-03 21:24:35 +02:00
Matt Jani
20e58d7d54
Updated "What's New?"change log for 4.6
CURA-7299
4.6-beta
2020-04-03 16:02:00 +02:00
Nino van Hooff
4f55c8d832 Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
2020-04-03 15:31:08 +02:00
Remco Burema
e23b9a94fa
Shader: Use builtin rather than mix ourselves.
part of CURA-7262
2020-04-03 15:07:28 +02:00
Jaime van Kessel
ecd24cb446
Merge branch 'simplify_test_v2' of github.com:Ultimaker/Cura 2020-04-03 13:25:01 +02:00
Kostas Karmas
ef4921b72c Merge branch '4.6' 2020-04-03 13:12:07 +02:00
maht
58d7eea7bb
Update change_log.txt 2020-04-03 12:45:09 +02:00
Nino van Hooff
3e46489b6b
Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects
Cura 7333 fix reloading 3mf files with many objects
2020-04-03 12:41:22 +02:00