GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 10:35:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,051 Commits 294 Branches 267 Tags
Commit Graph

3051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
85ce8a719e Merge local with origin 
Contributes to issue CURA-1278.
 2016-05-20 16:22:10 +02:00
Ghostkeeper
7cc62db81d Increment XRayView API number 
This plug-in still works, so this can be incremented without trouble.

Contributes to issue CURA-1278.
 2016-05-20 16:22:10 +02:00
Jaime van Kessel
e9380ba83d Added rudimentary display of settings again 
CURA-1278
 2016-05-20 15:08:17 +02:00
Jaime van Kessel
bcff683fb0 Removed old perobject setting code, so plugin is actually loaded (instead of crashing) 
CURA-1278
 2016-05-20 14:15:06 +02:00
Jaime van Kessel
846dbc881e Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-20 14:10:44 +02:00
Jaime van Kessel
295cea338c Translate tool is now no longer stopped by ton of errors 
CURA-1278
 2016-05-20 14:09:58 +02:00
Jaime van Kessel
305cb27ac0 Global_only is now a string, as the filtering does not work with settingFunctions 
CURA-1278
 2016-05-20 13:35:38 +02:00
Ghostkeeper
8e3d6cf2b5
Repair x and y nozzle offsets 
The setting name is different. This probably wasn't updated for a while.

Contributes to issue CURA-1278.
 2016-05-20 13:34:47 +02:00
Ghostkeeper
7656f5a19b
Make definition of machine_extruder_drive_upgrade 
This setting is specific to UMO, so I'm defining it in the UMO definition.

Contributes to issue CURA-1278.
 2016-05-20 13:30:19 +02:00
Ghostkeeper
6fe70fc7e9
Add definition for machine_use_extruder_offset_to_offset_coords 
While this was only used by Ultimaker printers, it is not specific to Ultimaker's printers so I'm putting the definition in FDMPrinter.

Contributes to issue CURA-1278.
 2016-05-20 13:28:05 +02:00
Ghostkeeper
9dc70fba02
Add missing category-metadata 
Forgot to add this, apparently.

Contributes to issue CURA-1278.
 2016-05-20 12:42:18 +02:00
Jaime van Kessel
66c656f7dc Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-20 12:02:07 +02:00
Ghostkeeper
688ea815be Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-20 11:48:37 +02:00
Jaime van Kessel
2fa24edc1f Fixed type for global_only property 
CURA-1278
 2016-05-20 11:29:48 +02:00
Ghostkeeper
2696f883b0
Add a bit of documentation 
I was going further with this, but then it was decided that we need to do this later but I won't throw away this bit of documentation when I have it anyway.

Contributes to issue CURA-1278.
 2016-05-19 16:31:29 +02:00
fieldOfView
570910187f Fix typo in method name 
CURA-1278
 2016-05-19 16:27:51 +02:00
Arjen Hiemstra
4de0a208d1 Fix version number and remove beta tag in Changelog 
Fixes CURA-1575
 2016-05-19 14:52:11 +02:00
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
Ghostkeeper
3313286ea9 Update OSX log location 
Changed in 9cc1430579
 2016-05-18 16:36:52 +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
222d8ba828 Merge branch '2.1' 2016-05-18 12:46:07 +02:00
Ghostkeeper
14f860f8ae
Also change default raft fan speed for subsettings 
Contributes to issues PL-162, PL-163, PL-164 and PL-165.
 2016-05-18 12:39:39 +02:00
Ghostkeeper
cad6d87a0c
Change inheritance for initial layer z overlap 
This makes the defaults more accurate. The overlap is a little bigger now.

Contributes to issues PL-162, PL-163, PL-164 and PL-165.
 2016-05-18 12:36:22 +02:00
Ghostkeeper
fa81604b89
Set default raft fan speed to 0 
This makes layer adhesion better.

Contributes to issues PL-162, PL-163, PL-164 and PL-165.
 2016-05-18 12:34:10 +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