Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts:
#	src/libslic3r/Preset.cpp
This commit is contained in:
SoftFever 2022-09-09 21:54:57 +08:00
commit bb74438f7c
132 changed files with 5737 additions and 3598 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -0,0 +1,3 @@
<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.313 14.8577C25.8116 14.7499 25.9047 14.3886 25.5223 14.0519L15.1727 5.00017C14.7886 4.6651 14.161 4.66346 13.7769 4.99853L3.39301 14.0519C3.0089 14.387 3.10207 14.7482 3.60059 14.8561L4.84606 15.1242C5.34458 15.232 5.75156 15.7371 5.75156 16.247V24.6744C5.75156 25.1844 6.16836 25.6012 6.67831 25.6012H11.062C11.572 25.6012 11.9887 25.1844 11.9887 24.6744V20.6307C11.9887 20.1208 12.4055 19.704 12.9155 19.704H15.8723C16.3822 19.704 16.799 20.1208 16.799 20.6307V24.6744C16.799 25.1844 17.2158 25.6012 17.7258 25.6012H22.2369C22.7469 25.6012 23.1637 25.1844 23.1637 24.6744V16.247C23.1637 15.7371 23.5707 15.232 24.0692 15.1258L25.313 14.8577Z" fill="#00AE42" fill-opacity="0.2" stroke="#00AE42" stroke-width="0.718299" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 884 B

View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 1.80039C14 2.13176 13.7314 2.40039 13.4 2.40039H2.6C2.26863 2.40039 2 2.13176 2 1.80039C2 1.46902 2.26863 1.20039 2.6 1.20039H13.4C13.7314 1.20039 14 1.46902 14 1.80039Z" fill="#ACACAC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2422 11.0067L8.42386 14.825C8.18954 15.0594 7.80965 15.0594 7.57534 14.825L3.75696 11.0067C3.52265 10.7724 3.52265 10.3925 3.75696 10.1581C3.99128 9.92383 4.37117 9.92383 4.60549 10.1581L7.3996 12.9523V5.40078C7.3996 5.06941 7.66823 4.80078 7.9996 4.80078C8.33097 4.80078 8.5996 5.06941 8.5996 5.40078V12.9523L11.3937 10.1581C11.628 9.92383 12.0079 9.92383 12.2422 10.1581C12.4765 10.3925 12.4765 10.7724 12.2422 11.0067Z" fill="#ACACAC"/>
</svg>

After

Width:  |  Height:  |  Size: 797 B

View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 14.1996C2 13.8682 2.26863 13.5996 2.6 13.5996H13.4C13.7314 13.5996 14 13.8682 14 14.1996C14 14.531 13.7314 14.7996 13.4 14.7996H2.6C2.26863 14.7996 2 14.531 2 14.1996Z" fill="#ACACAC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.75777 4.99333L7.57614 1.17495C7.81046 0.940639 8.19036 0.940639 8.42467 1.17495L12.243 4.99333C12.4774 5.22765 12.4774 5.60754 12.243 5.84186C12.0087 6.07617 11.6288 6.07617 11.3945 5.84186L8.60041 3.04775V10.5992C8.60041 10.9306 8.33178 11.1992 8.00041 11.1992C7.66904 11.1992 7.40041 10.9306 7.40041 10.5992V3.04775L4.6063 5.84186C4.37198 6.07617 3.99208 6.07617 3.75777 5.84186C3.52345 5.60754 3.52345 5.22765 3.75777 4.99333Z" fill="#ACACAC"/>
</svg>

After

Width:  |  Height:  |  Size: 801 B

View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.1426 17.6231C12.7258 18.2138 11.8497 18.2138 11.4329 17.6231L4.54229 7.85815C4.05321 7.16507 4.54889 6.20863 5.39716 6.20863L19.1784 6.20864C20.0267 6.20864 20.5223 7.16507 20.0333 7.85815L13.1426 17.6231Z" fill="#ACACAC"/>
</svg>

After

Width:  |  Height:  |  Size: 340 B

View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.4329 5.21146C11.8497 4.62074 12.7258 4.62074 13.1426 5.21146L20.0333 14.9764C20.5223 15.6695 20.0267 16.6259 19.1784 16.6259H5.39715C4.54888 16.6259 4.05321 15.6695 4.54228 14.9764L11.4329 5.21146Z" fill="#ACACAC"/>
</svg>

After

