3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
12694 commits 305 branches 270 tags 779 MiB
Commit graph

12694 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Diego Prado Gesto
fd1c76ac80 Merged branch - CURA-4270 2017-09-13 13:25:00 +02:00
Diego Prado Gesto
aa2c7c2ff6 Checking first if the user has enabled the 'check for updates' preference - CURA-4224 2017-09-13 10:22:07 +02:00
Tim Kuipers
15790b3965 feat: cross 3d experimental algorithm parameters 2017-09-12 20:02:58 +02:00
Tim Kuipers
37ec3bbb26 cross pattern for support 2017-09-12 18:19:59 +02:00
Diego Prado Gesto
80992dd44c The checker now runs also when the user adds a new printer - CURA-4224 2017-09-12 17:22:17 +02:00
Lipu Fei
1fdf103678 Merge pull request #2388 from Velleman/master 
Added vertex delta k8800
 2017-09-12 16:24:25 +02:00
alekseisasin
6a9c7539c4 Merge branch 'feature_new_splash_window' 
CURA-4215
 2017-09-12 16:06:22 +02:00
Lipu Fei
a28264acae Adjust text positions and sizes 
CURA-4215
 2017-09-12 16:01:57 +02:00
alekseisasin
48cda42ece Adjusted scale factor 
CURA-4215
 2017-09-12 15:49:00 +02:00
ChrisTerBeke
9564b4753e Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-12 15:41:43 +02:00
ChrisTerBeke
fa72c47866 CURA-4203 update margins 2017-09-12 15:41:20 +02:00
Brecht Nuyttens
f054f0fafb Fixed minor stuff 2017-09-12 15:37:49 +02:00
fieldOfView
65a339ed3d Merge branch 'master' into feature_plate_shader 
# Conflicts:
#	resources/themes/cura/theme.json
 2017-09-12 15:09:57 +02:00
Brecht Nuyttens
1a2392cfa1 Fixed definition 2017-09-12 15:07:53 +02:00
fieldOfView
4c9028b3d0 Remove z-fighting kludge 
This was actually introducing z-fighting artefacts with the new shader and no added geometry.
 2017-09-12 15:06:06 +02:00
Mark
766bc9ae97 Changed bold fonts to normal 
CURA-4148
 2017-09-12 14:37:29 +02:00
ChrisTerBeke
4b0aa65ae5 Merge branch 'CURA-4318_themes_cleanup' 2017-09-12 13:42:45 +02:00
ChrisTerBeke
2ffc5d2b58 fix color swatch to be the same as layer view color swatch 2017-09-12 13:39:39 +02:00
ChrisTerBeke
3a098f4b4c CURA-4319 material compatibility link style 2017-09-12 13:24:33 +02:00
Ghostkeeper
53dbf1c55d
Remove switch_extruder_* settings from UM2+ 
UM2+ is a single-extrusion printer after all, so these settings aren't used.
 2017-09-12 13:21:59 +02:00
Ghostkeeper
6b08a435b3
Improve retraction settings for PVA 
These are new retraction settings as tested by the materials & processing team.
 2017-09-12 13:21:58 +02:00
ChrisTerBeke
9b33bc8194 CURA-4319 fix combobox hover states 2017-09-12 12:50:12 +02:00
ChrisTerBeke
073c2d3335 style and code improvements for combobox with color swatch 2017-09-12 12:11:23 +02:00
ChrisTerBeke
3f60bc9287 Cleanup combobox styling 2017-09-12 11:59:21 +02:00
Lipu Fei
1070e99ec2 Add message_border back 
CURA-4203

Sadly QtGraphicalEffects is not available in Qt 5.8, so we have to use
the less fancy border for message boxes.
 2017-09-12 11:52:19 +02:00
ChrisTerBeke
9e62c4db15 CURA-4318 remove active printer hover underline, theme inheritance, theme names 2017-09-12 11:39:48 +02:00
Ghostkeeper
14e10c6987
Move skin extra wall count from experimental to shell category 
Nobody sees any risk in this.
 2017-09-12 11:27:35 +02:00
Ghostkeeper
3fe75d9c95
Update default values of new settings 
These settings have now been tested and good defaults have been found for them.
 2017-09-12 11:24:49 +02:00
ChrisTerBeke
31339bca32 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-12 10:57:41 +02:00
ChrisTerBeke
8f2ee96f40 CURA-4203 message progress bar color dark 2017-09-12 10:27:07 +02:00
ChrisTerBeke
92617e2177 remove layerview toolbox arrow 2017-09-12 10:15:08 +02:00
ChrisTerBeke
7d719c4ab5 layer view toolbox height depending on color scheme mode 2017-09-12 09:54:24 +02:00
ChrisTerBeke
670d1784c4 Fix layer mode combobox hover not transparent 2017-09-12 09:45:45 +02:00
Lipu Fei
dfacde31b8 Merge pull request #2418 from eloipr/multiply_group_fix 
add ConvexHullDecorator when grouping
 2017-09-12 09:18:43 +02:00
ChrisTerBeke
7cc8656be3 Merge branch 'master' into CURA-4203-message-redesign 2017-09-12 09:13:37 +02:00
ChrisTerBeke
4143effbe1 only show slider track when layers are available 2017-09-12 09:13:16 +02:00
Lipu Fei
ed6adeabe9 Merge pull request #2416 from fieldOfView/fix_topbar_monitor_hover 
Fix hover state of Monitor button in the topbar
 2017-09-12 08:54:23 +02:00
Eloi Pardo
1aa46045af add ConvexHullDecorator when grouping 2017-09-12 08:42:17 +02:00
fieldOfView
ec6fa19d4e Updated copyright date 2017-09-11 23:49:16 +02:00
fieldOfView
6658e1a9ae Draw grid lines using shader 2017-09-11 23:41:10 +02:00
fieldOfView
a4aa134f25 Revert "Merge branch 'feature_grid_lines'" 
This reverts commit a0b7a2d165, reversing
changes made to db640c6f3d.

# Conflicts:
#	cura/BuildVolume.py
 2017-09-11 22:43:55 +02:00
fieldOfView
461d4be310 Fix hover state of Monitor button in the topbar 2017-09-11 20:35:24 +02:00
Tim Kuipers
be6dcdafbd lil: explicitly set cross infill density 2017-09-11 18:34:28 +02:00