GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-08 20:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,814 Commits 295 Branches 268 Tags
Commit Graph

23814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evg33
436d36ae90 UNI3D: fix startup code and machine_extruder_count=2 2020-04-29 18:10:43 +03:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more. 2020-04-29 16:23:06 +02:00
Kostas Karmas
b008f1e823 Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 15:37:53 +02:00
Kostas Karmas
61e2cc1193 Fix missing type for result 2020-04-29 15:33:28 +02:00
Kostas Karmas
07fcdf905e Add tests for the DiscoveredCloudPrintersModel 
CURA-7022
 2020-04-29 15:02:26 +02:00
Kostas Karmas
6959c9ac42 Rename _discovered_ultimaker_cloud_printers_list to _discovered_cloud_printers_list 
CURA-7022
 2020-04-29 15:01:50 +02:00
Jaime van Kessel
1775903335
Merge branch 'CURA-7404_fix_xray_green' of github.com:Ultimaker/Cura 2020-04-29 14:59:53 +02:00
Kostas Karmas
b459895589 Add comments 
CURA-7022
 2020-04-29 14:19:28 +02:00
Kostas Karmas
4a49c1cc8d Fix bottom margin of the discoveredCloudPrintersScrollView 
CURA-7022
 2020-04-29 14:14:01 +02:00
Ghostkeeper
dfa021ab20
Fix upgrade of preference if visible settings was not modified 
Oops. Small oversight. This could lead to the preferences file being erased completely.

Found during work on Sentry issue CURA-NH.
 2020-04-29 14:10:07 +02:00
Ghostkeeper
abffb6c26c
Don't crash when reading corrupt 3MF files 
Otherwise it would crash with a BadZipFile error. We should be robust against that. This will trigger a generic message that we couldn't read that file to the user, and put more information in the log.

Fixes Sentry issue CURA-NH.
 2020-04-29 14:07:04 +02:00
Ghostkeeper
dcac9b6a87
Prevent a crash when retrying even though it completed in the meanwhile 
Fixes Sentry issue CURA-NA.
 2020-04-29 14:07:03 +02:00
Ghostkeeper
bf3d6c67d9
Check the bounding box before using it 
Some objects don't have a bounding box if they are improperly constructed by a plug-in.

Fixes Sentry issue CURA-N3.
 2020-04-29 14:07:03 +02:00
Kostas Karmas
2fb7e67043 Cleanup _update() 
CURA-7022
 2020-04-29 13:55:03 +02:00
Jaime van Kessel
481da09975
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-29 13:51:35 +02:00
Jaime van Kessel
084e80bcda
Only connect a cloud printer if it's the active one 
By splitting up the correctly setting of metadata and actually
connecting, the distinction can be made.

CURA-7055
 2020-04-29 13:48:06 +02:00
Kostas Karmas
58b61f2331 Remove unnecessary newCloudPrintersDetected variable 
Variable newCloudPrintersDetected is no longer needed, as it is communicated through the
signal itself.

CURA-7022
 2020-04-29 13:47:11 +02:00
maukcc
cf953bd66b HMS434 update 
delete PLA quality files(again)
 2020-04-29 13:37:20 +02:00
maukcc
4f0165e0bd HMS434 update 2020-04-29 13:35:24 +02:00
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic 
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
 2020-04-29 13:31:45 +02:00
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Kostas Karmas
fb328bd307 Display a summary of the Cloud printers added after login in WelcomeWizard 
If the user has cloud printers linked to his/her account, then the welcome
wizard will display a summary of the cloud printers that were found in the account
and added in Cura.

CURA-7022
 2020-04-29 12:11:05 +02:00
Remco Burema
4c4e611629
Fix x-ray error color. 
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
 2020-04-29 12:06:20 +02:00
Kostas Karmas
c7cf0fab2f Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 12:04:04 +02:00
Kostas Karmas
64cfe423fe Fix moving to next page when no printers in account 
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
 2020-04-29 11:49:45 +02:00
Kostas Karmas
411a02a827 Simplify the DiscoveredUltimakerCloudPrintersModel reference calls 
CURA-7022
 2020-04-29 11:40:47 +02:00
Kostas Karmas
d6f150a523 Rearrange the AddPrinterPagesModel and mark "Add Cloud Printer" page as final 
In order to avoid cases where the "Machine actions" page would lead to the "add cloud printer"
page when pressing next, the AddPrinterPagesModel was rearranged and the "add cloud printer"
page was marked as final.

CURA-7022
 2020-04-29 11:38:36 +02:00
Kostas Karmas
b2382593ed Add is_final_page attribute and mark the "Add Cloud Printers" page as final 
CURA-7022
 2020-04-29 11:37:42 +02:00
maht
c29ebc8a77
Updated change log for 4.6.1 4.6.1 2020-04-29 10:58:11 +02:00
maukcc
617fb12ac0 HMS434 update 
Deleted pla quality profiles
 2020-04-29 09:03:56 +02:00
64bittuning
fe90632a38 Update tronxy_d01.def.json 2020-04-28 23:37:25 -04:00
64bittuning
66b05f5f50 Update tronxy_d01.def.json 
repaired old inherit
 2020-04-28 23:35:52 -04:00
64bittuning
5123623b50 Create tronxy_base_extruder_0.def.json 2020-04-28 23:21:44 -04:00
64bittuning
98f3dbb028 Tronxy Variants 
Needs to be updated with relevant settings
 2020-04-28 23:10:21 -04:00
64bittuning
19b374884c Tronxy Logo Mesh 2020-04-28 23:08:18 -04:00
64bittuning
b592c1b0aa Tronxy Quality pack 
These need to be renamed and tweaked before attempting a PR
 2020-04-28 23:07:31 -04:00
64bittuning
1eaa384676 Tronxy Definition files 
Reposting the original set of def files from #7553. More to follow.
 2020-04-28 23:06:26 -04:00
Ghostkeeper
8386d094d3
Improve translation of 'tree support' in German 
As discussed in #7590.
 2020-04-29 02:08:09 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Kostas Karmas
05e92b953a Size the Welcome Wizard using the theme 
CURA-7022
 2020-04-28 17:44:35 +02:00
Kostas Karmas
1981325b05 Make "Add printers manually" button invisible when cloud printers found 
CURA-7022
 2020-04-28 16:31:01 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Evg33
bee9947d84 UNI3D CR at end of files 2020-04-28 16:29:07 +03:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
6b51f62411 UNI3D platforms 2020-04-28 16:09:10 +03:00
Evg33
80e0078979 UNI3D settings version 13 2020-04-28 15:56:34 +03:00
Kostas Karmas
d6ddfb3990 Add typing 
CURA-7022
 2020-04-28 14:50:47 +02:00
Evg33
61cfcf6b08 UNI3D extruders 2020-04-28 15:43:54 +03:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00