Width:  |  Height:  |  Size: 332 B

View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="3.5" y="3.5" width="3" height="11" fill="#FF6F00"/>
<rect x="11.5" y="3.5" width="3" height="11" fill="#FF6F00"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.5 2.5H2.5V22.5H6.5V2.5Z" fill="#FF6F00"/>
<path d="M22.5 2.5H18.5V22.5H22.5V2.5Z" fill="#FF6F00"/>
</svg>

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 214 B

Before After
Before After

View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.5" y="2.5" width="3.54545" height="13" fill="#FF6F00"/>
<rect x="11.9531" y="2.5" width="3.54545" height="13" fill="#FF6F00"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.9 1.5H1.5V23.5H5.9V1.5Z" fill="#FF6F00"/>
<path d="M23.5 1.5H19.1V23.5H23.5V1.5Z" fill="#FF6F00"/>
</svg>

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 214 B

Before After
Before After

View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15.25 8.56699C15.5833 8.75944 15.5833 9.24056 15.25 9.43301L4.75 15.4952C4.41667 15.6876 4 15.4471 4 15.0622L4 2.93782C4 2.55292 4.41667 2.31236 4.75 2.50481L15.25 8.56699Z" fill="#00AE42"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.587 11.8402C22.1377 12.1335 22.1377 12.8666 21.587 13.1598L4.23913 22.3968C3.68841 22.69 3 22.3235 3 21.7371V3.26299C3 2.67651 3.68841 2.30997 4.23913 2.60321L21.587 11.8402Z" fill="#00AE42"/>
</svg>

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 309 B

Before After
Before After

View file

@ -1,10 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_7481_29762)">
<path d="M15.9687 8.56699C16.3021 8.75944 16.3021 9.24056 15.9687 9.43301L3.96875 16.3612C3.63542 16.5537 3.21875 16.3131 3.21875 15.9282L3.21875 2.07179C3.21875 1.68689 3.63542 1.44633 3.96875 1.63878L15.9687 8.56699Z" fill="#00AE42"/>
</g>
<defs>
<clipPath id="clip0_7481_29762">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5435 11.7742C23.1522 12.0968 23.1522 12.9032 22.5435 13.2258L3.36957 23.3865C2.76088 23.709 2 23.3059 2 22.6608V2.33929C2 1.69416 2.76088 1.29096 3.36957 1.61353L22.5435 11.7742Z" fill="#00AE42"/>
</svg>

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 313 B

Before After
Before After

View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="3.19531" y="3.19531" width="11.6099" height="11.6099" fill="#D01B1B"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5 2.5H2.5V22.5H22.5V2.5Z" fill="#D01B1B"/>
</svg>

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 159 B

Before After
Before After

View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.5" y="2.5" width="13" height="13" fill="#D01B1B"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.5 1.5H1.5V23.5H23.5V1.5Z" fill="#D01B1B"/>
</svg>

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 159 B

Before After
Before After

