25773 Commits

Author SHA1 Message Date
Ghostkeeper
a3f7c5f098
Merge branch 'PETG_updates_410' into 4.10 2021-06-25 14:16:05 +02:00
Konstantinos Karmas
04b56c47c4 Merge branch '4.10_translation' of https://github.com/Ultimaker/Cura into 4.10_translation 2021-06-25 14:11:03 +02:00
Konstantinos Karmas
61a6442c71 Add Chinese simplified 4.10 translations
CURA-8310
2021-06-25 14:10:47 +02:00
Jelle Spijker
9406d454d4
Merge pull request #10003 from Patola/4.10
Updated pt_BR strings for Cura 4.10.
2021-06-25 14:06:07 +02:00
Remco Burema
ca2ecfbc6e
Merge pull request #10020 from Ultimaker/CURA-8331_superfluous_g92_pause_at_height
Only add G92 for Griffin if redoing layer in Pause At Height
2021-06-25 14:04:25 +02:00
Konstantinos Karmas
102e66cf50 Remove empty plurals from 4.10 translations 2021-06-25 13:42:27 +02:00
StijnArntz
e25ca09bec PETG_updates_410
Changed max combing distance for UMS3, UMS5, UM2C and UM3 to reduce stringing. Fixed distance of 8 mm.
2021-06-25 13:31:18 +02:00
Konstantinos Karmas
b1e79f79d4 Add lionbridge translations for 4.10
* de_DE
* es_ED
* fr_FR
* it_IT
* ja_JP
* ko_KR
* nl_NL
* pt_PT
* ru_RU
* tr_TR
* zh_CN
2021-06-25 13:22:26 +02:00
Jaime van Kessel
1cece590d7
Remove unneeded qml imports
Found these while looking at what would be needed to upgrade to qt 6.x
This module is dropped, hence me going over all of the cases where it's used.
2021-06-25 12:37:05 +02:00
Konstantinos Karmas
d35f018729 Prevent exception being logged if no backups window was created
CURA-8313
2021-06-25 09:52:48 +02:00
Konstantinos Karmas
2e694ff834
Merge pull request #9866 from oducceu/master
Fix Power-loss Recovery and update G-codes for Flying Bear Base
2021-06-25 09:47:36 +02:00
Konstantinos Karmas
4435a10f9d Revert "Show warning when restoring backup failed"
We decided to add the warning message in a separate ticket for 4.11.

This reverts commit 584a387debec75023094db6cba84a8bf1781d6ea.
2021-06-25 09:22:12 +02:00
Jelle Spijker
9a27a63b7e
Merge pull request #10031 from Ultimaker/CURA-8313_Fail_gracefully_when_a_file_is_in_use_while_restoring_the_backup
CURA-8313: Ignore files-in-use while restoring a backup
2021-06-25 08:48:28 +02:00
jelle Spijker
584a387deb Show warning when restoring backup failed
We now allow the backup to fail gracefully when partial files
fail to be restored. But the user is not actively informed by
these failures. Leaving him/her unaware of the state of his
configuration folder.

This commit show's a message windows, listing the failed files.
Due to a string freeze at the moment we reuse the following i18n
message:

> The following error occurred while trying to restore a Cura backup:
followed by a list of files that fails to be restored.

Which is not ideal, but a sufficient warning in my opinion. At least
better then being completely uninformed.

Contributes to CURA-8313
2021-06-25 08:24:06 +02:00
Ghostkeeper
879f44a776
Merge branch 'update-Liquid-printer' of https://github.com/liquid-printer/Cura into liquid-printer-update-Liquid-printer 2021-06-24 17:32:30 +02:00
Konstantinos Karmas
4fe199ccc7 Ignore files-in-use while restoring a backup
Sometimes, while a backup is being restore, one of the files in the current config folder may be still in use. This means that once the backup tries to replace this file with the one in the backup, the entire backup restoration fails and half the configuration folder has been messed up.

To prevent that, we decided to ignore files that are currently in use while restoring a backup. This _may_ lead to a slightly wrong configuration (e.g. a plugin may not be restored properly), but it is an acceptable result, as the rest of the configuration folder is restored properly.

CURA-8313
2021-06-24 17:26:57 +02:00
Ghostkeeper
668d51c16b
Improve description of steps per mm (E) setting
Technically, moving the feeder wheel by 1mm doesn't guarantee that the filament gets extruded by 1mm, since there might be slip.

Reported in issue #9924.
2021-06-24 17:01:35 +02:00
Ghostkeeper
84b5b19584
Merge branch '4.10' 2021-06-24 14:19:40 +02:00
Ghostkeeper
4d29de4579
Revert CURA-8055 in the 4.10 branch. This should not have been merged in there.
Revert "Change file extension to .umm"

This reverts commit 56db7f7144083df4bca77746d7ee30f2a54fda36.

