GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 09:06:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,300 Commits 295 Branches 268 Tags
Commit Graph

1975 Commits

Author SHA1 Message Date
Ghostkeeper
a4bf4b3502 Merge branch 'feature_wall_wipe' 2016-11-07 11:36:30 +01:00
Ghostkeeper
fe21dbb784
Merge remote-tracking branch 'origin/feature_extruder_temp_layer_0' 2016-11-04 16:56:24 +01:00
Jaime van Kessel
ed5244bcb0 Merge branch 'feature_concentric_3d_infill' of github.com:Ultimaker/Cura 2016-11-04 14:53:57 +01:00
Ghostkeeper
871a19091d
Merge branch 'feature_start_layer_far_away' 2016-11-04 10:52:38 +01:00
Tim Kuipers
1b853de981 Revert "JSON refactor: support_mesh ==> overhang_mesh (CURA-2077)" 
This reverts commit d675ffe6e9765e5118b85585502aee7a1cb3283c.
 2016-11-03 20:22:22 +01:00
Tim Kuipers
1787b1e65b JSON refactor: support_mesh ==> overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
b840711960 JSON feat: support_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
2c87cddd3c JSON refactor: anti_support_mesh ==> anti_overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
09a64c7ba0 JSON feat: anti support meshes (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
c430980536 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-11-03 20:15:24 +01:00
Ghostkeeper
0f374a2e23
Merge branch 'feature_infill_support' 2016-11-03 13:37:26 +01:00
Ghostkeeper
612ef1c0c6
Fix spelling and grammar of Remove Mesh Intersection 
'objecs' to 'objects'.
Removed superfluous 'is'.

Contributes to issue CURA-2712.
 2016-11-02 14:54:19 +01:00
Ghostkeeper
24f78a7ee6
Capitalise setting name for Hollow Objects 
This is in line with other setting names.

Contributes to issue CURA-2748.
 2016-11-01 16:31:42 +01:00
Tim Kuipers
bce6a6fed4 refactor: move infill_hollow to experimental category (CURA-2748) 2016-11-01 11:06:56 +01:00
Tim Kuipers
06d2f01075 Merge branch 'master' into feature_infill_support 2016-11-01 11:04:05 +01:00
Tim Kuipers
0bc50523d6 JSON feat: retract_at_layer_change (CURA-2780) 2016-10-22 16:20:20 +02:00
Tim Kuipers
a58c247016 JSOn feat: material_print_temperature_layer_0 (CURA-2736) 2016-10-22 14:27:56 +02:00
Tim Kuipers
8fb52d86e4 JSOn feat: material_bed_temperature_layer_0 (CURA-2781) 2016-10-21 18:21:38 +02:00
Tim Kuipers
d01f0053bf JSOn feat: start_layers_at_same_position, layer_start_x, layer_start_y (CURA-1112) 2016-10-21 17:46:16 +02:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f6c0293b4f6c6a1fd79548422639a4d.

reapplies 8ee22738bc75353aa9d12f1dcdf8bf41a3881602
 2016-10-21 16:21:08 +02:00
Tim Kuipers
c17ee18ccb JSON feat: concentric 3D infill (CURA-2772) 2016-10-21 14:16:00 +02:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Tim Kuipers
e0b6679b91 JSON feat: infill_hollow (CURA-2748) 2016-10-19 18:14:03 +02:00
Tim Kuipers
fd50d9e316 JSON fix: added comment in cool_min_layer_time description about Minimum Speed (CURA-2720) 2016-10-19 14:44:58 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812 JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727) 2016-10-19 13:05:10 +02:00
Tim Kuipers
aad3da85e9 JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727) 2016-10-19 12:59:28 +02:00
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
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