3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
18800 commits 306 branches 270 tags 786 MiB
Commit graph

8170 commits

Author SHA1 Message Date
Jack Ha
72b3dffa22 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 15:48:41 +02:00
Jack Ha
8304f17efd Fix updating resolved values when changing material. Contributes to CURA-2159 2016-09-12 15:48:30 +02:00
Jaime van Kessel
e5dd54008c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:57:39 +02:00
Jaime van Kessel
b21684c079 Added missing global_extruder_nr for few settings 
CURA-2308
 2016-09-12 14:57:11 +02:00
Jaime van Kessel
cd56f22321 Merge branch 'bugfix_global_inherits_stack' of github.com:Ultimaker/Cura 2016-09-12 14:52:11 +02:00
Jack Ha
2cde439964 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 14:40:41 +02:00
Jack Ha
d173952a3a Update materialmenu when changing material type. Contributes to CURA-2159 2016-09-12 14:40:32 +02:00
Jaime van Kessel
b17f8b5dd6 Added min width & height to machine action popup. 2016-09-12 14:38:23 +02:00
Jack Ha
1e0394fb48 Cleanup, forgot to remove debugging stuff. Contributes to CURA-2159 2016-09-12 14:22:23 +02:00
Jack Ha
78c119dbde Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-12 13:55:14 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jaime van Kessel
31bc3d2575 Added maintenance state to display qml 
CURA-2235
 2016-09-12 13:38:30 +02:00
Ghostkeeper
12b967ddb2
Remove debug code 
Don't know who it was or why or when, but it shouldn't be there.
 2016-09-12 12:58:35 +02:00
fieldOfView
8930eae9cd Allow plugins to add additional components to print monitor buttons 
CURA-2277
 2016-09-12 10:38:09 +02:00
fieldOfView
55c0095b30 Allow plugins to add additional components to Machines detail pane 
CURA-2276
 2016-09-12 10:35:00 +02:00
Ghostkeeper
93d9b98cf5
Merge branch 'master' of https://github.com/Apsu/Cura into Apsu-master 2016-09-12 09:30:54 +02:00
Ghostkeeper
22b890387b
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 15:59:28 +02:00
Tim Kuipers
43bcd75562 JSON fix: support_interface_enable caused circular dependency (CURA-2308) 2016-09-09 15:51:36 +02:00
Tim Kuipers
8341a01412 JSON fix: retrieve extruderValue(.) from specific extruder rather than support_extruder_nr (CURA-2308) 2016-09-09 15:35:19 +02:00
Jaime van Kessel
c254737e25 Simplified the pause code 
Now always follow the states of the remote (instead of using states that can get out of sync)

CURA-2060
 2016-09-09 14:41:30 +02:00
Tim Kuipers
dd98efb844 JSON fix: global_inherits_stack for all per mesh support settings are now fixed (CUEA-2308) 2016-09-09 14:29:03 +02:00
Tim Kuipers
94bee02995 fix: make global_inherits_stack settings which are retrieved from specific extruder in engine (CURA-2308) 2016-09-09 13:35:00 +02:00
Tim Kuipers
791042dcb8 fix: skirt/brim line width and minimal length are retrieved for each extruder (CURA-2308) 2016-09-09 13:24:39 +02:00
Jaime van Kessel
ec587eb0dd If a combination material does not like the setup, we now mark it in red. 
CURA-2271
 2016-09-09 11:59:55 +02:00
Jaime van Kessel
e0b6e31056 Added way to mark toolbutton as error aswell 
CURA-2271
 2016-09-09 11:48:01 +02:00
Ghostkeeper
b5eb7916c7
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:57:51 +02:00
Apsu
b3f4b08f56 Add gantry height and extruder assembly dimensions 2016-09-08 12:22:29 -05:00
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
501afc3f2e Change UM2Ex+ definition to inherit qualities from UM2+ 
CURA-1780
 2016-09-08 18:50:39 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from 
CURA-1780
 2016-09-08 18:49:34 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Tim Kuipers
6197a5b77a feat: support_interface_skip_height (CURA-2052) 2016-09-08 16:21:34 +02:00
Tim Kuipers
84fb59a0f3 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 16:19:06 +02:00
Tim Kuipers
750018003d removal: made support_area_smoothing hardcoded (CURA-2296) 2016-09-08 15:39:33 +02:00
Jaime van Kessel
45a841a52b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 14:15:54 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers 
CURA-2242
 2016-09-08 14:15:00 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
Ghostkeeper
557e52e514
Update outdated setting name 
This setting name was changed, but apparently not everywhere.
 2016-09-08 13:06:03 +02:00
fieldOfView
8b2e652011 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 11:56:23 +02:00
fieldOfView
bb92c0d7fa Fix units for density and diameter 2016-09-08 11:56:11 +02:00
Ghostkeeper
ea4333b802
No longer disable Nylon by default 
It prints fine on most printers. Just allow people to select it. (And other secret reasons.)
 2016-09-08 11:51:46 +02:00
fieldOfView
a11e2a56a6 Fix densities of Nylon, PC & TPU 2016-09-08 09:21:50 +02:00
fieldOfView
b921540703 Remove superfluous margin left by hidden settings 
Each setting that was made visible, but was disabled due to the value of another setting, would leave a 1 px margin (eg settings in the support category when support was not enabled). Hidden settings now eat that margin, leaving nothing behind.
 2016-09-08 08:58:40 +02:00
fieldOfView
29edcb9058 Style MessageStack making messages less likely to be overlooked 
CURA-1886
 2016-09-08 08:48:58 +02:00
Apsu
0f3eb7d85d Update to reorganized version 2016-09-07 23:06:16 -05:00
Apsu
3988667b69 Add Prusa i3 Mk2 definition 2016-09-07 22:54:23 -05:00
Jaime van Kessel
895cf40ab0 Only show dual category if there is more than one extruder 2016-09-07 17:31:45 +02:00
fieldOfView
15101ec53d Fix showing material options for 3rd party printers 
CURA-2287
 2016-09-07 15:52:44 +02:00
Jaime van Kessel
ee55e03911 Added max size to prime tower 
CURA-2234
 2016-09-07 15:46:12 +02:00
fieldOfView
bf394a42d5 Fix UMO-DualExtrusion prime tower location 
CURA-2283
 2016-09-07 15:26:51 +02:00