GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-21 05:35:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,734 Commits 295 Branches 268 Tags
Commit Graph

14353 Commits

Author SHA1 Message Date
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling 
Make the general settings page options draggable only vertically
 2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly 
The Label style property should not be confused with e TextField style property
 2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed' 
Contributes to issue CURA-3491.
 2017-04-25 16:46:30 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar 
Contributes to CURA-3577
 2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio 
Contributes to CURA-3577
 2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button 
Contributes to CURA-3577
 2017-04-25 16:09:51 +02:00
Lipu Fei
268a9c9bac Add priming_enabled option into fdm_printer 
CURA-3634
 2017-04-25 16:07:32 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern 
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
 2017-04-24 17:31:07 +02:00
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu 
Add Extruders to Context Menu and Refactor
 2017-04-24 14:55:57 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings 
This was deemed the most logical ordering.

Contributes to issue CURA-3491.
 2017-04-24 14:28:10 +02:00
Arjen Hiemstra
bca27ad11f Document findItemIndex function in ContextMenu 2017-04-24 13:13:00 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection 
This matches more closely with the naming of the other selection
actions.
 2017-04-24 13:12:00 +02:00
MaukCC
dff23b0e82 Update cartesio_0.8.inst.cfg 2017-04-24 11:06:34 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction 
... to match other scrollviews. Fixes #1723
 2017-04-22 23:07:13 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
MaukCC
36eb3579a9 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 11:30:49 +02:00
MaukCC
ad4c696202 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 11:30:39 +02:00
MaukCC
d2a948fb5c Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 11:30:15 +02:00
MaukCC
39ac11df59 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 11:30:09 +02:00
MaukCC
d5190b7cf7 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:33:45 +02:00
MaukCC
2b31aab28c Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:33:38 +02:00
MaukCC
25ff28041f Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:33:30 +02:00
MaukCC
d756ea5021 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:33:21 +02:00
Victor Larchenko
e5eb0c9a14 Merge remote-tracking branch 'um/master' into theme-picker 2017-04-21 14:29:01 +06:00
MaukCC
319690baa6 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:27:05 +02:00
MaukCC
7e426f96fb Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:26:39 +02:00
MaukCC
c80b51ddc9 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:26:28 +02:00
MaukCC
081505e967 Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:26:02 +02:00
MaukCC
17408a299f Update cartesio_global_Coarse_Quality.inst.cfg 2017-04-21 10:19:44 +02:00
MaukCC
c160e4c5d6 Update cartesio_global_Extra_Coarse_Quality.inst.cfg 2017-04-21 10:19:38 +02:00
MaukCC
633c4b87e4 Update cartesio_global_High_Quality.inst.cfg 2017-04-21 10:19:30 +02:00
MaukCC
ea56830880 Update cartesio_global_Normal_Quality.inst.cfg 2017-04-21 10:19:21 +02:00
MaukCC
c75a2941be Add files via upload 2017-04-21 10:07:25 +02:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
dd73c53ece Introduce center and multiply actions that work on the entire selection 
Instead of working on a single object.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
06cc0e9a63 Move the ContextMenu to its own file 
Contributes to CURA-3609
 2017-04-20 17:39:43 +02:00
MaukCC
6ecd780bea Update cartesio.def.json 2017-04-20 14:47:43 +02:00
MaukCC
ec866fde10 Update cartesio_extruder_0.def.json 2017-04-20 14:44:41 +02:00
MaukCC
0405e3eac0 Update cartesio_extruder_1.def.json 2017-04-20 14:44:31 +02:00
MaukCC
8e6eb1430a Update cartesio_extruder_2.def.json 2017-04-20 14:44:23 +02:00
MaukCC
f6d96d2dd8 Update cartesio_extruder_3.def.json 2017-04-20 14:44:01 +02:00
MaukCC
10233b2c02 Update cartesio.def.json 2017-04-20 11:53:05 +02:00
MaukCC
47aa044f7c Update cartesio.def.json 2017-04-20 11:33:36 +02:00