3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
18424 commits 312 branches 275 tags 718 MiB
Commit graph

18424 commits

This branch
This branch
All branches
Author SHA1 Message Date
THeijmans
fdf65b43bc Update the speed values for the um2+ 
Some more wrong values were found, these should be fixed with this pull request
 2019-03-14 15:59:12 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Simon Edwards
e376404e5c
Merge pull request #5419 from Ultimaker/CL-1282_handle_empty_string_and_none_material_ids 
CL-1282 Handle "" and None as hot-end and material IDs
 2019-03-13 13:23:54 +01:00
THeijmans
e33ec5c324 Fixing the UM2+ speeds 
Fixing the very high print speeds in UM2+ profiles
 2019-03-11 17:35:23 +01:00
Simon Edwards
c07b0cdd00
Merge pull request #5418 from Ultimaker/CL-1281_improve_idle_printer_empty_queue 
CL-1281 Make sure to show printers even if queue is empty
 2019-03-11 17:20:39 +01:00
Ian Paschal
6392ab8d05 Handle "" and None as hot-end and material IDs 
Contributes to CL-1282
 2019-03-11 16:30:04 +01:00
Simon Edwards
3489a5c64e
Merge pull request #5397 from Ultimaker/CL-1272_prevent_multiple_cloud_pop-ups 
Prevent multiple cloud-flow pop-ups
 2019-03-11 15:37:00 +01:00
Ian Paschal
ec203da1cd Make sure to show printers even if queue is empty 
Contributes to CL-1281
 2019-03-11 13:54:49 +01:00
Jaime van Kessel
50999a075e Fix stupid mistake (signals need an emit, not a direct call) 
CURA-6278
 2019-03-11 10:46:41 +01:00
Ghostkeeper
e53eb70cad
Add tests for validating metadata before loading 
Contributes to issue CURA-6270.
 2019-03-08 14:07:10 +01:00
Ghostkeeper
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version 
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
 2019-03-08 13:34:16 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files 
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
 2019-03-08 13:32:36 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Ian Paschal
9c3f67a9ed Code style 
Contributes to CL-1272
 2019-03-06 12:26:38 +01:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF 
CURA-6282
 2019-03-06 11:02:55 +01:00
Ian Paschal
99fe8ec7aa Improve cloud flow pop up logic 
Contributes to CL-CL-1272
 2019-03-06 10:56:31 +01:00
Ghostkeeper
cf2fcc57ee
Merge branch 'CURA-6237_fix_remove_materials' into 4.0 2019-03-06 09:44:08 +01:00
Simon Edwards
eff6b58e18
Merge pull request #5375 from Ultimaker/CL-1274_dont_use___file__ 
CL-1274 Don't use __file__ in the monitor tab
 2019-03-04 17:26:49 +01:00
Ian Paschal
88fc7d0fba Don't try to get the plugin path when there's no plugin registry 
i.e. in tests
Contributes to CL-1274
 2019-03-04 14:27:35 +01:00
Ian Paschal
a74717ca3c Get plugin path like most other plugins do 
Contributes to CL-1274
 2019-03-04 12:42:48 +01:00
Ian Paschal
87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 2019-03-04 12:11:57 +01:00
Ian Paschal
3889570697 K.I.S.S. 
Contributes to CL-1274
 2019-03-04 12:04:34 +01:00
Ian Paschal
11ea568d0b
Merge pull request #5370 from Ultimaker/CL-1247_hide_view_prints_button_on_cloud 
CL-1247 Hide the "View print history" button when connecting via cloud
 2019-03-04 11:40:48 +01:00
Ian Paschal
c8580cf417 Prevent circular dependencies 
Contributes to CL-1274
 2019-03-04 11:27:52 +01:00
Ian Paschal
a1e0ddd9df Don't hardcode plugin directory 
Contributes to CL-1274
 2019-03-04 10:19:33 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel 
also when the variant container has changed.

Contributes to CURA-6227.
 2019-03-01 14:54:42 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order 
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
 2019-03-01 10:53:55 +01:00
Ian
cac8c85489 Don't use __file__ 
Contributes to CL-1274
 2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning 
Contributes to CL-1274
 2019-03-01 10:46:27 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud 
CL-1247
 2019-02-28 17:08:28 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +01:00
Ghostkeeper
9fba8f5381
Update metadata of translation templates 
It's now 2019, and Cura 4.0.

Contributes to issue CURA-6257.
 2019-02-27 11:47:29 +01:00
Jaime van Kessel
7ed1ee4365
Merge pull request #5365 from Ultimaker/fix-token-expiry 
Fix token expiry
 2019-02-27 10:56:00 +01:00
ChrisTerBeke
9ba342c541 Fix codestyle failure on float conversion 2019-02-27 10:43:15 +01:00
ChrisTerBeke
365f67cbf8 Have some overlap in token expiry to prevent unauthorized issues 2019-02-27 10:32:30 +01:00
Ghostkeeper
bedb52fb60
Update translation templates for every language 
This way the translators can simply fill in the blanks.

Contributes to issue CURA-6257.
 2019-02-26 16:54:50 +01:00
Ghostkeeper
fbbadc4543
Update translation templates for Cura 4.0 
These are the new strings that will now have to be translated.

Contributes to issue CURA-6257.
 2019-02-26 16:53:34 +01:00
ChrisTerBeke
03c7fbe527 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2019-02-26 15:41:03 +01:00
Ghostkeeper
d6c73175c7
Reduce minimum screen size 
With dual extrusion printers, this reduces the width so much that the material name is just ellipses in the top screen, but at least it's still usable. With single extrusion printers this is fine.
 2019-02-26 15:34:23 +01:00
ChrisTerBeke
53cc9cd188 Add extra validation to backup list response 2019-02-26 11:09:57 +01:00
Lipu Fei
7291026bec Fix material container removal 
CURA-6237
 2019-02-22 15:13:53 +01:00
Lipu Fei
2694ef98e0
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix 
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
 2019-02-22 13:37:10 +01:00
Diego Prado Gesto
271573d0ae Fix typo... again 2019-02-22 13:19:04 +01:00
Diego Prado Gesto
4d030572ba Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-22 13:18:36 +01:00
Diego Prado Gesto
5d8eb3e6e5 Fix typo 2019-02-22 13:18:20 +01:00
Jaime van Kessel
69d3813f98 No longer disable viewMenu when user loaded presliced g-code 2019-02-22 11:19:16 +01:00
Jaime van Kessel
7221b23457 Add a property to temporarily disable the material models from updating. 
This allows the QMl to stop the updating when it's not even visible
 2019-02-21 20:50:44 +01:00