3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
10165 commits 313 branches 275 tags 718 MiB
Commit graph

10165 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lipu Fei
4507f6c8e2 Update job name prefix when machine is changed 
CURA-4305
 2017-09-11 12:39:59 +02:00
ChrisTerBeke
7efe3a3b9e Merge branch 'master' into feature_top_right_layer_view 2017-09-11 11:50:18 +02:00
Lipu Fei
a041d005fa Merge pull request #2335 from fieldOfView/fix_simple_mode_disabled_features 
Hide adhesion & support options if they are disabled
 2017-09-11 11:43:48 +02:00
ChrisTerBeke
9623ed75ac Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 11:36:04 +02:00
ChrisTerBeke
005b43cc5d CURA-4148 small fixes for layer view settings panel 2017-09-11 11:35:40 +02:00
Lipu Fei
08882a3f12 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:26:22 +02:00
Lipu Fei
f4bfa499d4 Remove debugging line 
CURA-4284
 2017-09-11 11:23:33 +02:00
Mark
a9cc10dd7b Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-11 11:21:41 +02:00
Mark
0a5744b74b Tweaked the update setting 
CURA-4301
 2017-09-11 11:21:31 +02:00
Lipu Fei
94a8d2dfc6 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:15:56 +02:00
ChrisTerBeke
98babfade7 CURA-4284 remove debug logging 2017-09-11 11:11:45 +02:00
Lipu Fei
e26be6b14a Merge remote-tracking branch 'master' 2017-09-11 11:11:24 +02:00
Lipu Fei
96678b11ca Update LayerView slider according to new style 
CURA-4212
 2017-09-11 11:10:56 +02:00
ChrisTerBeke
8a518ff610 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 10:56:41 +02:00
ChrisTerBeke
5c30658012 CURA-4284 fix relationship dependencies in per object settings 2017-09-11 10:56:34 +02:00
Lipu Fei
09bb090cd9 Change setting_control_text to almost black colour 
CURA-4148
 2017-09-11 10:53:17 +02:00
Lipu Fei
327c84d9ef Change tool panel and checkbox text colours 
CURA-4148

- Change tool panel background colour to white
- Change checkbox text colour to almost black
 2017-09-11 10:48:31 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master 
CURA-4212
 2017-09-11 10:32:34 +02:00
Lipu Fei
f50255f1c9 Disable relative_extrusion for UMs 
CURA-4219
 2017-09-11 10:27:13 +02:00
Lipu Fei
ab6d90d0a7 Merge pull request #2308 from smartavionics/mb-relative-extrusion 
Add relative_extrusion setting to special modes category.
 2017-09-11 10:20:45 +02:00
ChrisTerBeke
5bb09d73fc clean 2017-09-11 09:46:37 +02:00
ChrisTerBeke
2d8fca8ac4 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 09:14:56 +02:00
ChrisTerBeke
d802c0bd26 CURA-4284 some code cleanup while debugging 2017-09-11 09:14:50 +02:00
Lipu Fei
546dc9ff4d Better positioning for the material circle in the ExtruderButton 2017-09-11 08:49:07 +02:00
Ruben D
1e3cfc56be
Revert "CuraApplication: Minor pep8 fix" 
This reverts commit ee1ba30d0e.
 2017-09-10 16:55:24 +02:00
Ruben D
234e724fe9
Merge branch 'fix_abort_sequence' of https://github.com/fieldOfView/Cura into fieldOfView-fix_abort_sequence 2017-09-10 15:10:11 +02:00
Ruben D
32c5583a3d
Reduce minimum jerk value to 0 
A jerk of 0 is very possible, because Jerk in 3D printing doesn't mean the derivative of acceleration but rather the maximum instantaneous change in velocity on an axis.

Fixes #2338.
 2017-09-10 13:52:27 +02:00
Mark
41ab160e62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-08 16:35:17 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended 
CURA-4148
 2017-09-08 16:35:08 +02:00
Diego Prado Gesto
b3a01d5fcc Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-08 16:22:53 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
fieldOfView
0896899179 Merge branch 'master' into fix_simple_mode_disabled_features 2017-09-08 14:24:05 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
c8b199c8f7 Merge pull request #2393 from Ultimaker/feature_change_icons_margins 
CURA-4148: Change icons and margins
 2017-09-08 13:50:16 +02:00
Mark
a485781900 Add new unknown icon 
CURA-4148
 2017-09-08 13:06:08 +02:00
Mark
8264b6fe67 Fix default action_button color and checkbox onHover color 
CURA-4148
 2017-09-08 11:58:24 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons 
CURA-4148
 2017-09-08 11:56:37 +02:00
Lipu Fei
c8a92f2c59 Move LayerView slider down 
CURA-4212
 2017-09-07 17:04:14 +02:00
Lipu Fei
c59bd6cc09 Change LayView Mode button to a dropdown 
CURA-4212
 2017-09-07 16:24:49 +02:00
Lipu Fei
750f1ce158 Make extruder icons on LayerView panel round 
CURA-4212
 2017-09-07 16:24:48 +02:00
Lipu Fei
d89fc220fc Make LayerView panel vertically longer 
CURA-4212
 2017-09-07 16:24:47 +02:00
Lipu Fei
dd62367937 Move View mode button and LayerView panel to top right 
CURA-4212
 2017-09-07 16:24:43 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching 
CURA-4276
 2017-09-06 18:09:19 +02:00
alekseisasin
c614f02d0f Fixed settings update. After each change in the settings the build volume was rebuilding 
CURA-4271
 2017-09-06 16:58:17 +02:00
Lipu Fei
b239eb9eaf No extruder numbers for per-object settings 
CURA-4284
 2017-09-06 16:35:58 +02:00
Lipu Fei
40b60a2d95 Fix colour for LayView panel and per object settings panel 
CURA-4148
 2017-09-06 16:23:29 +02:00
Lipu Fei
8010fa9c85 White background for checkboxes 
CURA-4148
 2017-09-06 16:09:25 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Lipu Fei
1dd5f7b0ee Update machine state icons 
CURA-4148
 2017-09-06 16:04:31 +02:00