GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-29 20:35:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,573 Commits 295 Branches 268 Tags
Commit Graph

2573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
e20691c421 Fleshing out of SettingOverrideDecorator 
CURA-1278
 2016-05-19 11:41:10 +02:00
Jaime van Kessel
7ec3ca6e75 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-19 11:25:47 +02:00
Jaime van Kessel
0e792e7a22 Added SettingOverrideDecorator stub 
CURA-1278
 2016-05-19 11:25:25 +02:00
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
3b5a74047b Add setting instance type for extruder 
This type is not included in the global stack structure yet since there is no global stack structure per extruder yet.

Contributes to issue CURA-1278.
 2016-05-18 17:53:43 +02:00
Arjen Hiemstra
b621958098 Fix uses of getValue after its removal from Uranium API 2016-05-18 16:45:44 +02:00
Jaime van Kessel
a5f8546d69 Fixed cases where getValue was still used. 
We now use getProperty instead

CURA-1278
 2016-05-18 16:29:57 +02:00
Ghostkeeper
afb7a45bb0
Translate ancient machine_nozzle_gantry_distance setting 
It was changed to gantry_height long ago but not updated in these definitions.

Contributes to issue CURA-1278.
 2016-05-18 11:48:43 +02:00
Ghostkeeper
a8fc830f2b
Translate ancient machine_head_shape settings 
It has been machine_head_polygon for a while.

Contributes to issue CURA-1278.
 2016-05-18 11:36:45 +02:00
Ghostkeeper
54c29187c9 Also use different speeds and coast volumes for UME+ variants 
I've discussed this with Paul and he confirms that they should also be different for Extended just like not-Extended.

Contributes to issue CURA-1278.
 2016-05-18 11:17:01 +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
dce4b71f63 Add variants for Ultimaker 2 Extended+ 
Contributes to issue CURA-1278.
 2016-05-18 11:17:01 +02:00
Ghostkeeper
25c9c95e10 Fix ID of Ultimaker 2 Extended+ 
It's no longer necessary to append '_base' to the ID of printers with variants.

Contributes to issue CURA-1278.
 2016-05-18 11:17:01 +02:00
Ghostkeeper
5ed881859d Fix ID of Ultimaker 2+ 
It's no longer necessary to append '_base' to the ID of printers with variants.

Contributes to issue CURA-1278.
 2016-05-18 11:17:01 +02:00
Ghostkeeper
cbf3fe0ddf Add variants for Ultimaker 2+ 
Contributes to issue CURA-1278.
 2016-05-18 11:17:01 +02:00
Jaime van Kessel
1578fdee98 Fixed minor errors in definitions 
CURA-1278
 2016-05-18 11:06:39 +02:00
Jaime van Kessel
8cab9afe66 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-18 11:04:12 +02:00
Jaime van Kessel
dafff9159e Added materials & qualities 
CURA-1278
 2016-05-18 11:03:44 +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
64c15eb876 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-18 10:28:29 +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
13726f1ec1
Use default_value instead of default 
D'oh.

Contributes to issue CURA-1278.
 2016-05-18 10:24:18 +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
a7f93b2a92
Add category to metadata 
Also forgot that. Good morning, Ghost.

Contributes to issue CURA-1278.
 2016-05-18 09:50:04 +02:00
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