GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 09:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

4678 Commits

Author SHA1 Message Date
Simon Edwards
9e6f340943 Move z hop settings to Travel category 
CURA-2727
 2016-10-18 15:49:03 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
nickthetait
1bc2f1e189 More formatting updates 2016-10-13 08:11:15 -06:00
nickthetait
bf331f39af Merge branch 'um-master' into gh-issue-980 
Conflicts:
	resources/definitions/fdmprinter.def.json
 2016-10-13 08:01:00 -06:00
Ghostkeeper
ce6e3982fe
Make resolve function of bed temperature use max 
We want the bed to have the highest temperature of the two. This causes some melting for softer materials, but it is required for harder materials to stick to the build plate.
 2016-10-13 13:15:16 +02:00
Ghostkeeper
0a39802cb2
Fix resolve function of support_type 
It was not quoted, so it interpreted it as a variable.
 2016-10-12 16:09:15 +02:00
Arjen Hiemstra
50390dae03 Replace all instances of "layer_height" in functions with resolveOrValue 
Since we have layer_height in quality profiles (and cannot remove it) we
need to handle this. It turns out using resolveOrValue is a quick fix.

Fixes CURA-2604
 2016-10-11 16:03:57 +02:00
Tim Kuipers
63afe917e5 JSON fix: combing mode has link icon now (CURA-2568) 2016-10-11 14:08:10 +02:00
Ghostkeeper
62d6b1fcdd
Adjust max warning for coasting volume 
It now depends on the machine nozzle size.

Contributes to issue CURA-905.
 2016-10-06 16:06:14 +02:00
Tim Kuipers
aaaf1dfc58 JSOn fix: cap extruder switch retraction speed to machine_max_feedrate_e (CURA-905) 
just like the normal retraction speeds.
 2016-10-06 15:08:17 +02:00
Tim Kuipers
7e8ce98f48 JSON fix: typo (CURA-905) 2016-10-06 12:15:57 +02:00
Tim Kuipers
e63b572417 JSON fix: fixed raft warnings flawed logic (CURA-905) 
For layer_0_z_overlap we are only sure to overextrude when the overlap is more than the airgap.

Layer height warnings are now based on line widths for raft, because the line widths are way larger than the nozzle size.
 2016-10-06 12:13:47 +02:00
Tim Kuipers
edd06f860a JSON fix: retractions speed warnings and raft margin warning based on likely possible testing values (CURA-905) 2016-10-06 12:11:40 +02:00
Jaime van Kessel
e4c6b58611 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 14:08:10 +02:00
Tim Kuipers
93186dedd0 JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +02:00
Jaime van Kessel
2e9fa7ece1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:04:06 +02:00
Ghostkeeper
3b6d8f40aa
Also hide support interface line width if support is disabled 
Also, the extruderValue call is superfluous since the setting is already limited to this extruder.
 2016-10-04 11:00:29 +02:00
Tim Kuipers
6240baaaca JSON fix: better warning formulas (CURA-905) 2016-10-03 17:56:03 +02:00
Tim Kuipers
9b342a9a3e JSON fix: removed circular dependency (CURA-905) 2016-10-03 17:35:28 +02:00
Tim Kuipers
2513c64d7d JSON fix: more feasible warnings (CURA-905) 2016-10-03 17:29:25 +02:00
Tim Kuipers
4e4171fc53 JSON fix: resolveOrValue for support_type (CURA-2410) 2016-10-03 14:52:33 +02:00
Tim Kuipers
4c46985c75 JSON fix: resolveOrValue for retraction_combing (CURA-2410) 2016-10-03 14:51:28 +02:00
Tim Kuipers
91bed05d63 JSON fix: resolveOrValue for prime_tower_size (CURA-2410) 2016-10-03 14:50:20 +02:00
Tim Kuipers
dee434b958 JSON fix: resolveOrValue for ooze_shield_enalbed (CURA-2410) 2016-10-03 14:49:01 +02:00
Tim Kuipers
c7fbaa9fb8 JSON fix: resolveOrValue for layer_height_0 (CURA-2410) 2016-10-03 14:46:36 +02:00
Tim Kuipers
8696d2ff34 JSON fix: resolveOrValue for jerk_enabled (CURA-2410) 2016-10-03 14:44:14 +02:00
Tim Kuipers
6564ada60d JSON bugfix: prusa i3 had wrong adhesion setting (CURA-2410) 2016-10-03 14:42:14 +02:00
Tim Kuipers
16a07a3c3e JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410) 2016-10-03 14:41:09 +02:00
Tim Kuipers
8363f40a2f JSON fix: resolveOrValue for acceleration_enabled (CURA-2410) 2016-10-03 14:35:31 +02:00
Tim Kuipers
b722a6260c JSON fix: new resolve functions (CURA-2410) 2016-10-03 14:34:49 +02:00
Tim Kuipers
d4d8ab6fad JSON: refine dual settings warning formulas (CURA-905) 2016-09-30 18:13:18 +02:00
Tim Kuipers
dbb472436d JSON: refine raft settings warning formulas (CURA-905) 2016-09-30 18:03:52 +02:00
Tim Kuipers
61d9ee9241 JSON: refine skirt/brim settings warning formulas (CURA-905) 2016-09-30 17:56:56 +02:00
Tim Kuipers
2e24cddbc7 JSON: refine support settings warning formulas (CURA-905) 2016-09-30 17:46:09 +02:00
Tim Kuipers
e12e8e3d2e JSON: refine material settings warning formulas (CURA-905) 2016-09-30 17:20:00 +02:00
Tim Kuipers
bab01b9ca2 JSON: refine infill settings warning formulas (CURA-905) 2016-09-30 16:55:28 +02:00
Tim Kuipers
163b8a4256 JSON: refine shell settings warning formulas (CURA-905) 2016-09-30 16:50:39 +02:00
Tim Kuipers
4ad36e94c5 JSON: refine line width warning formulas (CURA-905) 2016-09-30 16:45:40 +02:00
Tim Kuipers
1cef991082 JSON fix: don't perform Outer Wall inset when printing the outer wall firt (CURA-2446) 2016-09-30 16:35:56 +02:00
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
Tim Kuipers
b7ca569b84 JSON fix: prime_tower_wipe_enabled is now true by default (CURA-2420) 2016-09-29 12:09:31 +02:00
Jaime van Kessel
1f830e68bb Min & max values for extruder prime pos are now enforced for Ultimaker machines 
CURA-2375
 2016-09-27 16:12:02 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Tim Kuipers
9e128aae69 JSON fix: raft_margin had no settable_per information (CURA-2282) 2016-09-21 11:37:21 +02:00
Tim Kuipers
1eabf85eb0 JSON fix: accidental comma 2016-09-20 13:43:02 +02:00
Tim Kuipers
6c6c1c25fd Merge branch 'outer_inset_first' of https://github.com/totalretribution/Cura into totalretribution-outer_inset_first 2016-09-20 13:35:10 +02:00
Ghostkeeper
0b0e6ed118
Hide infill settings if infill density is 0 
Mostly to test, but this relation was missing anyway.

Contributes to issue CURA-2361.
 2016-09-19 16:52:36 +02:00
Jaime van Kessel
fa97295481 Using wall_thickness of 0 now results in wall_line_count of 0 2016-09-19 15:28:13 +02:00