Commit graph

15419 commits

Author SHA1 Message Date
Tim Kuipers
a0838256e2 JSON fix: regular fan speed at layer inherit function was a bit off 2016-05-04 14:07:46 +02:00
Ghostkeeper
4ef9c1a3e7 Merge branch '2.1'
Conflicts:
	plugins/CuraEngineBackend/StartSliceJob.py
2016-05-04 13:43:35 +02:00
Jaime van Kessel
3705072c6f Merge pull request #733 from fieldOfView/feature_scale_tiny_meshes
Add a preference for scaling up tiny objects
2016-05-04 13:10:19 +02:00
Tim Kuipers
5a891a5fa2 JSON refactor: moved support z distance above support xy distance options (CURA-1479)
The support dist priority option may enable the xy dist overhang option, so it's logical to group it with the xy dist options, but it presumes you know about the support z distance, so it's more logical to put the x distance options above the xy distance options.
2016-05-04 11:46:42 +02:00
Tim Kuipers
fd871c35ca JSON feat: support_xy_overrides_z and support_xy_distance_overhang (CURA-1479) 2016-05-04 11:43:59 +02:00
fieldOfView
220939acbf Add a preference for scaling up tiny objects
When objects have been modeled with meters as units, they become so tiny that the cannot be selected in Cura to be scaled up.
2016-05-04 11:01:36 +02:00
Jaime van Kessel
c696525317 Updated inherit function to value (and in cases where there was implicit inheritance made it explicit)
CURA-1278
2016-05-03 11:38:59 +02:00
Jaime van Kessel
1eab26dcc0 Added invisible to metadata again
CURA-1278
2016-05-03 09:23:20 +02:00
Jaime van Kessel
ad506be34c Formatting
CURA-1278
2016-05-02 16:48:58 +02:00
Jaime van Kessel
9b1f560935 Removed last stray visible properties
CURA-1278
2016-05-02 16:47:15 +02:00
Jaime van Kessel
b4b24822bb First stub of reworked FDM printer
CURA-1278
2016-05-02 16:44:02 +02:00
Ghostkeeper
d8c53f7a1f
Fix manufacturer for uniqbot
These have to be Other for Ultimaker's marketing team.
2016-05-02 11:48:08 +02:00
fieldOfView
c73bdc3fb0 Clarify wording
The profile is not being altered; instead the current settings are set to a clean copy of the stored profile.

CURA-970
2016-05-02 09:58:48 +02:00
fieldOfView
614726a574 Fix codestyle
CURA-970
2016-05-02 09:39:55 +02:00
fieldOfView
b0f55058ed Fix showing the rename profile dialog when creating a new profile 2016-04-28 16:59:58 +02:00
fieldOfView
c9f3042b2c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-28 14:37:16 +02:00
fieldOfView
4939b935d2 Show profile name dialog after creating a profile
CURA-970
2016-04-28 14:36:29 +02:00
Tim Kuipers
a176c6a977 JSON: fix for support roof vs infill speed visiblity 2016-04-28 12:30:03 +02:00
Ghostkeeper
9db5373183 Merge pull request #725 from zerr0/uniqbot
Uniqbot by Unimatech machine profile
2016-04-28 11:39:48 +02:00
zerr0
bc350cfe28 machine_head_shape_* removed 2016-04-28 14:16:37 +05:00
fieldOfView
adb2c4c72e Make "Reset Current Profile" enabled for readonly profiles
CURA-970
2016-04-28 10:38:29 +02:00
fieldOfView
f6ce963b73 Add "Update Current Profile" and "Reset Current Profile" menu items to profile dropdowns
CURA-970
2016-04-28 10:29:51 +02:00
fieldOfView
d7aa8e71bf Rearrange nozzle/material selection into one line
In preparation for CURA-330, where we will need multiple instances of the nozzle/material combo.
2016-04-27 20:29:21 +02:00
fieldOfView
d34c28543b Connect extruder comboboxes with their settings
CURA-790
2016-04-27 11:49:25 +02:00
fieldOfView
4a2b1af9f5 Add reusable style for comboboxes to the theme
CURA-790
2016-04-27 10:28:58 +02:00
fieldOfView
6907c8921e Add (non-functional) extruder selection dropdown to simplemode for multi-extrusion printers
CURA-790
2016-04-27 10:20:11 +02:00
zerr0
3c7ff49be3 Uniqbot by Unimatech machine profile 2016-04-27 13:19:36 +05:00
fieldOfView
a20193a13b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-26 17:19:04 +02:00
fieldOfView
75f4a91800 Tweak button icon size to make the icons look a bit less "chunky" 2016-04-26 17:18:40 +02:00
Jaime van Kessel
4d11bdd366 Changed height
CURA-1429
2016-04-26 12:09:11 +02:00
Ghostkeeper
d65a0a302a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-26 12:00:24 +02:00
Ghostkeeper
fe68be4f62 Merge branch 'connection_rework' 2016-04-26 11:51:09 +02:00
fieldOfView
a2ff775c08 Limit the max_value for extruders to the number of extruders
CuraEngine would crash if instructed to use an extruder that it knows nothing about. Extruders start counting at 0, so max_value is set to machine_extruder_count - 1.

