Commit graph

376 commits

Author SHA1 Message Date
Ghostkeeper
6b0a33e166 Move dual extrusion settings into FDMPrinter
This involves making labels and descriptions for some dual-extrusion machine settings, and default values for everything, making sure inheritance is correct, etc.

Contributes to issue CURA-1278.
2016-05-18 17:53:43 +02:00
Ghostkeeper
1e1aec5746 Remove superfluous variants
These are now in the resources/variants folder in the translated form.

Contributes to issue CURA-1278.
2016-05-18 11:17:01 +02:00
Ghostkeeper
4e3e466a11
Move platform offset to metadata
Also removed the setting from fdmprinter just to be clear.

Contributes to issue CURA-1278.
2016-05-18 10:34:28 +02:00
Ghostkeeper
07fea431c7
Translate definition for Uniqbot One
Contributes to issue CURA-1278.
2016-05-18 10:28:23 +02:00
Ghostkeeper
39907c23db
Translate definition for Ultimaker Original+
Contributes to issue CURA-1278.
2016-05-18 10:25:03 +02:00
Ghostkeeper
7714d6f720
Translate definition for Ultimaker Original
Contributes to issue CURA-1278.
2016-05-18 10:21:30 +02:00
Ghostkeeper
2b47fc738b
Translate definition for Ultimaker 2+
I've translated the inherit functions as values.

Contributes to issue CURA-1278.
2016-05-18 10:16:54 +02:00
Ghostkeeper
d0c9b96416
Translate definition for Ultimaker 2 Go
Contributes to issue CURA-1278.
2016-05-18 09:57:25 +02:00
Ghostkeeper
4947dfffb8
Translate definition for Ultimaker 2 Extended+
It remains to be seen what we do with the variants of this machine and consequently the visibility of this machine.

Contributes to issue CURA-1278.
2016-05-18 09:52:54 +02:00
Ghostkeeper
b635b07569
Translate definition for Ultimaker 2 Extended
Contributes to issue CURA-1278.
2016-05-18 09:47:15 +02:00
Ghostkeeper
de7fe1185e Translate definition for Ultimaker2
The extruder trains setting has been moved to dual_extrusion_printer.json. It must be merged into fdmprinter later.

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
f15445b1a3 Translate definition for Ultimaker
The preferred variant/profile/material has moved to the metadata.

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
eb11067d15 Translate definition for RigidBotBig
Also translated the very old active_if properties!

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
35dda003c7 Translate definition for RigidBot
Also translated the very old active_if properties!

Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
319eef1384 Translate definition for Prusa i3 XL
Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
28703981d5 Translate definition for Prusa i3
Contributes to issue CURA-1278.
2016-05-17 17:46:30 +02:00
Ghostkeeper
e13878b343 Translate definition for 3DMaker Starter
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
2cf025c91a Translate definition for M180
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
8cf05fd2fc Remove old machine definitions
These have already been translated. I should've added these to their respective commits, I guess.

Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
fea09482b5 Translate definition for Innovo INVENTOR
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Jaime van Kessel
6dc7476839 Removed final parent_value from functions
CURA-1278
2016-05-09 15:45:58 +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
Tim Kuipers
a176c6a977 JSON: fix for support roof vs infill speed visiblity 2016-04-28 12:30:03 +02:00
zerr0
bc350cfe28 machine_head_shape_* removed 2016-04-28 14:16:37 +05:00
zerr0
3c7ff49be3 Uniqbot by Unimatech machine profile 2016-04-27 13:19:36 +05: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
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
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
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +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
Tim Kuipers
77e719619d JSON fix: indentation only (CURA-1400) 2016-04-14 14:02:26 +02:00
Tim Kuipers
cd7513971b JSON fix: support&platform extruder nr not children of extruder nr (CURA-1400) 2016-04-14 14:01:56 +02:00
Tim Kuipers
7ea02f9d98 JSON fix: Infill Overlap mm didn't default to 0 when infill was too dense (CURA-786) 2016-04-14 13:50:40 +02:00
Tim Kuipers
f426ba3168 changed infill overlap min_value to min_value_warning and made it -50% (CURA-786)
-50% corresponds to the value where the hole in the nozzle just at the boundary of the inner wall
2016-04-14 13:33:00 +02:00
Tim Kuipers
401e020f9c machine extruder trains now can't be an array anymore (CURA-494) 2016-04-14 13:18:40 +02:00
fieldOfView
5c723cc9d6 Fix string comparison in fdmprinter.json
CURA-1394
2016-04-14 11:49:46 +02:00
Ghostkeeper
7435010dd4
Code style: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:59:48 +02:00
Ghostkeeper
f222c870f1
Codestyle: No whitespace at end of line
Contributes to issue CURA-494.
2016-04-13 15:56:56 +02:00