3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

8170 commits

Author SHA1 Message Date
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
Patrick G
3e925a5cc8
Was wrong file. Changed to extruder def 2019-01-09 22:32:32 +01:00
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade 
Add version upgrade for 4.0
 2019-01-09 17:42:17 +01:00
ChrisTerBeke
32415f4d8e Merge branch '4.0' into STAR-322_cloud-connection 2019-01-08 13:19:36 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
a25ae4ee07 Merge branch 'CURA-6085_fix_font_sizes' of github.com:Ultimaker/Cura into 4.0 2019-01-08 11:44:49 +01:00
Lipu Fei
4cb853cdb0 Fix (bigger) fonts for Chinese and Japanese 
CURA-6085
 2019-01-08 10:51:30 +01:00
Jaime van Kessel
578027182e Prevent setting items from overlapping with column headers 2019-01-08 10:49:55 +01:00
Lipu Fei
2124de3d4d Revert "Chnage default font sizes and unify font weights" 
This reverts commit af634b82b2.

CURA-6085
 2019-01-08 10:45:52 +01:00
Lipu Fei
af634b82b2 Chnage default font sizes and unify font weights 
CURA-6085
 2019-01-08 09:39:50 +01:00
Lipu Fei
ee34cd522d
Merge pull request #5017 from Ultimaker/add_comment_prime_tower 
Add time prime tower into Cura.proto
 2019-01-07 13:30:32 +01:00
Lipu Fei
a8128919af Make resize bar slim 
CURA-6054
 2019-01-07 10:41:07 +01:00
Jaime van Kessel
d21bf53230 Add version upgrade for 4.0 
Contributes to CURA-6011 and CURA-5995
 2019-01-07 10:34:22 +01:00
BluefireXD
1d2e34ca35
Added Anycubic Chiron normal quality cfg 2019-01-07 02:55:42 +01:00
BluefireXD
98e1f66a1e
Added Anycubic Chiron high quality cfg 2019-01-07 02:53:41 +01:00
BluefireXD
2fd2e01d82
Added Anycubic Chiron draft quality cfg 2019-01-07 02:53:15 +01:00
BluefireXD
2687836beb
Added Anycubic Chiron platform obj file 2019-01-07 02:51:06 +01:00
BluefireXD
b6b6382199
Added Anycubic Chiron platform picture 2019-01-07 02:50:16 +01:00
BluefireXD
75460728e2
Added Anycubic Chiron extruder definition file 2019-01-07 02:48:22 +01:00
BluefireXD
1b7e55ddcb
Added Anycubic Chiron definition file 2019-01-07 02:47:39 +01:00