Fixes the crash outlined in CURA-965
2016-04-26 11:19:56 +02:00
Ghostkeeper
27aef006a8 Remove retraction settings from ulti-profile
Paul agreed, this should not be dependent on the quality. It was meant to allow a bit slower prints due to the time it takes to do a retraction, but that is not the bottleneck here. Material hardness is the bottleneck. Grinding is.

Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
c67ae0f1c9 Remove retraction settings from machine definitions
These should be different per material, not per machine.

Contributes to issue CURA-346.
2016-04-25 16:23:37 +02:00
Ghostkeeper
58d08f2b8d Change default retraction for nozzle switch
This should get overridden by the heat zone length anyway.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
b5f00ffd80 Removed superfluous override from UM2+ definition
The default is line_width * 2 but this defined it as machine_nozzle_size * 2. I talked it over with Tom (who added that line) and he said it was only copied from Paul's profiles. It should've been line width. Makes more sense. It's line_width * 2 so that it can go from an outer wall to the infill without retracting.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
Ghostkeeper
43dff1296c Move retraction distance to material settings
I've discussed this with Tom, Kristel, Diana, Marvin and Oscar. This setting should really be dependent on material since the material influences the speed it can handle the most.

Contributes to issue CURA-346.
2016-04-25 16:23:36 +02:00
fieldOfView
cde23edfed Prevent wizard pages from closing when they are "accepted" by pressing return.
Also removes some code replication in wizard pages.
CURA-1354
2016-04-25 13:51:22 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces
Contributes to issue CURA-695.
2016-04-20 17:18:10 +02:00
Tim Kuipers
6799a76a7c JSON fix: combing mode default enum value (CURA-694) 2016-04-20 15:25:23 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
fieldOfView
919e2f55e9 Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon
Contributes to CURA-1176
2016-04-18 17:39:28 +02:00
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +02:00
Jaime van Kessel
8a47903374 Changed namespace of usbprintermanager (QML) to Cura from UM
CURA-1339
2016-04-18 15:03:13 +02:00
Jaime van Kessel
8a94739de0 Raft line widths now inherit from line_width
CURA-695
2016-04-15 16:08:23 +02:00
Jaime van Kessel
ef9be8a2d8 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-15 14:56:24 +02:00
Tom Heijmans
7ce5c6c6bc Fixed inheritance issues 2016-04-15 14:36:13 +02:00
Tom Heijmans
00305f1c53 Updated inheritance functions for um2+ 2016-04-15 13:35:25 +02:00
Tom Heijmans
3776d3c6d2 Updated material & UM2+ profiles 2016-04-15 13:33:30 +02:00