ChrisTerBeke
|
36f5150d94
|
Fix merge conflict
|
2018-12-13 11:48:35 +01:00 |
|
ChrisTerBeke
|
f72b58386b
|
Also use CuraConstants for account API root
|
2018-12-13 11:46:11 +01:00 |
|
ChrisTerBeke
|
6150bd665a
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-12 14:04:59 +01:00 |
|
Lipu Fei
|
b6ea61612e
|
Fix merge conflicts
|
2018-12-12 13:26:01 +01:00 |
|
alekseisasin
|
a505adbf40
|
Merge pull request #4945 from Ultimaker/CURA-6006-login-required
[4.0] CURA-6006 login required
|
2018-12-12 11:31:38 +01:00 |
|
alekseisasin
|
64104e47c6
|
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
|
2018-12-12 11:22:08 +01:00 |
|
Remco Burema
|
1b2ef91c13
|
Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0
|
2018-12-12 10:54:36 +01:00 |
|
Lipu Fei
|
a6663ea0e8
|
Fix typing issues
CURA-6005
|
2018-12-12 10:51:13 +01:00 |
|
Lipu Fei
|
f302a76d3a
|
Fix typing issue in Toolbox
CURA-6006
|
2018-12-12 10:47:18 +01:00 |
|
Diego Prado Gesto
|
31331e36d2
|
Revert "Use the capitalized version of the buildplate name"
This reverts commit 11d8831d7a9a15e3e916d5d9762bfe1f755042e5.
Contributes to CURA-6021.
|
2018-12-12 10:41:01 +01:00 |
|
Lipu Fei
|
8c07a6e89b
|
Fix typing issues
CURA-6005
|
2018-12-12 10:35:39 +01:00 |
|
Diego Prado Gesto
|
0b6841e5d9
|
Revert "Use the capitalized version of the buildplate name"
This reverts commit 11d8831d7a9a15e3e916d5d9762bfe1f755042e5.
Contributes to CURA-6021.
|
2018-12-12 09:20:35 +01:00 |
|
Remco Burema
|
65f1c9a304
|
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed
Cura 6016 improve ui speed
|
2018-12-11 17:26:15 +01:00 |
|
Remco Burema
|
b413b4cdb6
|
Correct a typo in typing. [CURA-6016]
|
2018-12-11 17:21:14 +01:00 |
|
ChrisTerBeke
|
47c6321e27
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-11 16:59:47 +01:00 |
|
Simon Edwards
|
f6935ee08b
|
Merge pull request #4971 from Ultimaker/CL-1173_use_short_printer_family_tags
CL-1173 Use short printer family tags
|
2018-12-11 16:52:55 +01:00 |
|
Ian Paschal
|
1ababf38ad
|
Use full printer name if no tag is known
Contributes to CL-1173
|
2018-12-11 16:42:44 +01:00 |
|
Daniel Schiavini
|
0467756ed6
|
STAR-322: Adding return type to init method
|
2018-12-11 16:01:52 +01:00 |
|
Ian Paschal
|
daeb86bdb1
|
Use short printer family tags
Contributes to CL-1173
|
2018-12-11 15:55:03 +01:00 |
|
ChrisTerBeke
|
64dc73aed3
|
remove incorrect __init__.py
|
2018-12-11 15:47:57 +01:00 |
|
ChrisTerBeke
|
21a0517d79
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-11 15:22:18 +01:00 |
|
Diego Prado Gesto
|
c804610fa6
|
Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle
|
2018-12-11 15:19:40 +01:00 |
|
Diego Prado Gesto
|
742fc34e75
|
Change labels in the layer view legend
|
2018-12-11 14:31:12 +01:00 |
|
Daniel Schiavini
|
f04db63594
|
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 14:28:07 +01:00 |
|
Daniel Schiavini
|
a5d8e6ceb8
|
STAR-322: Removing the print job after it was done
|
2018-12-11 14:28:00 +01:00 |
|
Diego Prado Gesto
|
db56aa028c
|
Change the swatch from a circle to the extruder icon
|
2018-12-11 13:59:36 +01:00 |
|
Diego Prado Gesto
|
faa3f42acc
|
Modify the header in the simulation view menu component
This is needed to align with the designs.
|
2018-12-11 13:53:05 +01:00 |
|
Diego Prado Gesto
|
3593b7f152
|
Merge pull request #4782 from Ultimaker/M&P-Setting-Optimization
CPE and CPE+ Comb retractions and ABS first layer temperature.
|
2018-12-11 13:24:43 +01:00 |
|
Jaime van Kessel
|
75ff03f3c8
|
Use setState instead of emitting the backend state
CURA-6016
|
2018-12-11 13:13:20 +01:00 |
|
ChrisTerBeke
|
e4939cf005
|
Remove outdated cloud icon, will be done in another PR
|
2018-12-11 12:55:49 +01:00 |
|
Jaime van Kessel
|
6c70543d11
|
Only set the containerID when the dialog is visible
This prevents unneeded updates
CURA-6016
|
2018-12-11 12:46:11 +01:00 |
|
ChrisTerBeke
|
7b7c687db7
|
Remove dismissable = False from messages as it's the default
|
2018-12-11 12:46:05 +01:00 |
|
ChrisTerBeke
|
e52339a424
|
Fix typing for output_device param in cloud output controller
|
2018-12-11 12:44:37 +01:00 |
|
ChrisTerBeke
|
a766effce8
|
Fix typing for optional callback for on_progress
|
2018-12-11 12:43:43 +01:00 |
|
ChrisTerBeke
|
c07fea1405
|
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 12:39:56 +01:00 |
|
Daniel Schiavini
|
073e8cd6dc
|
Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 12:39:02 +01:00 |
|
ChrisTerBeke
|
1cfc6d850a
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-11 12:35:19 +01:00 |
|
Diego Prado Gesto
|
4c82f8b74f
|
Merge pull request #4967 from Ultimaker/ui_rework_4_0
Merge the entire UI rework planned for the new redesign of Cura 4.0
|
2018-12-11 12:17:55 +01:00 |
|
Diego Prado Gesto
|
1f26b55731
|
Merge pull request #4966 from Ultimaker/CL-1160_fix_materials_none_type
CL-1160 Replace fix for 'None' materials
|
2018-12-11 12:14:34 +01:00 |
|
Lipu Fei
|
2275e5c71f
|
Refactor code to use constants in CuraConstants
CURA-6005
|
2018-12-11 12:13:46 +01:00 |
|
Lipu Fei
|
8e4ad23da1
|
Add CuraConstants
CURA-6005
Put constant values into a separate file CuraConstants.py
|
2018-12-11 12:12:35 +01:00 |
|
Diego Prado Gesto
|
4949f39c34
|
Add translatable strings to empty and unknown material
Contributes to CL-1160.
|
2018-12-11 12:10:32 +01:00 |
|
Daniel Schiavini
|
4fddf1b7c7
|
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 11:56:43 +01:00 |
|
Daniel Schiavini
|
d54fc4182b
|
STAR-322: Fixing style errors
|
2018-12-11 11:56:36 +01:00 |
|
Lipu Fei
|
76b9fa7998
|
Use "cura" as i18n catalog for CuraDrive
CURA-6005
|
2018-12-11 11:53:52 +01:00 |
|
Diego Prado Gesto
|
70b0d16fa4
|
Fix typo
Missing parenthesis.
Contributes to CL-1160.
|
2018-12-11 11:53:26 +01:00 |
|
Ian Paschal
|
1c373b7205
|
Improve config override text
Contributes to CL-1152
|
2018-12-11 11:51:13 +01:00 |
|
Diego Prado Gesto
|
0d9a09797a
|
Merge branch 'ui_rework_4_0' into CL-1160_fix_materials_none_type
|
2018-12-11 11:49:27 +01:00 |
|
Diego Prado Gesto
|
2b2e8ebb31
|
Add some safety checks when checking for the guid of the material
Don't crash if the guid doesn't exist.
Contributes to CL-1160.
|
2018-12-11 11:37:01 +01:00 |
|
ChrisTerBeke
|
4365b03b12
|
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 11:12:43 +01:00 |
|