Jaime van Kessel
2da965e46e
Merge branch 'CURA-7147_preview_img_for_cloud' of github.com:Ultimaker/Cura into 4.6
2020-04-16 15:11:20 +02:00
Nino van Hooff
073a7fdce6
Revert "Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects""
...
This reverts commit 4f55c8d8. Since there was a merge conflict, this commit will be left empty.
2020-04-16 14:49:33 +02:00
Jaime van Kessel
ab62ac6e01
Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6
2020-04-16 13:17:40 +02:00
Jaime van Kessel
14f9228a1d
Merge branch '4.6' of github.com:Ultimaker/Cura into 4.6
2020-04-16 13:17:30 +02:00
Remco Burema
ac5213d232
Fix typing.
...
part of CURA-7147
2020-04-16 12:59:36 +02:00
Remco Burema
006822334c
Fetch preview image from cloud for monitor page.
...
part of CURA-7147
2020-04-16 12:18:49 +02:00
Ghostkeeper
9f38374960
Also track Z coordinates and retract extra for the distance travelled then
...
Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way.
Fixes #7458 .
2020-04-15 18:37:13 +02:00
Ghostkeeper
0ec020c963
Update Czech translations for Cura 4.6
...
These have been mailed to me by DenyCZ.
Contributes to issue CURA-7344.
2020-04-15 18:26:58 +02:00
Ghostkeeper
972b2e852f
Merge branch '4.6' of https://github.com/Patola/Cura into Patola-4.6
2020-04-15 18:12:49 +02:00
Ghostkeeper
47073268f9
Corrections to translations
...
These were some things that were found by automatic checks in PoEdit.
Contributes to issue CURA-7344.
2020-04-15 18:06:30 +02:00
Ghostkeeper
1cef21919e
Fix missing plural forms
...
The import script doesn't parse these correctly yet. Keep finding them now.
Some of the plural forms were incorrect. They were like that last time as well. Lionbridge isn't translating them correctly, but it's the fault of a very annoying interface in Smartling. I was able to fix all of them decently except Russian, so Russian will have to make do with just plural everywhere.
Contributes to issue CURA-7344.
2020-04-15 18:06:10 +02:00
Ghostkeeper
7b3482fcd8
Update translations from Lionbridge for Cura 4.6
...
These are the new translations we got. I didn't make any corrections yet, but I did already see some mistakes in the Chinese ones.
Contributes to issue CURA-7344.
2020-04-15 18:06:07 +02:00
Nino van Hooff
db758a7e19
Add None-checks to CloudPackageChecker
...
Might help prevent the sync message to show multiple times
CURA-7364
2020-04-15 17:16:38 +02:00
Jaime van Kessel
7d312f2f24
Merge branch 'master' of github.com:Ultimaker/Cura
2020-04-15 12:25:19 +02:00
Jaime van Kessel
d49cca3b8b
Add warning for when libsavitar is not up to date
2020-04-15 12:25:00 +02:00
Ghostkeeper
4050d3ccde
Prevent crash when a setting is not in any setting category
...
I don't know what exactly caused this since it's impossible to trace. But the crash happened with a setting called 'dual_gcode' which currently doesn't exist in Cura. So I think it must be some plug-in that adds it. In any case, it's good to be defensive about this sort of thing. Good type checking would've caught this for us.
Fixes Sentry issue CURA-JB.
2020-04-14 21:06:10 +02:00
Kostas Karmas
ea2eb2ce41
Merge branch '4.6'
2020-04-14 18:14:39 +02:00
konskarm
6241ca736e
Merge pull request #7498 from Ultimaker/CURA-7343_network_troubleshooting_link
...
CURA-7343_network_troubleshooting_link
2020-04-14 18:12:22 +02:00
Ghostkeeper
601c21cf2f
Merge branch '4.6'
2020-04-14 17:59:48 +02:00
Ghostkeeper
3dbd154492
Fix calculation of infill wipe distance starting from infill location
...
Subtract the thickness of the walls from this setting. This most likely ends up negative and thus not counting because it's maxed with something that starts at 0.
I've also simplified this algorithm a bit. Easier to follow if you ask me.
Done as a 5 minute fix.
2020-04-14 17:59:33 +02:00
Ghostkeeper
f6479840f6
Fix calculation of infill wipe distance starting from infill location
...
Subtract the thickness of the walls from this setting. This most likely ends up negative and thus not counting because it's maxed with something that starts at 0.
I've also simplified this algorithm a bit. Easier to follow if you ask me.
Done as a 5 minute fix.
2020-04-14 17:59:00 +02:00
Nino van Hooff
214e41f983
Use a more specific link for the network troubleshooting guide
...
CURA-7434
2020-04-14 16:55:36 +02:00
Ghostkeeper
0e30f0bb6b
Merge branch 'master' of github.com:Ultimaker/Cura
2020-04-14 14:20:17 +02:00
Ghostkeeper
ec31d7a673
Merge branch '4.6' of https://github.com/kazooless/Cura into kazooless-4.6
2020-04-14 14:18:16 +02:00
Jaime van Kessel
52f01a71c3
Use base_file to check if a material is known
...
Fixes #7490
2020-04-14 11:18:40 +02:00
Jaime van Kessel
8269ae9501
Use base_file to check if a material is known
...
Fixes #7490
2020-04-14 09:49:34 +02:00
Cláudio 'Patola' Sampaio
df82beaff1
Updated pt_BR translations for Cura 4.6.
2020-04-13 05:08:53 +02:00
kazooless
1c315baee4
Add Ender-3 Pro without clip boundaries for magnetic bed
2020-04-10 12:19:19 -07:00
Jaime van Kessel
d0901c91f7
Update some documentation to the new style
2020-04-10 14:05:17 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports
2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables
2020-04-10 13:46:19 +02:00
Jaime van Kessel
6a6ad6e815
Remove unneeded semicolons
2020-04-10 13:34:57 +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
