ChrisTerBeke
|
764769f4bb
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2019-01-10 09:48:48 +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 |
|
Ian Paschal
|
8831ba04e1
|
Fix missing extruder number
|
2019-01-09 17:05:10 +01:00 |
|
ChrisTerBeke
|
8813f10331
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2019-01-09 13:34:11 +01:00 |
|
Jaime van Kessel
|
366d2c8114
|
Prevent crash for firmware updater if the activePrinter is not set
|
2019-01-09 12:56:49 +01:00 |
|
Jaime van Kessel
|
d928e0979d
|
Handle attempting to remove a favorite material that was already removed
|
2019-01-09 12:54:33 +01:00 |
|
Jaime van Kessel
|
e718bed151
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2019-01-09 12:51:53 +01:00 |
|
Jaime van Kessel
|
862c76a2ea
|
Check if the optimised layer data is stored before attempting to delete it
|
2019-01-09 12:51:20 +01:00 |
|
ChrisTerBeke
|
edf64bef85
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2019-01-09 10:45:49 +01:00 |
|
Simon Edwards
|
0de84dad13
|
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab
CL-1157 Add skeleton loading to the monitor tab
|
2019-01-08 16:23:16 +01:00 |
|
Ian Paschal
|
97e17d9fb8
|
Remove debug behavior
Contributes to CL-1157
|
2019-01-08 15:17:42 +01:00 |
|
Ian Paschal
|
8f37b65ffe
|
Add skeleton loading to print job queue
Contributes to CL-1157
|
2019-01-08 15:15:21 +01:00 |
|
Ian Paschal
|
e81742d296
|
Add skeleton loading to printer cards
Contributes to CL-1157
|
2019-01-08 14:27:54 +01:00 |
|
ChrisTerBeke
|
32415f4d8e
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2019-01-08 13:19:36 +01:00 |
|
ChrisTerBeke
|
b8da720c1d
|
Move translations in-line
|
2019-01-08 13:10:42 +01:00 |
|
ChrisTerBeke
|
485b471522
|
Fix some review comments
|
2019-01-08 12:19:00 +01:00 |
|
ChrisTerBeke
|
7c7bca31c7
|
Fix renamed property connectionType
|
2019-01-08 11:52:27 +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
|
8e898148f6
|
Make checkboxes and texts more aligned
CURA-6085
|
2019-01-08 09:42:52 +01:00 |
|
Lipu Fei
|
af634b82b2
|
Chnage default font sizes and unify font weights
CURA-6085
|
2019-01-08 09:39:50 +01:00 |
|
Ian Paschal
|
4dbab88792
|
Add dummy printer for loading
|
2019-01-07 13:56:04 +01:00 |
|
Ian Paschal
|
18545e18ce
|
Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab
|
2019-01-07 13:38:23 +01:00 |
|
Lipu Fei
|
a43900b0ad
|
Fix version upgrade for XMLMaterialProfile
CURA-5995
|
2019-01-07 11:17:12 +01:00 |
|
Lipu Fei
|
059fede06e
|
Mkae default custom settings panel height smaller
CURA-6054
|
2019-01-07 10:53:21 +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 |
|
Jaime van Kessel
|
4c1f68a447
|
Ensure that the connectiontype of a connected printer is set correctly
CURA-6011
|
2019-01-04 15:24:01 +01:00 |
|
Ghostkeeper
|
efac7c39c0
|
Fix indentation
|
2019-01-03 17:22:22 +01:00 |
|
Ghostkeeper
|
cfdce25a62
|
Add grip lines to bottom of resizable panel
Looks all right now.
Contributes to issue CURA-6054.
|
2019-01-03 17:06:17 +01:00 |
|
Ghostkeeper
|
e15e06f29f
|
Make Z relative
This way if we ever want to change the parent's Z for some other ordering requirements, the children will stay in order.
|
2019-01-03 16:04:28 +01:00 |
|
Ghostkeeper
|
798c1f198c
|
Hide action panel when displaying a stage with a background
This is not the worst hack ever, but it's quite a hack.
Contributes to issue CURA-6054.
|
2019-01-03 16:04:27 +01:00 |
|
Ghostkeeper
|
6eca0ce69f
|
Use native rendering for text fields
Hopefully this fixes the font rendering issue we're seeing on MacOS now.
|
2019-01-03 16:04:27 +01:00 |
|
Jaime van Kessel
|
1973397b92
|
Remove confusing printer preference text
CURA-6003
|
2019-01-03 15:34:41 +01:00 |
|
Jaime van Kessel
|
e769b324e1
|
Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0
|
2019-01-03 11:41:05 +01:00 |
|
Ghostkeeper
|
707c3a26a8
|
Make job specs not bold
As per the design.
Contributes to issue CURA-6025.
|
2019-01-03 11:06:43 +01:00 |
|
Lipu Fei
|
ee1390a6a3
|
Merge pull request #5090 from Ultimaker/unify_font_types
Unify font types
|
2019-01-03 10:57:34 +01:00 |
|
Lipu Fei
|
d97b812ccd
|
Merge branch '4.0' into unify_font_types
|
2019-01-03 10:46:49 +01:00 |
|
Jaime van Kessel
|
979fd507de
|
Give the section delegates a fixed height
This fixes the issue where the first printer would be drawn over the section label
CURA-6011
|
2019-01-03 10:39:43 +01:00 |
|
Jaime van Kessel
|
195d39f698
|
Update the style of the postprocessing button
CURA-6043
|
2019-01-03 09:47:48 +01:00 |
|
Jaime van Kessel
|
0b1773e087
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2019-01-03 09:43:13 +01:00 |
|
Jaime van Kessel
|
3505eb321f
|
Also add space for the savebutton additional components with the output widget
CURA-6043
|
2019-01-03 09:42:22 +01:00 |
|
Lipu Fei
|
ee72284616
|
Use appropriate log level
CURA-6035
|
2019-01-03 08:32:42 +01:00 |
|
Lipu Fei
|
d295dfbf7c
|
Merge pull request #5096 from Ultimaker/remember_opened_settings_panel
Remember opened state of settings panel
|
2019-01-03 08:26:35 +01:00 |
|
Ghostkeeper
|
a5385b229a
|
Make text in printer type label bigger
Just shown it to our UX designer and she thinks it's better this way.
Contributes to issue CURA-6025.
|
2019-01-02 16:37:19 +01:00 |
|
Ghostkeeper
|
96a6b7559e
|
Remember opened state of settings panel
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.
Contributes to issue CURA-6069.
|
2019-01-02 14:05:17 +01:00 |
|
Jaime van Kessel
|
ae7f843bbc
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2019-01-02 13:54:19 +01:00 |
|