3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix merge conflicts with master

Browse source
This commit is contained in:
Lipu Fei 2019-09-24 14:26:43 +02:00
commit 94e89ad4ac
89 changed files with 1283 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -1,5 +1,4 @@
{
"id": "Mark2_for_Ultimaker2",
"version": 2,
"name": "Mark2 for Ultimaker2",
"inherits": "ultimaker2_plus",

4
resources/definitions/fdmprinter.def.json
View file

@ -7565,7 +7565,7 @@
"small_feature_speed_factor":
{
"label": "Small Feature Speed",
"description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
"description": "Small features will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.",
"unit": "%",
"type": "float",
"default_value": 50,
@ -7577,7 +7577,7 @@
"small_feature_speed_factor_0":
{
"label": "First Layer Speed",
"description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhestion and accuracy.",
"description": "Small features on the first layer will be printed at this percentage of their normal print speed. Slower printing can help with adhesion and accuracy.",
"unit": "%",
"type": "float",
"default_value": 50,

4
resources/definitions/flsun_qq.def.json
View file

@ -19,13 +19,13 @@
"default_value": true
},
"machine_width": {
"default_value": 240
"default_value": 260
},
"machine_height": {
"default_value": 285
},
"machine_depth": {
"default_value": 240
"default_value": 260
},
"machine_center_is_zero": {
"default_value": true

38
resources/definitions/hms434.def.json
View file

@ -5,12 +5,29 @@
"metadata": {
"visible": true,
"author": "Scheepers",
"manufacturer": "MaukCC",
"manufacturer": "Hybrid AM Systems",
"file_formats": "text/x-gcode",
"has_materials": true,
"has_machine_materials": true,
"preferred_material": "generic_pla",
"exclude_materials": [ "chromatik_pla", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "imade3d_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla", "generic_cpe_175", "generic_nylon_175", "dsm_arnitel2045_175", "dsm_novamid1070_175", "generic_tpu_175", "generic_pc_175" ],
"exclude_materials": [
"chromatik_pla",
"dsm_arnitel2045_175", "dsm_novamid1070_175",
"emotiontech_abs", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a",
"fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
"fiberlogy_hd_pla",
"filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
"generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175",
"imade3d_generic_petg_175", "imade3d_generic_pla_175",
"innofill_innoflex60_175",
"octofiber_pla",
"polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
"verbatim_bvoh_175",
"Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU",
"tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva",
"zyyx_pro_flex", "zyyx_pro_pla"
],
"has_variants": true,
"variants_name": "Tool",
@ -41,16 +58,17 @@
"machine_extruder_count": {"default_value": 2 },
"material_diameter": {"default_value": 1.75 },
"machine_heated_bed": {"default_value": true },
"machine_heated_build_volume":{"default_value": true },
"machine_center_is_zero": {"default_value": false },
"gantry_height": {"value": "35" },
"machine_height": {"default_value": 400 },
"machine_depth": {"default_value": 325 },
"machine_width": {"default_value": 450 },
"machine_gcode_flavor": {"default_value": "RepRap (RepRap)" },
"material_print_temp_wait": {"default_value": true},
"material_bed_temp_wait": {"default_value": true },
"material_print_temp_wait": {"default_value": false },
"material_bed_temp_wait": {"default_value": false },
"machine_max_feedrate_z": {"default_value": 1200 },
"machine_start_gcode": {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
"machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
"machine_end_gcode": {"default_value": "" },
"retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" },
@ -71,10 +89,16 @@
"top_layers": {"value": "4" },
"bottom_layers": {"value": "(top_layers)" },
"wall_0_inset": {"value": "0" },
"outer_inset_first": {"value": true },
"alternate_extra_perimeter": {"value": false },
"filter_out_tiny_gaps": {"value": false },
"fill_outline_gaps": {"value": true },
"skin_outline_count": {"value": "0"},
"ironing_enabled": {"value": true },
"ironing_line_spacing": {"value": "line_width"},
"ironing_flow": {"value": "0"},
"ironing_inset": {"value": "line_width"},
"speed_ironing": {"value": "150"},
"infill_sparse_density": {"value": 30},
"infill_pattern": {"value": "'lines'"},
@ -103,7 +127,7 @@
"speed_wall_x": {"value": "speed_wall"},
"speed_layer_0": {"value": "(speed_print/5*4) if speed_print < 51 else speed_print"},
"speed_topbottom": {"value": "speed_layer_0"},
"speed_travel": {"value": "100"},
"speed_travel": {"value": "150"},
"speed_travel_layer_0": {"value": "speed_travel"},
"speed_support_interface": {"value": "speed_topbottom"},
"speed_slowdown_layers": {"value": 1},
@ -130,7 +154,7 @@
"support_interface_height": {"value": 0.5},
"support_interface_pattern": {"value": "'lines'"},
"adhesion_type": {"value": "'skirt'"},
"adhesion_type": {"value": "'none'"},
"skirt_gap": {"value": 1},
"skirt_brim_minimal_length": {"value": 50},