Commit graph

84 commits

Author SHA1 Message Date
Tim Kuipers
779f66967e JSON fix: support speed was only enabled when roofs were enabled 2016-07-12 14:48:40 +02:00
Ghostkeeper
dc7ca47be9 Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 14:45:09 +02:00
Tim Kuipers
878bf35356 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-07-12 14:43:10 +02:00
Tim Kuipers
7d2ae57f86 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-07-12 14:41:10 +02:00
Tim Kuipers
94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge
Merge branch 'feature_firmware_travel_settings'  c755479b1b
overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version.

This commit is just fdmprinter.def.json as it was at 2c09fc4a67
2016-07-12 14:38:39 +02:00
Ghostkeeper
f63acc98b8
Fix setting enabling for support roof
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
2016-07-12 13:47:25 +02:00
Tim Kuipers
c755479b1b Merge branch 'feature_firmware_travel_settings' 2016-07-12 11:22:32 +02:00
Tim Kuipers
5d256e5e59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-11 16:44:04 +02:00
Tim Kuipers
2c09fc4a67 JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) 2016-07-11 16:43:55 +02:00
Jaime van Kessel
5638246fa2 Merge branch 'feature_cubic_isometric_infill' of github.com:Ultimaker/Cura 2016-07-11 14:40:54 +02:00
Ghostkeeper
f424097387
Improve defaults for raft settings
These better defaults and formulas are coming from Paul, one of our material testers.
2016-07-11 14:01:45 +02:00
fieldOfView
c01b7091c8 Wait until the nozzle temperature is reached before starting to print
CURA-1794
2016-07-09 18:14:16 +02:00
Jaime van Kessel
8a4ea5c710 Added warnings to top/bottom thickness if it exceeds machine height
CURA-1706
2016-07-08 15:26:41 +02:00
Ghostkeeper
21ae73fca0
Capitalise Euclidean dimension names
X, Y and Z.

Contributes to issue CURA-1816.
2016-07-08 11:53:58 +02:00
Tim Kuipers
6cdab33eb6 JSON fix: negative angles for conical overhang are possible (CURA-1412) 2016-07-07 23:59:19 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
91082404be JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:18:46 +02:00
Tim Kuipers
d6c25fcd10 JSON feat: infill mesh (CURA-833) 2016-07-07 21:04:23 +02:00
Tim Kuipers
7fc37e7a74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 15:18:57 +02:00
Tim Kuipers
101b22528b JSOn feat: nozzle startup prime location (CURA-1816) 2016-07-07 15:15:22 +02:00
Ghostkeeper
a65bb14329
Capitalise setting label
This is in line with the rest of the setting labels.
2016-07-06 12:56:05 +02:00
Tim Kuipers
f679b1ef68 JSON fix: merge went wrong: forgotten comma 2016-07-04 12:24:26 +02:00
Tim Kuipers
43f220278a Merge branch 'feature_retraction_settings_per_extruder' 2016-07-04 12:09:04 +02:00
Tim Kuipers
c8e61a3267 JSON feat: cubic isometric infill (CURA-1723) 2016-07-01 00:56:48 +02:00
Tim Kuipers
bcffa3f09a JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
just putting this commit under that issue so that it will be reviewed...
2016-07-01 00:39:04 +02:00
Tim Kuipers
4885238103 JSON feat: machine_min_cool_heat_time_window (CURA-1783) 2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
2016-06-28 17:28:44 +02:00
Jaime van Kessel
1543e4a6e0 Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura 2016-06-28 11:34:25 +02:00
Thomas Karl Pietrowski
fa36197574 CURA-1284: Changing icon for experimental category
Needs an icon in resources/themes/cura/icons
2016-06-27 23:21:07 +02:00
Tim Kuipers
214ffbb0bd JSON fix: all retraction settings now only retrievable per extruder (CURA-303) 2016-06-27 15:22:45 +02:00
Tim Kuipers
4eaf09e982 JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061)
making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value
2016-06-24 15:25:18 +02:00
Tim Kuipers
ccd97f1994 JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) 2016-06-24 13:29:40 +02:00
Tim Kuipers
b22d65c369 Merge branch 'master' into feature_zhop_over_other_material 2016-06-22 13:25:50 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings
Results from materials testing.
2016-06-21 12:57:33 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
2016-06-20 12:00:56 +02:00
Tim Kuipers
0f92f78916 JSON fix: z hop inheritance functions and default value (CURA-1506) 2016-06-17 17:26:23 +02:00
Tim Kuipers
611c88c630 JSON fix: lil indent (CURA-1506) 2016-06-17 16:52:04 +02:00
Tim Kuipers
94dcacb27e JSON feat: Z Hop only over printed parts and Z Hop Enable (CURA-1506) 2016-06-17 16:51:37 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
Tim Kuipers
1291587001 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-06-14 17:06:46 +02:00
Tim Kuipers
13fd588451 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-06-14 15:47:29 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
fieldOfView
18e69c7580 Add missing "enabled" functions for support_extruder_nr children
CURA-1278
2016-06-13 13:09:52 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Tim Kuipers
795291a117 fix/feat: introduced and fixed inheritance for all acceleration and jerk settings (CURA-1443) 2016-06-10 13:32:57 +02:00
Tim Kuipers
b2d57207a4 fix: global_only ==> settable_per_X for acceleration and jerk settings (CURA-1560 CURA-1443) 2016-06-10 13:20:55 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Tim Kuipers
b0198aedb0 JSON fix: line_width didn't supply any settable_per info (CURA-1558) 2016-06-09 17:27:20 +02:00
Tim Kuipers
959305ddf7 JSOn fix: removed buggy default:true for numeric values (CURA-1558) 2016-06-09 17:26:43 +02:00