26014 Commits

Author SHA1 Message Date
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
Cláudio 'Patola' Sampaio
6bf1b358da Updated pt_BR strings for Cura 4.10 2021-06-19 06:37:06 +02:00
Miroslav Sustek
856de59dec Add missing Czech translations for Cura 4.10 + fix "Top View" translation 2021-06-18 19:29:07 +02:00
fvrmr
cfe395460f Update 0.png
Changed img for page 0
credits to img @jellespijker
4.10-beta
2021-06-18 13:01:12 +02:00
Remco Burema
e7a423ea6f
Merge branch '4.10' 2021-06-17 18:54:07 +02:00
Remco Burema
e85498edda
Small change-log tweaks for 4.10.beta 2021-06-17 18:52:07 +02:00
fvrmr
8de16deec3
Write release notes and update whats new pages
Release notes 4.10 beta
Update whats new pages and images.
2021-06-17 18:40:59 +02:00
Remco Burema
1bd6b3f091
Merge pull request #9991 from Ultimaker/CURA-8313
Re-enable backing up of plugins
2021-06-17 18:28:37 +02:00
Jaime van Kessel
ee16f61d65
Add missing typing
CURA-8313
2021-06-17 16:21:01 +02:00
Jaime van Kessel
40a981b902
Re-enable the backing up of plugins
Because we're adding a messgae for the user if the loading of a plugin failed
(which can happen after backing up a plugin in central storage), we can re-enable
the backing up of plugins again.

CURA-8313
2021-06-17 15:36:45 +02:00
Konstantinos Karmas
29099b5690
Merge pull request #9990 from Ultimaker/CURA-8290_whats_new_text
Increased the height of the welcome wizard screen.
2021-06-17 15:13:50 +02:00
Ghostkeeper
cf7e1af99d
Don't create disallowed areas for areas without any points
It seems people edit definitions to remove all vertices. This causes Cura to crash because of the calculation of disallowed areas.

Fixes Sentry issue CURA-2FY.
2021-06-17 14:56:49 +02:00
jelle Spijker
abc76e593a Increased the height of the welcome wizard screen.
Discussed with UX what the best approach would be.
Both came to the conclusion that this is the simplest
and more aesthetic approach.

The extra white space at the bottom and height of the
first screen is still acceptable according to UX.

Contributes to CURA-8290_whats_new_text
2021-06-17 14:41:56 +02:00
Ghostkeeper
fcd585963f
Check if there is a global stack when discard/keep dialog closes
When we close Cura, we now remove the global stack first. If the discard/keep dialog closes as a result of closing Cura, this would crash since there is no global stack any more to discard changes from or keep changes in, and we can't access the extruder stacks either.
So if there's no global stack, just skip this. It'll be as if you selected 'keep'.

Fixes Sentry issue CURA-2ET.
2021-06-17 13:44:02 +02:00
Ghostkeeper
788efcc83e
Prevent crash when cloud printer gets added while trying to connect to active printers
The cloud printers get added asynchronously, which could lead to a crash because the dict gets modified while we're iterating over it.

Fixes Sentry issue CURA-2EN.
2021-06-17 13:35:15 +02:00
Ghostkeeper
5252d53187
Merge branch '4.10' 2021-06-17 12:07:25 +02:00
Ghostkeeper
87c28299fb
List VersionUpgrade49to410 in bundled packages
That way it properly shows as a bundled package in the list of installed plug-ins.
2021-06-17 12:07:09 +02:00
Remco Burema
8aa071056b
Now unused API field only took integers originally.
We want to keep it this way so people can still make plugins work for older versions of Cura, like 3.6, where the 'api' field with just a single major version, instead of the 'supported_sdk_versions', which can be either a version-string like '7.6.0' or a list of version strings.
2021-06-17 11:15:33 +02:00
Ghostkeeper
92ff9ac313
Merge branch '4.10' 2021-06-16 16:45:51 +02:00
Ghostkeeper
ddfcc94649
Merge branch 'CURA-8320_update_sdk' into 4.10 2021-06-16 16:45:37 +02:00
Remco Burema
d3ccf5a9e3
Merge pull request #8463 from rrrlasse/rrrlasse/fix_usb_connection
Fix connecting to printer via USB
2021-06-16 15:14:38 +02:00
Jaime van Kessel
fa690a0f5e
Fix issue with restoring backups from 4.10
There were some cases where issues could occur due to plugins no longer being there

CURA-8313
2021-06-16 13:51:09 +02:00
Ghostkeeper
31106d13d0
Reduce nesting complexity with some pre-checks
There were two pre-checks here, where the main body of the function was indented two deep. Instead, just early-out if the checks fail. This is easier to read and understand.

Found during investigation of CURA-8128.
2021-06-16 12:58:09 +02:00
Ghostkeeper
cc6a629d92
Merge branch '4.10' 2021-06-15 17:13:25 +02:00
Ghostkeeper
f18e5f96ab
Use Cura-style drop-down to select mesh type
MacOS has some trouble with the QtQuick.Controls 1 system-styled drop-downs since Qt 5.15. We've removed the other ones, but forgot about this one.

Contributes to issue CURA-8128.
2021-06-15 17:13:08 +02:00
Ghostkeeper
8af12de955
Merge branch '4.10' 2021-06-15 16:30:17 +02:00
Ghostkeeper
adf3f51a4e
Use buttons from QtQuick.Controls 2
This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS.

As discussed in the CCB.
2021-06-15 16:28:20 +02:00