3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-10 15:25:18 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master-remote' into feature/merge_remote_1.3

Browse source 
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
This commit is contained in:
SoftFever 2022-10-20 23:12:00 +08:00
commit 35455e6533
278 changed files with 14888 additions and 2414 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/images/ams_setting_hover.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

3
resources/images/ams_setting_normal.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 6.5 KiB

8
resources/images/ams_setting_press.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

4
resources/images/link_wiki_img.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.0166 4.74366C5.22248 4.14249 5.57248 3.67719 6.0666 3.34778C6.56895 3.01013 7.14543 2.84131 7.79601 2.84131C8.2819 2.84131 8.71013 2.93601 9.08072 3.12543C9.45131 3.3066 9.73954 3.5619 9.94543 3.89131C10.1513 4.21248 10.2542 4.57484 10.2542 4.97837C10.2542 5.39013 10.1554 5.73601 9.95778 6.01602C9.76837 6.28778 9.48013 6.59249 9.09307 6.93013C8.82131 7.18543 8.60307 7.40366 8.43837 7.58484C8.27366 7.76602 8.13366 7.98425 8.01837 8.23954C7.91131 8.4866 7.85778 8.77484 7.85778 9.10425C7.85778 9.33484 7.8866 9.56954 7.94425 9.80837H7.0919C6.98484 9.43778 6.93131 9.09602 6.93131 8.78307C6.93131 8.44543 6.98484 8.14896 7.0919 7.89366C7.20719 7.63013 7.34307 7.4119 7.49954 7.23896C7.65601 7.05778 7.86601 6.84366 8.12954 6.5966C8.45072 6.30837 8.68954 6.05719 8.84601 5.84307C9.00248 5.62072 9.08072 5.36131 9.08072 5.06484C9.08072 4.69425 8.95307 4.39778 8.69778 4.17543C8.44248 3.95307 8.10895 3.8419 7.69719 3.8419C6.85719 3.8419 6.24778 4.30719 5.86895 5.23778L5.0166 4.74366ZM7.62307 12.489C7.43366 12.489 7.26895 12.419 7.12895 12.279C6.99719 12.139 6.93131 11.9742 6.93131 11.7848C6.93131 11.5872 6.99719 11.4184 7.12895 11.2784C7.26895 11.1384 7.43366 11.0684 7.62307 11.0684C7.82072 11.0684 7.98543 11.1384 8.11719 11.2784C8.25719 11.4184 8.32719 11.5872 8.32719 11.7848C8.32719 11.9742 8.25719 12.139 8.11719 12.279C7.98543 12.419 7.82072 12.489 7.62307 12.489Z" fill="#FF6F00"/>
<circle cx="7.5" cy="7.5" r="7" stroke="#FF6F00"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
resources/images/monitor_extruder_load.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

28
resources/images/monitor_extruder_load.svg Normal file
View file