Revert "Re-enable compression"

This reverts commit 62bc9be22bbc5595dbfce69893163c3a0ebc4415.

Revert "Add documentation"

This reverts commit e9031f1aff5d40f3c69ac625edf11963a3253eb8.

Revert "Fix writing bytes to string-stream"

This reverts commit 66b2825a667f9aa9618005d2a5875383a3658f4f.

Revert "Hide button entirely if no export is available"

This reverts commit ec727e1068c3ac2cab7f95fb88c5d4d101e28e17.

Revert "Basic implementation of exporting all materials in a .zip archive"

This reverts commit bdcaef134f556f455f352786123476ec40e3ae4c.

Revert "Implement default path for exporting all materials"

This reverts commit e66783664bf73dd9b1e3c6af6f01321763470d2e.

Revert "Implement a sync button and file dialogue to export all materials"

This reverts commit abba3bdd10a994a1b38bcb426a27ba379febeac7.

Revert "Add notion of whether printers support the material export archive"

This reverts commit f436cb8e7b879a8913b25f2a049413ec0721f1c5.
2021-06-24 14:15:54 +02:00
Patola
365808e6bc
changed translation of Digital Library
changed it to just Digital Library as per Ruben's request
2021-06-24 11:17:04 +02:00
Evangelos Trantos
aabbdd2040
Merge pull request #10023 from Ultimaker/CURA-8332_Cura_crashes_when_access_to_keyring_is_denied
CURA-8332: Cura crashes when access to keyring is denied
2021-06-23 15:13:23 +02:00
Jaime van Kessel
7e7a09ffa7
Merge branch '4.10' of github.com:Ultimaker/Cura 2021-06-23 14:26:19 +02:00
Jaime van Kessel
c7ce0f2236
Merge branch 'CURA-8313_Restore_backup_messes_configurations' of github.com:Ultimaker/Cura into 4.10 2021-06-23 13:32:46 +02:00
Konstantinos Karmas
ceca0c417a Catch the KeyringLocked also when setting the token in the keyring
CURA-8332
2021-06-23 11:22:12 +02:00
Konstantinos Karmas
8ade68dbef Catch the KeyringLocked error instead of the MacOS specific
Turns out that when the KeychainDenied error is raised, it is being caught by the macOS keyring api and the non-macOS-specific KeyringLocked error is raised instead, so we need to catch this one.

CURA-8332
2021-06-23 11:20:35 +02:00
Konstantinos Karmas
bcd44b8b6f Process events while extracting the downloaded backup
To prevent the UI from being frozen. This way, the user knows that something is happening in the background and Cura didn't just stop working.

