GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-05 17:30:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,181 Commits 295 Branches 268 Tags
Commit Graph

7882 Commits

Author SHA1 Message Date
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
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 af634b82b25fdd765a134288b101588ed2fdc22c.

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
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again 
CURA-5932
 2019-01-04 14:59:26 +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
fieldOfView
f1d01e733d Add variant to the configuration menu headerItem 2019-01-03 16:34:05 +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
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
a14c846e29 Rename CheckBox.qml to CheckBoxWithTooltip.qml 
CURA-6005
 2019-01-03 11:53:19 +01:00
Lipu Fei
56c9de44f7 Update Cura Backups sdk_version to 6 in bundled json 
CURA-6005
 2019-01-03 11:26:14 +01:00
Lipu Fei
136317c3c7 Fix code styles 
CURA-6005
 2019-01-03 11:26:14 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +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
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
7fc4e6ddde Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-03 10:23:22 +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
08dc035f6e Merge remote-tracking branch 'origin/4.0' 2019-01-03 08:30:27 +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
82c9e99ab3
Merge branch '4.0' 2019-01-02 14:11:30 +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
Jaime van Kessel
71632fd098 Add the postProcessing button back next to the slice button 
CURA-6043
 2019-01-02 13:53:35 +01:00
Ghostkeeper
9e0a423f28
Disable visibility of glass buildplate configuration in sync menu 
Because the build plate swapping is not implemented yet.
 2019-01-02 13:30:29 +01:00
Jaime van Kessel
df23097a99 Changed the label for when no remote configurations are loaded yet 2019-01-02 11:36:07 +01:00
Jaime van Kessel
9be1f8aa7b Removed marketplace menu item from top menu 
It was a bit double since we had the marketplace button in the top bar
 2019-01-02 11:33:49 +01:00
Jaime van Kessel
a0031853d3 Fix button color in toolpanel for dark theme 2019-01-02 11:32:49 +01:00
Lipu Fei
11dfb9acdc Remove PluginsPage.qml 
CURA-6066
 2019-01-02 11:18:17 +01:00
pinchies
208811f383
fix start gcode on alfawise u20 
small tweak to fixestart gcode to avoid default position of bed clamps
 2019-01-02 02:58:19 +11:00
Ghostkeeper
6092402a87
Fix 'Slicing...' message when not autoslicing 
Also changes the 'auto slicing' text to just 'slicing', because that's more what the user expects.
Discussed with UX.

Contributes to issue CURA-6025.
 2018-12-31 15:44:09 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace 
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
 2018-12-31 15:33:37 +01:00
Ghostkeeper
346c820959
Remove hover color for Marketplace header tabs 
It was not desirable, as discussed with the designer.

Contributes to issue CURA-6025.
 2018-12-31 15:22:34 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles 
Contributes to issue CURA-6025.
 2018-12-31 15:14:23 +01:00