GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,383 Commits 291 Branches 265 Tags
Commit Graph

10383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
241a7a4fb2 Make the robot bigger 
CURA-4215
 2017-09-14 14:56:45 +02:00
ChrisTerBeke
a37c2a5d74 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-14 14:55:06 +02:00
Lipu Fei
b9b273b1aa Update splash window 
CURA-4215
 2017-09-14 14:52:03 +02:00
ChrisTerBeke
fe004a733c CURA-4318 fix settings weights for abax printers 2017-09-14 13:56:54 +02:00
ChrisTerBeke
027cd2c695 CURA-4182 update settings weights for cartesio printer to get correct order in slider 2017-09-14 13:54:52 +02:00
ChrisTerBeke
46cd712367 back to rectangle 2017-09-14 13:37:20 +02:00
ChrisTerBeke
106047a864 Merge pull request #2422 from fieldOfView/fix_dark_theme 
Fix dark theme
 2017-09-14 13:29:22 +02:00
ChrisTerBeke
1f641979d6 Merge branch 'master' into fix_dark_theme 2017-09-14 13:29:15 +02:00
ChrisTerBeke
ff521a0b89 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-14 13:27:43 +02:00
ChrisTerBeke
acb709e804 Fix merge conflicts with #2422 2017-09-14 13:27:32 +02:00
ChrisTerBeke
f57fc6bb72 Merge branch 'master' into fix_dark_theme 2017-09-14 13:26:11 +02:00
Mark
84e2217276 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-14 13:19:43 +02:00
Mark
159c79ab4b Tweaked the margins to align better 
CURA-4182
 2017-09-14 13:17:35 +02:00
ChrisTerBeke
931232ed4d Merge branch 'new_firmware_notification' 2017-09-14 13:14:32 +02:00
ChrisTerBeke
648828e49e Merge branch 'new_firmware_notification' of https://github.com/Ultimaker/Cura into new_firmware_notification 2017-09-14 13:11:31 +02:00
ChrisTerBeke
17986aa4ad CURA-4318 add border to toolbar buttons in dark theme, outline fix for unknown printer status icon in dark theme 2017-09-14 13:04:29 +02:00
Lipu Fei
3812a478cf Only use lowercase for string comparison 
CURA-4224
 2017-09-14 12:50:55 +02:00
Lipu Fei
ccebadee10 Merge branch 'master' 2017-09-14 12:48:07 +02:00
ChrisTerBeke
af6e2dcb97 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-14 12:43:18 +02:00
ChrisTerBeke
3073fcf6f7 CURA-4318 add white icon for unknown printer status in dark theme 2017-09-14 12:43:07 +02:00
Ghostkeeper
4e915bc6b5
Merge branch 'fractal_3d_infill_alternate' 
Contributes to issue CURA-4095.
 2017-09-14 12:34:31 +02:00
Lipu Fei
d14ac9e258 Fix text overlapping problem for adhesion in recommended mode 
CURA-4322
 2017-09-14 12:08:27 +02:00
Lipu Fei
9683dcae72 Remose useless code 
CURA-4215
 2017-09-14 11:44:09 +02:00
Lipu Fei
7144720d78 Redesign splash window 
CURA-4215

- Rectangle splash window
- Fix for splash window crash
- Enable antialias
- Fix for longer loading text in some languages
 2017-09-14 11:36:27 +02:00
ChrisTerBeke
c2a3f5509b Merge branch 'master' into new_firmware_notification 2017-09-14 11:13:57 +02:00
ChrisTerBeke
6f512e9f97 Merge pull request #2423 from Ultimaker/feature_slider_for_quality 
CURA-4182 Slider for quality profile
 2017-09-14 11:09:38 +02:00
ChrisTerBeke
96c1e7ea8b CURA-4182 dark design fixes for quality slider 2017-09-14 10:58:22 +02:00
ChrisTerBeke
e7ad4b7f17 Merge branch 'master' into feature_slider_for_quality 2017-09-14 10:34:34 +02:00
ChrisTerBeke
9ec1d5d54a Add CuraEngine.exe to git ignore 2017-09-14 10:21:30 +02:00
ChrisTerBeke
c5c6ed8b2b CURA-4318 fix colors and layouts for dark design 2017-09-14 09:59:13 +02:00
Lipu Fei
5df5dfec02 Auto-adjust mode tab position based on text length 
CURA-4322
 2017-09-14 08:50:25 +02:00
Lipu Fei
a48507546f More defensive machine name and version check 
CURA-4224
 2017-09-14 08:34:01 +02:00
Lipu Fei
9567a6921d Fix code style 
CURA-4224
 2017-09-14 08:29:46 +02:00
Lipu Fei
be57ccb127 Minor fixes 
CURA-4224

 - Fix code style
 - Fix typos
 2017-09-13 17:44:53 +02:00
Lipu Fei
2e1c6abe0e Merge branch 'master' 2017-09-13 17:25:47 +02:00
Lipu Fei
3d6648fc59 Rearrange quality profile slider and dropdown box 
CURA-4182

- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
 2017-09-13 17:12:51 +02:00
Lipu Fei
d82a1daacf Add new quality/resolution slider 
CURA-4182
 2017-09-13 16:53:04 +02:00
Lipu Fei
84ad9c6ad1 Add "available" flag for quality profiles 
CURA-4182

Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
 2017-09-13 16:40:59 +02:00
fieldOfView
764514bb90 Subdue volume outline 2017-09-13 16:15:38 +02:00
fieldOfView
53d2b8ea97 Remove solid white background behind simple mode controls 2017-09-13 16:15:24 +02:00
fieldOfView
eed96473b1 Brighten z axis for readability on dark colors 2017-09-13 16:07:50 +02:00
fieldOfView
f2dbde0fe1 Fix readability of top bar buttons 2017-09-13 16:04:06 +02:00
fieldOfView
72b85fe69a Fix control hover/activefocus indication 2017-09-13 15:58:39 +02:00
fieldOfView
b0c7ade930 Fix logo readability 2017-09-13 15:50:30 +02:00
fieldOfView
a29bdf1ebc Move status icon to correct folder 2017-09-13 15:47:38 +02:00
fieldOfView
7b32ba7a9b Subdue buildplate colors 2017-09-13 15:45:48 +02:00
fieldOfView
f20f214379 Fix status unknown color and background 2017-09-13 15:39:36 +02:00
Mark
4ed5796e6f Small improvement on startupscreen 
CURA-4215
 2017-09-13 14:44:56 +02:00
alekseisasin
d0997f7f7e Merge branch 'master' of github.com:Ultimaker/cura 2017-09-13 13:58:39 +02:00
alekseisasin
204019702d Added Title for messages 
CURA-4203
 2017-09-13 13:58:08 +02:00