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

14353 Commits

Author SHA1 Message Date
Jaime van Kessel
aff2ffc67a Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:23:06 +01:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab 
CURA-6100
 2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
Jaime van Kessel
15563a756f Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura 2019-01-17 13:12:41 +01:00
Lipu Fei
2aa985c6de Update all profiles to setting_version 7 
CURA-6113
 2019-01-17 11:49:26 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs 
CURA-6117
 2019-01-17 11:20:21 +01:00
Jaime van Kessel
2f43339434 Merge branch 'CURA-6118_add_experimental_tag_on_stage_panel' of github.com:Ultimaker/Cura 2019-01-17 09:32:29 +01:00
steverc1572
2da71fe1f9
Add files via upload 2019-01-16 16:46:07 -06:00
steverc1572
eb1204de9a
Add files via upload 2019-01-16 16:45:08 -06:00
Jaime van Kessel
24fbb1007d Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-16 17:39:43 +01:00
Remco Burema
a0dd3f06e6 Add 'Experimental' tag for quality profiles in the header. 
When an experimental quality profile is active, the stage panel does not show that it is experimental.
It is however shown on the quality drop-down menu in Custom mode.

This commit also fixes the untranslated (hardcoded) 'Experimental' string in the dropdown in Custom.

Fixes the issue reported in CURA-6118.
 2019-01-16 15:50:40 +01:00
TiZYX
54cbadd09e
Update tizyx_k25_normal.inst.cfg 2019-01-16 15:28:22 +01:00
TiZYX
04ff27c5f3
Update tizyx_k25_normal.inst.cfg 2019-01-16 15:28:00 +01:00
drzejkopf
d499f780c8
Let "retraction_combing" be overriden with "infill" as default value 
"infill" option was not added to "resolve" after adding additional combing setting, so that wasn't possible to add it as override value in printer definition
 2019-01-16 14:54:24 +01:00
Diego Prado Gesto
86b0ac320b Increase the padding with the button 
Add more padding when the draggable area is visible
 2019-01-16 08:47:01 +01:00
Nureddin Bennett
b35dad6392 added new printer ALYA NX 3DP 2019-01-16 03:49:24 +03:00
Nureddin Bennett
d2550bf35e added printing profiles with materials for Alya 3DP 2019-01-16 03:48:52 +03:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
ChrisTerBeke
3d6710d5b6 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-15 13:08:54 +01:00
Diego Prado Gesto
2435b97ef7 Change the style of the resize bar at the bottom of the print setup panel 
Make it wider and more visible to the user.
Change icon.
Keep margins according to the other panels.
 2019-01-15 12:12:47 +01:00
Diego Prado Gesto
f16735a5be Add VersionUpgrade40to41 as a bundled package 
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
 2019-01-14 17:10:52 +01:00
Diego Prado Gesto
bf20e04b0d Merge branch '4.0' 2019-01-14 17:03:12 +01:00
Diego Prado Gesto
fa7b38243c Add VersionUpgrade35to40 as a bundled package 
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
 2019-01-14 17:02:02 +01:00
Jaime van Kessel
090fdbf598 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-14 14:17:40 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0 2019-01-14 14:12:36 +01:00
Lipu Fei
71036abd87 Add troubleshooting link for recommended 
CURA-6114
 2019-01-14 12:11:45 +01:00
Lipu Fei
6876935359 Merge remote-tracking branch 'origin/4.0' 2019-01-14 11:21:28 +01:00
Lipu Fei
0ecd00fa1f
Merge pull request #5150 from Ultimaker/CURA-6054-2_fix_resize_panel_on_window_change 
Fix resizable Settings-Panel for change in window size. [CURA-6054]
 2019-01-14 11:01:46 +01:00
Lipu Fei
29bb317293 Add a margin to settings panel bottom 
CURA-6054
 2019-01-14 10:55:03 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
Diego Prado Gesto
dacc161745
Merge pull request #4961 from h0x91b/patch-1 
default is 2650, not 2620, probably typo
 2019-01-13 17:35:59 +01:00
Diego Prado Gesto
c11e0cecc8 Remove loading gif 
Instead of an external gif, use the BusyIndicator that exists in the ActionButton.
 2019-01-13 16:58:38 +01:00
fieldOfView
f8bfca6079 Don't show auto configuration selection when there are no configurations 2019-01-11 18:27:44 +01:00
fieldOfView
d03ec22dee Hide empty abbreviated machinename 
Connected printers that are not Cura Connect printers may not have a connect_group_name.
 2019-01-11 17:55:06 +01:00
fieldOfView
c81689d233 Prevent a recurring qml warning 
Note that the connect_group metadata is also queried for non-connected printers; the model is not filtered, but non-connected printers are set to be invisible.
 2019-01-11 17:40:36 +01:00
Remco Burema
7b3cf6be64 Fix resizable Settings-Panel for change in window size. [CURA-6054] 2019-01-11 17:32:15 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
2e3398e349 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 15:10:44 +01:00
Jaime van Kessel
3ecdd91223 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-11 14:49:06 +01:00
Jaime van Kessel
cbeadb2343 Set the font of the time estimation to medium bold 
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.

CURA-6097
 2019-01-11 14:47:59 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel 
CURA-6097
 2019-01-10 16:32:43 +01:00
Jaime van Kessel
614b1000fd Added missing material compatibility chart link 
CURA-6090
 2019-01-10 15:36:36 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
Diego Prado Gesto
03b4121d22 Fix broken shortcut for slice or stop slicing. 2019-01-10 13:59:22 +01:00
ChrisTerBeke
764769f4bb Merge branch '4.0' into STAR-322_cloud-connection 2019-01-10 09:48:48 +01:00