View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.02.00.00",
"version": "01.02.00.03",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -213,10 +213,6 @@
"name": "Generic PETG @base",
"sub_path": "filament/Generic PETG @base.json"
},
{
"name": "Generic PETG @0.2 nozzle",
"sub_path": "filament/Generic PETG @0.2 nozzle.json"
},
{
"name": "Generic PETG",
"sub_path": "filament/Generic PETG.json"
@ -261,6 +257,14 @@
"name": "Generic PC",
"sub_path": "filament/Generic PC.json"
},
{
"name": "Generic PVA @base",
"sub_path": "filament/Generic PVA @base.json"
},
{
"name": "Generic PVA @0.2 nozzle",
"sub_path": "filament/Generic PVA @0.2 nozzle.json"
},
{
"name": "Generic PVA",
"sub_path": "filament/Generic PVA.json"
@ -277,10 +281,6 @@
"name": "Bambu TPU 95A @BBL X1C",
"sub_path": "filament/Bambu TPU 95A @BBL X1C.json"
},
{
"name": "Bambu TPU 95A @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu TPU 95A @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu TPU 95A @BBL X1",
"sub_path": "filament/Bambu TPU 95A @BBL X1.json"
@ -399,6 +399,10 @@
"name": "Bambu Lab X1 0.4 nozzle",
"sub_path": "machine/Bambu Lab X1 0.4 nozzle.json"
},
{
"name": "Bambu Lab X1 0.2 nozzle",
"sub_path": "machine/Bambu Lab X1 0.2 nozzle.json"
},
{
"name": "Bambu Lab X1 0.8 nozzle",
"sub_path": "machine/Bambu Lab X1 0.8 nozzle.json"

View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu ABS @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -12,6 +12,7 @@
"260"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu PLA Basic @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -6,9 +6,10 @@
"instantiation": "true",
"inherits": "Bambu PLA Matte @base",
"filament_max_volumetric_speed": [
"4"
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -6,9 +6,16 @@
"instantiation": "true",
"inherits": "Bambu Support W @base",
"filament_max_volumetric_speed": [
"2"
"0.5"
],
"nozzle_temperature_initial_layer": [
"240"
],
"nozzle_temperature": [
"240"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -1,14 +0,0 @@
{
"type": "filament",
"setting_id": "GFSU00_00",
"name": "Bambu TPU 95A @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu TPU 95A @base",
"filament_max_volumetric_speed": [
"0.5"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
]
}

View file

@ -1,14 +0,0 @@
{
"type": "filament",
"setting_id": "GFSG99_00",
"name": "Generic PETG @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PETG @base",
"filament_max_volumetric_speed": [
"1"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
]
}

View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSS99_00",
"name": "Generic PVA @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PVA @base",
"filament_max_volumetric_speed": [
"0.5"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -0,0 +1,20 @@
{
"type": "filament",
"filament_id": "GFS99",
"name": "Generic PVA @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pva",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"16"
],
"slow_down_layer_time": [
"7"
],
"slow_down_min_speed": [
"20"
]
}

View file

@ -1,23 +1,10 @@
{
"type": "filament",
"filament_id": "GFS99",
"setting_id": "GFSS99",
"name": "Generic PVA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pva",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"16"
],
"slow_down_layer_time": [
"7"
],
"slow_down_min_speed": [
"20"
],
"inherits": "Generic PVA @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle",

File diff suppressed because one or more lines are too long

View file

@ -3,7 +3,7 @@
"name": "Bambu Lab X1",
"model_id": "BL-P002",
"url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1.json",
"nozzle_diameter": "0.4;0.6;0.8",
"nozzle_diameter": "0.4;0.2;0.6;0.8",
"machine_tech": "FFF",
"family": "BBL-3DP",
"bed_model": "bbl-3dp-X1.stl",

View file

@ -152,7 +152,7 @@
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1}\nG17\nG2 Z{max_layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F12000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\n{if old_filament_temp > 0 && next_extruder < 255}M109 S[old_filament_temp]{endif}\nG1 X90 F3000\nG1 Y250 F4000\nG1 X100 F5000\nG1 X120 F12000\n\nG1 X20 Y50 F12000\nG1 Y-3\n\nT[next_extruder]\n\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n\n{if next_extruder < 255}\nG1 X54 F12000\nG1 Y265\n\nM400\n\nG92 E0\n{if flush_length_1 > 1}\n; FLUSH_START\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n\nM400\nM109 S[new_filament_temp]\n\nM400\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\n\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z[z_after_toolchange] F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A",
"layer_change_gcode": "{if timelapse_no_toolhead}\nG92 E0\nG1 E-[retraction_length] F1800\nG1 X65 Y245 F12000 ; move to safe pos\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}",
"layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG1 X65 Y245 F12000 ; move to safe pos\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{elsif timelapse_type == 2} ; timelapse without wipe tower\nM971 S11 C10 O0\n{endif}",
"machine_pause_gcode": "M400 U1\n",
"wipe": [
"1"

View file

@ -6,6 +6,7 @@
"instantiation": "true",
"inherits": "fdm_process_bbl_0.10_nozzle_0.2",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -6,6 +6,6 @@
"instantiation": "true",
"inherits": "fdm_process_bbl_0.40_nozzle_0.8",
"compatible_printers": [
"Bambu Lab X1 0.6 nozzle"
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -80,8 +80,8 @@ var LangText={
"t85":"4, Reopen Bambu studio and install the plug-in again",
"t86":"Close",
"t87":"User Manual",
"t88":"clear",
"t89":"show in explorer"
"t88":"Remove",
"t89":"Open Containing Folder"
},
"zh_CN":{
"t1":"欢迎使用Bambu Studio",
@ -164,8 +164,24 @@ var LangText={
"t85":"4, 重新启动Bambu Studio并尝试安装插件",
"t86":"关闭",
"t87":"使用引导",
"t88":"清除",
"t89":"打开文件所在路径"
"t88":"移除",
"t89":"打开所在的文件夹",
"wk1":"快速入门指南",
"wk2":"本文介绍了Bambu Studio的最基本用法。它指导用户配置软件创建项目并逐步完成第一个打印任务。",
"wk3":"基于项目的工作流",
"wk4":"Bambu Studio提出了领先的工作流程真正实现了“一体化”项目。基于主流的3MF项目格式它提供了一系列革命性的新功能如支持多盘、项目资源管理器和装配/零件视图。它可以大幅提高模型创作者及普通用户的使用效率。",
"wk5":"质量卓越的高速打印",
"wk6":"在保持高质量的前提下进行高速打印是非常具有挑战性的。Bambu Studio让这一切发生。支持“圆弧移动”特性使工具头移动更加顺滑有效减少机器振动。基于不同材料类型的精细标定过的冷却控制参数使得冷却过程可以自动开展。在悬垂区域进行“自动减速”可防止高速打印时在此区域的外观瑕疵。",
"wk7":"多色打印",
"wk8":"Bambu Studio提供了多种着色工具来制作彩色模型。您可以在项目中自由添加/移除打印材料并使用不同的笔刷为模型着色。开始打印时打印任务中的各个材料将自动映射到匹配的AMS槽位无需手动调整AMS中的料卷位置。",
"wk9":"切片参数设置指南",
"wk10":"Bambu Studio中的参数管理功能为切片过程提供了非常灵活和强大的控制。本文介绍了切片参数的组织分类和设置方法并提供了一些使用技巧。",
"wk11":"远程控制和监控",
"wk12":"Bambu Studio支持通过WAN/LAN网络向打印机发送打印任务控制和查看3D打印机和打印任务的各个方面。如果您有多台打印机还可以在设备列表中轻松切换。",
"wk13":"STEP格式",
"wk14":"与STL相比STEP带来了更多有效的信息。由于STEP的高精度切片时可以生成更多的圆弧路径。STEP还包括模型每个零件的装配关系可分割模型后恢复装配视图。",
"wk15":"3D文本",
"wk16":"使用3D文本工具用户可以轻松地在项目中创建各种3D文本形状使模型更加个性化。Bambu Studio提供了数十种字体并支持粗体和斜体样式使文本具有更大的灵活性。",
}
};

View file

@ -116,6 +116,7 @@ function SortUI()
{
let OneFila=m_ProfileItem['filament'][key];
let fWholeName=OneFila['name'].trim();
let fShortName=GetFilamentShortname( OneFila['name'] );
let fVendor=OneFila['vendor'];
let fType=OneFila['type'];
@ -173,7 +174,7 @@ function SortUI()
let pFila=$("#ItemBlockArea input[vendor='"+fVendor+"'][filatype='"+fType+"'][name='"+fShortName+"']");
if(pFila.length==0)
{
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
let HtmlFila='<div class="MItem"><input type="checkbox" vendor="'+fVendor+'" filatype="'+fType+'" filalist="'+fWholeName+';'+'" model="'+fModel+'" name="'+fShortName+'" />'+fShortName+'</div>';
$("#ItemBlockArea").append(HtmlFila);
@ -189,8 +190,10 @@ function SortUI()
else
{
let strModel=pFila.attr("model");
let strFilalist=pFila.attr("filalist");
pFila.attr("model", strModel+fModel);
pFila.attr("filalist", strFilalist+fWholeName+';');
}
}
}
@ -397,7 +400,7 @@ function SortFilament()
function ChooseDefaultFilament()
{
//ModelList
let pModel=$("#MachineList input:gt(0):checked");
let pModel=$("#MachineList input:gt(0)");
let nModel=pModel.length;
let ModelList=new Array();
for(let n=0;n<nModel;n++)
@ -406,6 +409,24 @@ function ChooseDefaultFilament()
ModelList.push( OneModel.getAttribute("mode") );
}
//DefaultMaterialList
let DefaultMaterialString=new Array();
let nMode=m_ProfileItem["model"].length;
for(let n=0;n<nMode;n++)
{
let OneMode=m_ProfileItem["model"][n];
let ModeName=OneMode['model'];
let DefaultM=OneMode['materials'];
if( ModelList.indexOf(ModeName)>-1 )
{
DefaultMaterialString+=OneMode['materials']+';';
}
}
let DefaultMaterialArray=DefaultMaterialString.split(';');
//alert(DefaultMaterialString);
//Filament
let FilaNodes=$("#ItemBlockArea .MItem");
let nFilament=FilaNodes.length;
@ -415,14 +436,17 @@ function ChooseDefaultFilament()
let OneFF=OneNode.getElementsByTagName("input")[0];
$(OneFF).prop("checked",false);
let fModel=OneFF.getAttribute("model");
let filamentList=OneFF.getAttribute("filalist");
//alert(filamentList);
let filamentArray=filamentList.split(';')
let HasModel=false;
for(let m=0;m<nModel;m++)
let NowFilaLength=filamentArray.length;
for(let p=0;p<NowFilaLength;p++)
{
let ModelSrc=ModelList[m];
let NowFila=filamentArray[p];
if( fModel.indexOf(ModelSrc)>=0)
if( NowFila!='' && DefaultMaterialArray.indexOf(NowFila)>-1)
{
HasModel=true;
break;

View file

@ -62,6 +62,7 @@ body
justify-content: center;
flex-wrap: nowrap;
position: relative;
width:262px;
}
@ -205,6 +206,7 @@ body
{
width: 100%;
height: 100%;
min-width: 835px;
overflow-y:auto;
}
@ -291,16 +293,20 @@ body
#RecentClearAllBtn
{
border: 1px solid #C4C4C4;
border: 1px solid #000;
padding: 0px 10px;
border-radius: 6px;
line-height: 26px;
height: 26px;
margin-left: 20px;
cursor: pointer;
background-color: #00AE42;
color: #fff;
display: inline;
color: #000;
display: none;
}
#RecentClearAllBtn:hover
{
background-color:#CDCECE;
}
#RecentTitle
@ -368,25 +374,26 @@ body
border: 0px;
min-width: 100px;
top: 800px;
border: 1px solid #C5C5C5;
border-radius: 6px;
border: 1px solid #C3C3C3;
color: #323A3D;
background-color: #fff;
display: none;
}
.CT_Item
{
line-height:30px;
padding: 0px 10px;
padding: 2px 10px;
display: flex;
flex-direction: row;
align-content: center;
align-items: center;
border: 2px solid #fff;
}
.CT_Item:hover
{
background-color: #E9E9E9;
cursor: pointer;
border: 2px solid #00AE42;
}
@ -470,42 +477,99 @@ body
flex-wrap: wrap;
align-content: flex-start;
overflow-y: auto;
padding: 50px;
margin: 30px 40px;
position: relative;
top: 0px;
bottom: 0px;
right: 0px;
left: 0px;
}
@media screen and (max-width: 1100px) {
.GuideBlock
{
width: 320px;
margin: 0px;
margin: 0px 12px 30px 12px;
width: calc(50% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
@media screen and ( min-width:1101px) and ( max-width:1680px )
{
.GuideBlock
{
width: calc(33% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
@media screen and ( min-width:1681px) and (max-width:2120px ) {
.GuideBlock
{
width: calc(25% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
@media screen and ( min-width:2121px) and (max-width:2620px ) {
.GuideBlock
{
width: calc(20% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
@media screen and (min-width:2621px ) and (max-width:3120px ) {
.GuideBlock
{
width: calc(16.6% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
@media screen and (min-width:3121px ) {
.GuideBlock
{
width: calc(14.2% - 20px);
margin: 0px 10px 40px 10px;
cursor: pointer;
}
}
.UG_IMG
{
width: 320px;
height: 200px;
width: 100%;
}
.UG_IMG img
{
width: 320px;
height: 200px;
width: 100%;
border-radius: 5px 5px 0px 0px;
}
.UG_TITLE
{
font-size: 16px;
font-size: 18px;
font-weight: 700;
line-height: 20px;
width: 320px;
margin-top: 6px;
width: 100%;
margin-top: 20px;
margin-bottom: 4px;
}
.UG_DESC
{
width: 320px;
width: 100%;
line-height: 18px;
color: #C4C4C4;
color: #4E5454;
font-size: 14px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 KiB

View file

@ -0,0 +1,4 @@
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.34801 3.82127C8.71179 4.19206 9.20969 4.40069 9.7295 4.40069H11.3196C11.4502 4.40069 11.5773 4.41559 11.7 4.44276V3.14981C11.7 2.62475 11.274 2.19873 10.749 2.19873H7.00335C6.92533 2.19873 6.8517 2.211 6.77895 2.22853C6.79385 2.24256 6.80875 2.25483 6.82277 2.26886L8.34801 3.82127Z" stroke="#6B6B6B" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.7 4.44284C11.5773 4.41566 11.4502 4.40076 11.3196 4.40076H9.72951C9.2097 4.40076 8.71268 4.19214 8.34803 3.82135L6.82279 2.26893C6.80876 2.25491 6.79298 2.24176 6.77896 2.22861C6.45726 1.92269 6.03036 1.75 5.58419 1.75H2.34787C1.374 1.75 0.583328 2.53979 0.583328 3.51455V10.6402C0.583328 11.615 1.37312 12.4048 2.34787 12.4048H11.3196C12.2944 12.4048 13.0842 11.615 13.0842 10.6402V6.16531C13.0842 5.32117 12.4916 4.61728 11.7 4.44284Z" stroke="#6B6B6B" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 980 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

View file

@ -0,0 +1,14 @@
<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_7828_34220)">
<path d="M11.8245 5.10425V13.1577C11.8245 13.431 11.5708 13.6544 11.2604 13.6544H2.73973C2.42934 13.6544 2.17566 13.431 2.17566 13.1577V5.10425" stroke="#D01B1B" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M0.965012 3.55176H13.0353" stroke="#D01B1B" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M4.31033 1.55829C4.31033 1.55829 4.31033 1.38921 4.31033 1.18246C4.31033 0.975717 4.56401 0.806641 4.8744 0.806641H9.1263C9.43668 0.806641 9.69036 0.975717 9.69036 1.18246C9.69036 1.38921 9.69036 1.55829 9.69036 1.55829" stroke="#D01B1B" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M5.23859 5.29443V12.0461" stroke="#D01B1B" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M8.76242 5.29443V12.0461" stroke="#D01B1B" stroke-width="0.8" stroke-miterlimit="10" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_7828_34220">
<rect width="14" height="15" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View file

@ -76,7 +76,7 @@
<div id="FileList">
<!-- <div class="FileItem" onClick="OnOpenRecentFile('aaaa')" fpath='d:\model\11.3mf'>
<a class="FileTip" title="d:\model\11.3mf"></a>
<div class="FileImg"><img src="img/b.jpg"/></div>
<div class="FileImg"><img src="img/d.png"/></div>
<a>abcd12334.3mf</a>
<div class="FileDate">2021/12/27 09:22</div>
</div>
@ -139,7 +139,7 @@
<div class="FileImg"><img src="img/b.jpg"/></div>
<a>abcd12334.3mf</a>
<div class="FileDate">2021/12/27 09:22</div>
</div> -->
</div> -->
</div>
</div>
@ -162,46 +162,46 @@
<div id="WikiGuideBigBoard" board="wikiguide">
<div id="WikiGuideBoard" >
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/studio-quick-start')">
<div class="UG_IMG"><img src="img/wiki3.png" /></div>
<div class="UG_IMG"><img src="img/quick_start.png" /></div>
<div class="UG_TITLE trans" tid="wk1">Quick Start</div>
<div class="UG_DESC trans" tid="wk2">This article instroduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step. </div>
<div class="UG_DESC trans" tid="wk2">This article introduces the most basic usage of Bambu Studio. It guides users to configure software, create projects, and complete the first printing task step by step. </div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/project-based-workflow')">
<div class="UG_IMG"><img src="img/wiki.png" /></div>
<div class="UG_TITLE trans" tid="wk1">Project Based Workflow</div>
<div class="UG_DESC trans" tid="wk2">Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.</div>
<div class="UG_IMG"><img src="img/project_based_workflow.png" /></div>
<div class="UG_TITLE trans" tid="wk3">Project Based Workflow</div>
<div class="UG_DESC trans" tid="wk4">Bambu Studio has put forward a leading workflow to truly achieve an “all in one” project. Based on the mainstream 3MF project format, it provides a series of revolutionary new features, such as Multi-Plate Support, a Project Resource Manager, and Assembly/Part View. It greatly improves the efficiency of both creators and regular users.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/high-speed-print-at-quality')">
<div class="UG_IMG"><img src="img/wiki3.png" /></div>
<div class="UG_TITLE trans" tid="wk1">High Speed Print at Quality</div>
<div class="UG_DESC trans" tid="wk2">It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen.
"Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tunned cooling parameters for each filament type.
Auto slow down for overhang walls works to prevent deformation at high speeds.</div>
<div class="UG_IMG"><img src="img/high_speed_print_at_quality.png" /></div>
<div class="UG_TITLE trans" tid="wk5">High Speed Print at Quality</div>
<div class="UG_DESC trans" tid="wk6">It is challenging to print at high speed while maintaining high quality. Bambu Studio makes this happen.
"Arch Move" makes the toolhead move smoothly and reduces the machine's vibration. The smart cooling is based on fine-tuned cooling parameters for each filament type.
"Auto slow down" for overhang walls works to prevent deformation at high speeds.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/multi-color-printing')">
<div class="UG_IMG"><img src="img/wiki2.png" /></div>
<div class="UG_TITLE trans" tid="wk1">Multi-Color Printing</div>
<div class="UG_DESC trans" tid="wk2">Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.</div>
<div class="UG_IMG"><img src="img/multi_color_printing.png" /></div>
<div class="UG_TITLE trans" tid="wk7">Multi-Color Printing</div>
<div class="UG_DESC trans" tid="wk8">Bambu Studio provides versatile colorizing tools to make a colorful model. You can freely add/remove filaments in a project and colorize your model with different brushes. Before printing, each filament will be auto-mapped to an AMS slot, not needing to manually change the spool placement in the AMS.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/how-to-set-slicing-parameters')">
<div class="UG_IMG"><img src="img/wiki.png" /></div>
<div class="UG_TITLE trans" tid="wk1">Setting Guide of Slicing Parameters</div>
<div class="UG_DESC trans" tid="wk2">The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.</div>
<div class="UG_IMG"><img src="img/setting_guide_of_slicing_parameters.png" /></div>
<div class="UG_TITLE trans" tid="wk9">Setting Guide of Slicing Parameters</div>
<div class="UG_DESC trans" tid="wk10">The parameter management features in Bambu Studio provide very flexible and powerful control over the slicing process. This article introduces the organization of parameters and provides some skills on taking full advantage of these capabilities.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/remote-control')">
<div class="UG_IMG"><img src="img/wiki2.png" /></div>
<div class="UG_TITLE trans" tid="wk1">Remote Control & Monitoring</div>
<div class="UG_DESC trans" tid="wk2">We support sending G-code to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs, and updating firmware over the air. If you have more than one printer, you can easily switch between them in the device list.</div>
<div class="UG_IMG"><img src="img/remote_control_and_monitoring.png" /></div>
<div class="UG_TITLE trans" tid="wk11">Remote Control & Monitoring</div>
<div class="UG_DESC trans" tid="wk12">Bambu Studio support sending print job to your printer over WAN/LAN network, controlling & monitoring every aspect of your 3D printer and printing jobs. If you have more than one printer, you can easily switch between them in the device list.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/step')">
<div class="UG_IMG"><img src="img/wiki.png" /></div>
<div class="UG_TITLE trans" tid="wk1">STEP Format</div>
<div class="UG_DESC trans" tid="wk2">Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each parts of a model, which can be used to identify the exterior surface and restore the assembly view after a model is split.</div>
<div class="UG_IMG"><img src="img/step.png" /></div>
<div class="UG_TITLE trans" tid="wk13">STEP Format</div>
<div class="UG_DESC trans" tid="wk14">Compared with STL, STEP brings more effective information. Thanks to the high accuracy of STEP, a lot of extrusion paths can be generated as arcs. STEP also includes the assembly relationship of each part of a model, which can be used to restore the assembly view after a model is split.</div>
</div>
<div class="GuideBlock" onClick="OpenWikiUrl('https://wiki.bambulab.com/en/software/bambu-studio/3d-text')">
<div class="UG_IMG"><img src="img/wiki.png" /></div>
<div class="UG_TITLE trans" tid="wk1">3D Text</div>
<div class="UG_DESC trans" tid="wk2">With 3D Text tool, users can easily create any 3D text shape in a project. Users can freely create 3D text content to make modles more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.</div>
<div class="UG_IMG"><img src="img/3d_text.png" /></div>
<div class="UG_TITLE trans" tid="wk15">3D Text</div>
<div class="UG_DESC trans" tid="wk16">With 3D Text tool, users can easily create various 3D text shapes in the project, making the model more personalized. Bambu Studio provides dozens of fonts and supports bold and italic styles to give text greater flexibility.</div>
</div>
</div>
</div>