3051 Commits

Author SHA1 Message Date
Ghostkeeper
34632a762a
Use default_value instead of default
Forgot this again. Good morning Ghostkeeper.

Contributes to issue CURA-1278.
2016-05-18 09:48:44 +02:00
Ghostkeeper
b635b07569
Translate definition for Ultimaker 2 Extended
Contributes to issue CURA-1278.
2016-05-18 09:47:15 +02:00
Jaime van Kessel
51e57b1f91 Added visibility meta data
CURA-1278
2016-05-18 09:44:53 +02:00
Jaime van Kessel
43d42405b2 Updated property names to new API
CURA-1278
2016-05-18 09:39:04 +02:00
Jaime van Kessel
a187747bdc prusa_i3_xl now inherits correct base file
CURA-1278
2016-05-18 09:35:05 +02:00
Arjen Hiemstra
9bfb98e75f Make ultimaker2 definition visible in the add machine dialog 2016-05-17 18:38:06 +02:00
Arjen Hiemstra
0664cbd2f6 Make sure to set the right type for the "current settings" instance container 2016-05-17 18:37:18 +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
da03eab355 Use default value rather than 'default'
Default is outdated.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
e13878b343 Translate definition for 3DMaker Starter
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
45382dc088 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
0298e3adca Use default value instead of value
Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
9aaa81be50 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
dc82a90047 Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:46:29 +02:00
Ghostkeeper
caa108c3cf Default value and overrides category
The settings must be in the 'overrides' category, not in the 'settings' category. Also, define a default value rather than a value.

Contributes to issue CURA-1278.
2016-05-17 17:45:13 +02:00
Ghostkeeper
d29e366945 Fix BQ Hephestos 2 definition
The settings were in the wrong category. They were defined by value instead of default value, and the metadata was in there double.

Contributes to issue CURA-1278.
2016-05-17 17:44:32 +02:00
Ghostkeeper
232e4fbe0d Put settings in overrides JSON category
Not in a subcategory of settings or anything.

Contributes to issue CURA-1278.
2016-05-17 17:43:28 +02:00
Ghostkeeper
ad1b08c080 Put settings in overrides JSON category
Not in a subcategory of settings or anything.

Contributes to issue CURA-1278.
2016-05-17 17:41:53 +02:00
Ghostkeeper
6c74350c6e Merge
Contributes to issue CURA-1278.
2016-05-17 17:40:56 +02:00
Ghostkeeper
2cf025c91a Translate definition for M180
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
8606961c3f Fix name of author
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
Ghostkeeper
f0e99122c7 Add definition for German RepRap Neo
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Ghostkeeper
20c7ce404d Add definition for BQ Witbox 2
Contributes to issue CURA-1278.
2016-05-17 17:39:20 +02:00
Jaime van Kessel
a2862d8c24 Moved offset to meta-data
CURA-1278
2016-05-17 16:49:59 +02:00
Jaime van Kessel
5c1210dddf Removed settings subobject in overrides
CURA-1278
2016-05-17 16:39:10 +02:00
Jaime van Kessel
f66f0658d9 Fixed mistakes in the definitions
CURA-1278
2016-05-17 15:45:21 +02:00
fieldOfView
c4c6be7c34 Improve code legibility
CURA-1543
2016-05-17 14:56:05 +02:00
Jaime van Kessel
884f2a7757 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-17 14:47:36 +02:00
Jaime van Kessel
ffcfba2caa Cura now handles saving of instances & stacks
This is done because Cura has a fundamentally different strategy for this than Uranium.

CURA-1278
2016-05-17 14:46:51 +02:00
Ghostkeeper
1c01eef409 Add definition for BQ Witbox
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
a16ff27ed6 Fix definition 'default' -> 'value'
Forgot that. Sorry.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
6449062332 Add definition for BQ Prusa i3 Hephestos XL
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
53c6ce11e7 Correct version number
I should've changed this when converting the definition.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
0b2b9bd332 Add definition for BQ Hephestos 2
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
b62e382cf2 Add platform for BQ Prusa i3 Hephestos
Forgot this one when converting it.

Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Ghostkeeper
0e5dcca81d Add definition for BQ Prusa i3 Hephestos
Contributes to issue CURA-1278.
2016-05-17 13:09:15 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception
CURA-1278
2016-05-17 12:55:40 +02:00
Ghostkeeper
f24b56dc85 Move author and file formats to metadata
The name can't be moved since it is not optional.

Contributes to issue CURA-1278.
2016-05-17 11:20:17 +02:00
Jaime van Kessel
12fd002e67 Active quality is now displayed (and changable) again
CURA-1278
2016-05-17 10:50:01 +02:00
Jaime van Kessel
59ec593db5 Added way to change active quality
CURA-1278
2016-05-17 10:49:06 +02:00
Jaime van Kessel
9bfe31aeef Added quality type to setting stack
CURA-1278
2016-05-17 10:39:10 +02:00
Jaime van Kessel
62cdde1a9b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-17 09:43:26 +02:00
Simon Edwards
442b9f2af3 Rename 'tmp' to something a bit more meaningful.
Contributes to CURA-1512
2016-05-17 09:43:14 +02:00