CURA-8313
2021-06-22 17:01:36 +02:00
saliery999
0a40ceb72f
add Farm 2 and Farm 2CE printer, extruder profiles, variants, quality, meshes and images. (#9574)
* Add files via upload

* Add files via upload

* Add files via upload (#1)

* Delete farm2_ce_normal.inst.cfg

* Delete farm2_normal.inst.cfg

* Update farm2.def.json

* Update farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Rename farm2.def.json to resources/definitions/farm2.def.json

* Delete farm2_platform.stl

* Add files via upload

* Rename farm2_CE.def.json to resources/definitions/farm2_CE.def.json

* Update farm2.def.json

* Update farm2_CE.def.json

* Add files via upload

* Delete farm2CEplate.png.png

* Delete farm2_platform.3mf

* Delete farm2plate.png

* Add files via upload

* Add files via upload

* Delete farm2_ce_extruder_1.def.json

* Delete farm2_extruder_1.def.json

* Delete farm2_ce_printhead_0.2.inst.cfg

* Delete farm2_ce_printhead_0.3.inst.cfg

* Delete farm2_ce_printhead_0.4.inst.cfg

* Delete farm2_ce_printhead_0.5.inst.cfg

* Delete farm2_printhead_0.2.inst.cfg

* Delete farm2_printhead_0.3.inst.cfg

* Delete farm2_printhead_0.4.inst.cfg

* Delete farm2_printhead_0.5.inst.cfg

* Add files via upload

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Update farm2_ce_printhead_0.2.inst.cfg

* Update farm2_ce_printhead_0.3.inst.cfg

* Update farm2_ce_printhead_0.4.inst.cfg

* Update farm2_ce_printhead_0.5.inst.cfg

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_printhead_0.3.inst.cfg

* Update farm2_printhead_0.4.inst.cfg

* Update farm2_printhead_0.5.inst.cfg

* Rename farm2_CE.def.json to farm2_ce.def.json

* Delete farm2CEplate.png

* Add files via upload

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2_printhead_0.2.inst.cfg

* Update farm2_ce.def.json

* Delete farm2_platform.3mf

* Add files via upload

* Delete farm2plate.png

* Delete farm2ceplate.png

* Add files via upload

* Delete farm2_platform.3mf

* Add files via upload

* Update farm2.def.json

* Update farm2_ce.def.json
2021-06-22 16:54:21 +02:00
Konstantinos Karmas
4f5e055cd8 Show the backup item as busy while it is being restored
Previously, after pressing the "Restore" button of a backup, there was no indication about it being restored. This commit changes that by making the "Restore" button of that backup display the busy rotating wheel.

CURA-8313
2021-06-22 16:33:32 +02:00
Konstantinos Karmas
51de50cd05 Hide the backup window when the application is shutting down
CURA-8313
2021-06-22 16:31:37 +02:00
Konstantinos Karmas
b1ee6d3d22 Revert "Hide the backup window when the application is shutting down"
This reverts commit 32eac869994ec1e84a81c6247b59c982f6619152.
2021-06-22 16:29:52 +02:00
Ghostkeeper
9a470f639d
Only add G92 for Griffin if redoing layer
Also, don't add it twice for the Repetier flavour.
This way the code is separated better into if-else cases to make it easier to read, even though it has this line in there 3 times.

Fixes issue CURA-8331.
2021-06-22 16:29:28 +02:00
Konstantinos Karmas
32eac86999 Hide the backup window when the application is shutting down
CURA-8313
2021-06-22 16:24:43 +02:00
Konstantinos Karmas
7c72e84215 Read preferences from new restored configs
Before calling the illuminate, we need to make sure that the previous cached Preferences have been overridden by the newly restored preferences from the backup. Otherwise, the `illuminate()` function will bring back the cached preferences and the new ones from the backup will be lost.

CURA-8313
2021-06-22 15:16:13 +02:00
Jaime van Kessel
4479cd8610
Merge pull request #10001 from sustmi/czech-translations-4.10
Czech translations for v4.10
2021-06-22 15:14:54 +02:00
Ghostkeeper
3331b7c267
Merge branch 'CURA-8332_Dont_crash_if_keyring_access_is_denied_on_mac' into 4.10 2021-06-21 17:36:06 +02:00
Konstantinos Karmas
f62a403f28 Really fix the mypy issue
Hopefully

CURA-8332
2021-06-21 17:20:36 +02:00
Konstantinos Karmas
4a8b5ae61e Fix mypy issue
CURA-8332
2021-06-21 17:07:36 +02:00
Konstantinos Karmas
9fd0ac333e Don't check against generic exception
Define the KeychainDenied exception locally in non-Mac operating systems.

CURA-8332
2021-06-21 16:47:47 +02:00
Konstantinos Karmas
502bdda8ea Fix reference before assignment
Fixes sentry issue CURA-2M1.
2021-06-21 16:34:01 +02:00
Konstantinos Karmas
7785142831 Log info instead of exception when keyring is denied on Mac
CURA-8332
2021-06-21 16:14:48 +02:00
Konstantinos Karmas
c3782c9468 Check for KeychainDenied Exception only on OSX
CURA-8332
2021-06-21 15:40:18 +02:00
Konstantinos Karmas
3ae59c5bf4 Merge branch '4.10' of https://github.com/Ultimaker/Cura into 4.10 2021-06-21 15:13:18 +02:00
Konstantinos Karmas
50d9b1284c Don't log sentry issues when backup fails due to size
We do not consider this necessary since it is not a crash.
2021-06-21 15:13:03 +02:00
Jaime van Kessel
84052d496f
Merge pull request #10011 from Ultimaker/CURA-8334_Fix_tooltip_arrow_showing_in_Manage_printers_button
CURA-8334: Don't draw tooltip background if height is 0
2021-06-21 15:05:31 +02:00
freejoe
5a5e913f57 Change adhesion_type to 'raft';
Change travel_speed to 65mm/s for LKx printers;
2021-06-21 13:45:28 +02:00
Konstantinos Karmas
61b4dd3efc
Merge pull request #9987 from lowkeyjoe/master
Update LONGER printer profiles
2021-06-21 13:43:38 +02:00
Konstantinos Karmas
06b0d12844 Don't draw tooltip background if height is 0
In some buttons (specifically, the "Manage printers" button), the tooltip arrow is being drawn even though the tooltip text is empty. This commit fixes that by making sure that the background rectangle (PointingRectangle) of the tooltip is not be visible if the height of the tooltip is 0.

CURA-8334
2021-06-21 13:24:22 +02:00
Konstantinos Karmas
951c656096 Import they KeychainDenied exception only on Mac
CURA-8332
2021-06-21 10:55:22 +02:00
Konstantinos Karmas
c1618565ea Don't crash if keyring access is denied on MacOS
CURA-8332
2021-06-21 10:47:53 +02:00
Cláudio 'Patola' Sampaio
16cdeae240 Updated pt_BR strings for Cura 4.10 2021-06-19 06:38:43 +02:00