Ghostkeeper
4ef9c1a3e7
Merge branch '2.1'
...
Conflicts:
plugins/CuraEngineBackend/StartSliceJob.py
2016-05-04 13:43:35 +02:00
Jaime van Kessel
4d11bdd366
Changed height
...
CURA-1429
2016-04-26 12:09:11 +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
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
Jaime van Kessel
c176c608d7
Added extra mm to UM2+ lower right disallowed area
...
CURA-1166
2016-04-06 17:23:11 +02:00
Jaime van Kessel
bfba095655
Updated disallowed areas for um2 & um2+
...
CURA-1166
2016-04-04 14:13:18 +02:00
Jaime van Kessel
2b8914ea46
Removed duplicate settings from machine profiles
...
CURA-1166
2016-04-01 16:39:32 +02:00
Tim Kuipers
3a3c7fbbc8
JSON: updated Olsson block heat zone length (CURA-1281)
2016-03-29 10:31:33 +02:00
Tim Kuipers
90e81de8cd
JSON: fixed gantry heights of Olsson block machines to match difference with UM2 nozzle (CURA-1281)
2016-03-24 14:19:53 +01:00
Tim Kuipers
178943aa59
JSON: introduce machine_heat_zone_length for Olsson block based on guessing (CURA-1281)
...
The heat zone length is only used in dual extrusion settings, which are unavailable for UM2+ and UM2 with olsson block
2016-03-24 14:11:10 +01:00
Tim Kuipers
7edb9ab3a0
JSON: introduce basic Olsson nozzle stats (CURA-1281)
2016-03-24 13:54:17 +01:00
Tim Kuipers
1f4763fca2
JSON: edit machine height based on longer olsson nozzle (CURA-1281)
2016-03-24 13:53:22 +01:00
Tim Kuipers
f7c842dabe
JSON fix: default retraction amount on UM2+ is 6mm (CURA-1195)
2016-03-23 14:02:10 +01:00
fieldOfView
dfef811821
Update UM2+, UM2Ex and UM2Ex+ backplates
2016-03-03 16:19:24 +01:00
Jaime van Kessel
e3a12919f0
Slightly increased size of head for um2+
...
Discussed this with HW department, size of um2+ head is slightly bigger.
CURA-900
2016-03-01 11:34:36 +01:00
Ghostkeeper
9233813768
Remove override settings from UM2+ machine settings
...
A lot of these settings were just normal tweaks, such as speed, which should be set in the profiles rather than the machine definition.
Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Ghostkeeper
0fc17ffda0
Move file types to machine metadata
...
Much better place than machine settings...
Contributes to issue CURA-611.
2016-02-09 15:25:49 +01:00
fieldOfView
9bd13cf9a7
Add JARJAR machine definitions from cura-private-data
2016-02-08 09:18:32 +01:00
Jaime van Kessel
414be1f851
Added ultimaker2 plus definitions
2016-01-22 11:37:18 +01:00