@ -0,0 +1,28 @@
<svg width="28" height="70" viewBox="0 0 28 70" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.4305 1.49971V38.4918H9.92413V1.49971M9.92413 1.49887C9.92542 0.67099 11.8291 0 14.1773 0L9.92413 1.49887ZM14.1773 0C16.5255 0 18.4292 0.67099 18.4305 1.49887L14.1773 0Z" fill="url(#paint0_linear_8143_31825)" fill-opacity="0.2"/>
<line x1="18.6913" y1="1.32383" x2="18.6913" y2="38.3703" stroke="url(#paint1_linear_8143_31825)" stroke-width="0.523139" stroke-linecap="round"/>
<line x1="9.83127" y1="1.32383" x2="9.83127" y2="38.3703" stroke="url(#paint2_linear_8143_31825)" stroke-width="0.523139" stroke-linecap="round"/>
<path d="M11.6962 14.887L13.8367 16.7217C14.0326 16.8897 14.3217 16.8897 14.5176 16.7217L16.6582 14.887" stroke="#00AE42" stroke-opacity="0.3" stroke-width="1.04628" stroke-linecap="round"/>
<path d="M11.6962 25.1636L13.8367 26.9983C14.0326 27.1663 14.3217 27.1663 14.5176 26.9983L16.6582 25.1636" stroke="#00AE42" stroke-opacity="0.8" stroke-width="1.04628" stroke-linecap="round"/>
<path d="M11.7663 32.6333L13.8396 34.1412C14.0231 34.2746 14.2716 34.2746 14.455 34.1412L16.5283 32.6333" stroke="#00AE42" stroke-width="1.04628" stroke-linecap="round"/>
<path d="M7.79767 62.6204H19.9192L19.0534 66.0837H8.66349L7.79767 62.6204Z" fill="#ACACAC"/>
<rect y="38.2791" width="28" height="25.1646" rx="2.61569" fill="#D3D3D3"/>
<circle cx="14.0008" cy="50.5056" r="6.91139" fill="#AEAEAE"/>
<circle cx="13.9372" cy="50.4983" r="6.49367" fill="#E3E3E3"/>
<circle cx="13.9779" cy="50.5003" r="4.76203" fill="#00AE42"/>
<rect x="13.1147" y="66.0845" width="1.73165" height="3.03038" fill="#939191"/>
<defs>
<linearGradient id="paint0_linear_8143_31825" x1="14.1773" y1="0" x2="14.1773" y2="38.4918" gradientUnits="userSpaceOnUse">
<stop stop-color="#00AE42" stop-opacity="0"/>
<stop offset="1" stop-color="#00AE42"/>
</linearGradient>
<linearGradient id="paint1_linear_8143_31825" x1="18.4297" y1="37.1869" x2="18.4297" y2="1.06226" gradientUnits="userSpaceOnUse">
<stop stop-color="#00AE42"/>
<stop offset="1" stop-color="#00AE42" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint2_linear_8143_31825" x1="9.56971" y1="37.1869" x2="9.5697" y2="1.06226" gradientUnits="userSpaceOnUse">
<stop stop-color="#00AE42"/>
<stop offset="1" stop-color="#00AE42" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

16
resources/images/printer_file.svg Normal file
View file

@ -0,0 +1,16 @@
<svg width="696" height="449" viewBox="0 0 696 449" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="696" height="449" fill="#2C2C2C"/>
<path d="M305.928 253.273V231.84H299.913V258.277H321.981L320.084 253.273H305.928Z" fill="white"/>
<path d="M347.497 237.093H326.31L328.034 241.658H347.286C347.612 241.658 347.88 241.926 347.88 242.251V244.944H330.697C327.46 244.944 324.835 247.561 324.835 250.789V252.432C324.835 255.66 327.46 258.277 330.697 258.277H353.378V242.919C353.378 239.71 350.753 237.093 347.497 237.093ZM347.861 253.674H330.908C330.582 253.674 330.314 253.406 330.314 253.081V250.082C330.314 249.758 330.582 249.49 330.908 249.49H347.861V253.674Z" fill="white"/>
<path d="M378.53 237.093H364.699V231.802H364.584H358.665V258.277H364.699H378.53C381.767 258.277 384.392 255.66 384.392 252.432V242.957C384.411 239.729 381.786 237.093 378.53 237.093ZM378.491 253.1C378.491 253.425 378.223 253.692 377.898 253.692H364.699V241.754H377.898C378.223 241.754 378.491 242.021 378.491 242.346V253.1Z" fill="white"/>
<path d="M397.418 203.149H367.573V224.333H373.434V208.383C373.434 208.058 373.703 207.79 374.028 207.79H381.959C382.285 207.79 382.553 208.058 382.553 208.383V224.333H388.434V208.383C388.434 208.058 388.702 207.79 389.027 207.79H396.843C397.169 207.79 397.437 208.058 397.437 208.383V224.333H403.337V208.994C403.28 205.766 400.655 203.149 397.418 203.149Z" fill="white"/>
<path d="M459.521 219.137C459.521 219.462 459.253 219.729 458.928 219.729H444.829C444.503 219.729 444.235 219.462 444.235 219.137V203.149H438.699V218.488C438.699 221.716 441.323 224.333 444.56 224.333H459.138C462.376 224.333 465 221.716 465 218.488V203.149H459.502V219.137H459.521Z" fill="white"/>
<path d="M356.386 203.149H335.199L336.923 207.714H356.175C356.5 207.714 356.769 207.982 356.769 208.306V211H339.586C336.348 211 333.724 213.617 333.724 216.845V218.488C333.724 221.716 336.348 224.333 339.586 224.333H362.247V208.975C362.266 205.747 359.623 203.149 356.386 203.149ZM356.749 219.729H339.796C339.471 219.729 339.203 219.462 339.203 219.137V216.138C339.203 215.813 339.471 215.546 339.796 215.546H356.749V219.729Z" fill="white"/>
<path d="M427.914 203.149H414.083V197.857H413.968H408.049V224.333H414.083H427.914C431.151 224.333 433.776 221.716 433.776 218.488V208.994C433.795 205.766 431.171 203.149 427.914 203.149ZM427.876 219.137C427.876 219.462 427.608 219.729 427.282 219.729H414.083V207.791H427.282C427.608 207.791 427.876 208.058 427.876 208.383V219.137Z" fill="white"/>
<path d="M329.26 215.661C329.088 213.636 328.053 211.821 326.444 210.484C327.287 209.319 327.843 207.905 327.938 206.377C327.938 206.224 327.977 204.811 327.957 204.62C327.613 200.226 323.264 196.769 317.977 196.769C317.901 196.769 311.177 196.769 305.947 196.769V201.487L299.913 203.798V224.352H321.636C321.636 224.352 322 224.333 322.153 224.333C325.965 224.085 329.011 220.99 329.26 217.113C329.279 216.921 329.26 215.852 329.26 215.661ZM305.928 201.468H318.724C319.107 201.468 319.471 201.544 319.797 201.697C321.004 202.175 321.866 203.359 321.866 204.734C321.866 204.734 321.847 205.193 321.789 205.422C321.617 206.473 320.908 207.313 319.969 207.695C319.548 207.886 319.088 208.001 318.59 208.001H305.928V201.468ZM319.567 219.729H305.928V212.681H319.567C321.521 212.681 323.092 214.247 323.092 216.196C323.092 218.163 321.521 219.729 319.567 219.729Z" fill="white"/>
<path d="M305.928 196.749V191.038L299.913 193.349V199.061L305.928 196.749Z" fill="white"/>
<path d="M259.796 216.119V258.277H283.856V225.556L259.796 216.119Z" fill="white"/>
<path d="M259.796 191V212.089L283.856 221.544V191H259.796Z" fill="white"/>
<path d="M232 233.177V191H256.06V223.722L232 233.177Z" fill="white"/>
<path d="M232 258.278V237.208L256.06 227.753V258.278H232Z" fill="white"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

3
resources/images/printer_host_browser.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.49031 2.42996C6.78031 0.719961 4.00031 0.719961 2.29031 2.42996C0.580312 4.13996 0.580312 6.91996 2.29031 8.62996C3.88031 10.22 6.39031 10.33 8.11031 8.96996L9.59031 10.45C9.59031 10.45 9.23031 10.81 9.59031 11.18C9.95031 11.55 13.2403 14.83 13.2403 14.83C13.2403 14.83 13.6003 15.19 13.9703 14.83C14.3303 14.47 14.7003 14.1 14.7003 14.1C14.7003 14.1 15.0603 13.74 14.7003 13.37C14.3403 13 11.0503 9.71996 11.0503 9.71996C10.6903 9.35996 10.3203 9.71996 10.3203 9.71996L8.83031 8.24996C10.1903 6.51996 10.0803 4.01996 8.49031 2.42996ZM8.10031 8.24996C6.60031 9.74996 4.17031 9.74996 2.67031 8.24996C1.17031 6.74996 1.17031 4.31996 2.67031 2.81996C4.17031 1.31996 6.60031 1.31996 8.10031 2.81996C9.60031 4.31996 9.60031 6.74996 8.10031 8.24996Z" fill="#00AE42"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 877 B

9
resources/images/printer_host_test.svg Normal file
View file

@ -0,0 +1,9 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="4.5" y="2.5" width="20" height="22.7097" rx="2.5" stroke="#6B6B6B" stroke-linejoin="round"/>
<path d="M8.06458 8.09668H17.5484" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
<path d="M20.9354 8.09668H21.6128" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
<path d="M20.9354 14.1936H21.6128" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
<path d="M20.9354 20.2905H21.6128" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
<path d="M8.06458 14.1936H17.5484" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
<path d="M8.06458 20.2905H17.5484" stroke="#00AE42" stroke-width="2" stroke-linecap="round"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 769 B