GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 22:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,030 Commits 290 Branches 260 Tags
Commit Graph

1842 Commits

Author SHA1 Message Date
Tim Kuipers
6cca612d7d JSON rename: Raft Interface ==> Raft Middle ; Raft Surface ==> Raft Top (CURA-1443) 2016-06-08 12:30:29 +02:00
Tim Kuipers
2b3efe4329 JSON fix: type boolean should be bool (CURA-1443) 2016-06-08 12:23:54 +02:00
Tim Kuipers
56b00ad425 JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560) 
removed:settable_globally: true
settable_per_meshgroup: true
settable_per_extruder: true when settable_per_mesh was also true
 2016-06-08 11:54:25 +02:00
Tim Kuipers
fc0a3c8347 JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally for fdmextruder settings (CURA-1558) 2016-06-07 18:30:30 +02:00
Tim Kuipers
406baf49af JSON feat: replaced global_only with four properties settable_per_[mesh|extruder|meshgroup] and settable_globally (CURA-1558) 2016-06-07 18:25:03 +02:00
fieldOfView
e33eb52e93 Hide Support Extruder in advanced mode when support is disabled 
CURA-1663
 2016-06-07 17:32:28 +02:00
Arjen Hiemstra
312097c523 Specify UMO as having materials 
Contributes to CURA-1612
 2016-06-04 21:21:24 +02:00
Arjen Hiemstra
65a563027d Specify preferred material/quality as wildcards 
This way it becomes a lot simpler to match them

Contributes to CURA-1612
 2016-06-04 21:19:05 +02:00
Ghostkeeper
1a30dd96b1
Change setting type for extruder_nr settings 
This way it can determine the difference between an integer and an index in the extruder list.

Contributes to issues CURA-1278.
 2016-06-02 16:09:10 +02:00
Arjen Hiemstra
6847365e09 Indicate the UM2+ should use machine specific materials and qualities 
Contributes to CURA-1612
 2016-06-02 08:10:55 +02:00
fieldOfView
ed3d01ed7b Add icon to Machine category to squelch some warnings 
CURA-1278
 2016-06-02 06:38:57 +02:00
Tim Kuipers
3953da7a50 JSON fix: support roof speed was visible when roof enabled but support not (CURA-1498) 2016-05-31 18:13:47 +02:00
Ghostkeeper
932eefeb0e Correct data type for extruder number setting 
This caused a crash. Stupid mistake.
 2016-05-30 17:05:15 +02:00
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443) 
for acceleration and jerk settings
 2016-05-30 14:54:33 +02:00
Tim Kuipers
d67bd1015e JSON fix: visible wasn't inside metadata (CURA-1443) 2016-05-30 14:50:09 +02:00
Tim Kuipers
6b5e72de72 JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443) 2016-05-30 14:42:01 +02:00
Tim Kuipers
4f793d2fc5 JSON fix: default ==> default_value for acceleration and jerk (CURA-1443) 2016-05-30 14:41:04 +02:00
Tim Kuipers
c80e3fa62a JSON fix: min_value ==> minimum_value (and for max) for acceleration and jerk settings (CURA-1443) 2016-05-30 14:37:57 +02:00
Tim Kuipers
871d4087b0 JSON refactor: moved dual extrusion acceleration and jerk settings to new .def.json (CURA-1443) 2016-05-30 14:32:58 +02:00
Tim Kuipers
0e7c34c883 JSON refactor: moved dual category to above meshfix (CURA-1443) 2016-05-30 14:32:15 +02:00
Ghostkeeper
19695a93b5
Move extruder trains to metadata 
Uranium doesn't know about extruder trains so it can't load that. Cura doesn't have access to anything outside of metadata or settings. So I'm putting it into metadata.

Contributes to issues CURA-1278 and CURA-351.
 2016-05-30 14:27:04 +02:00
Ghostkeeper
525f608b24 Remove reference to machine_extruder_count 
This setting is not defined in this definition so it can't find the value of it here. I've re-introduced the maximum_value statically in the Jedi implementations of this setting.

Contributes to issue CURA-1278 and CURA-351.
 2016-05-27 17:18:52 +02:00
Tim Kuipers
aa2d09aa08 JSON lil fix: superflious comma (CURA-1616) 2016-05-27 12:44:49 +02:00
Tim Kuipers
214d385dae fix: moved extruder definition settings to a new file fdmextruder.def.json (CURA-1616) 2016-05-26 17:11:41 +02:00
Jaime van Kessel
808f117785 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura 2016-05-25 15:44:08 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework' 
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
 2016-05-25 15:12:25 +02:00
fieldOfView
2683907121 Show Ultimaker Original and Ultimaker Original + in Add Machine wizard 
CURA-1278
 2016-05-25 13:57:16 +02:00
Arjen Hiemstra
24210246ee Add preferred variant, material and quality to UM2+ definition 2016-05-25 11:31:19 +02:00
Ghostkeeper
c996bcb191 Remove extruder drive upgrade option 
It was originally included with the thought that there would be different firmware for this, but there isn't. So this setting is not needed.

Contributes to issue CURA-1278.
 2016-05-23 17:19:18 +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
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
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
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
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