juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrePrintChecker.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-11-18 09:17:13 +08:00
parent 5e2a7fbf35 4046e39ff3
commit 760f66d3d7
77 changed files with 1760 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/bed_plate_cool_smooth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
resources/images/bed_plate_cool_supertack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/images/bed_plate_cool_textured.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
resources/images/bed_plate_engineering.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
resources/images/bed_plate_high_temp_smooth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
resources/images/bed_plate_pei.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
resources/images/big_bed_plate_cool_smooth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
resources/images/big_bed_plate_cool_supertack.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
resources/images/big_bed_plate_cool_textured.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
resources/images/big_bed_plate_engineering.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
resources/images/big_bed_plate_high_temp_smooth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
resources/images/big_bed_plate_pei.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

1
resources/images/printer_sync_not.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="7.5" cy="7.5" r="4" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1=".5" y1=".5" x2=".5" y2="4.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1="14.5" y1="14.5" x2="14.5" y2="10.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M13.83,4.5C12.71,2.13,10.3.5,7.5.5c-2.71,0-5.17,1.56-6.33,4" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.27,10.69c1.16,2.26,3.51,3.81,6.23,3.81,2.71,0,5.17-1.56,6.33-4" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 802 B

1
resources/images/printer_sync_ok.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="7.5" cy="7.5" r="4" style="fill:#009688; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/><line x1=".5" y1=".5" x2=".5" y2="4.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><line x1="14.5" y1="14.5" x2="14.5" y2="10.5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M13.83,4.5C12.71,2.13,10.3.5,7.5.5c-2.71,0-5.17,1.56-6.33,4" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M1.27,10.69c1.16,2.26,3.51,3.81,6.23,3.81,2.71,0,5.17-1.56,6.33-4" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 805 B

8
resources/profiles/Prusa/machine/Prusa MK3S 0.25 nozzle.json
View File

@@ -12,7 +12,7 @@
],
"default_print_profile": "0.20mm Speed @MK3S 0.25",
"nozzle_diameter": [
"0.2"
"0.25"
],
"bed_exclude_area": [
"0x0"
@@ -39,6 +39,12 @@
"200",
"200"
],
"max_layer_height": [
"0.15"
],
"min_layer_height": [
"0.05"
],
"host_type": "prusalink",
"printable_height": "210",
"machine_pause_gcode": "M601",

6
resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
View File

@@ -39,6 +39,12 @@
"200",
"200"
],
"max_layer_height": [
"0.3"
],
"min_layer_height": [
"0.05"
],
"host_type": "prusalink",
"printable_height": "210",
"machine_pause_gcode": "M601",

6
resources/profiles/Prusa/machine/Prusa MK3S 0.6 nozzle.json
View File

@@ -39,6 +39,12 @@
"200",
"200"
],
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.15"
],
"host_type": "prusalink",
"printable_height": "210",
"machine_pause_gcode": "M601",

6
resources/profiles/Prusa/machine/Prusa MK3S 0.8 nozzle.json
View File

@@ -39,6 +39,12 @@
"200",
"200"
],
"max_layer_height": [
"0.6"
],
"min_layer_height": [
"0.2"
],
"host_type": "prusalink",
"printable_height": "210",
"machine_pause_gcode": "M601",

4
resources/profiles/Prusa/process/process_common_mk3.json
View File

@@ -50,6 +50,10 @@
],
"ooze_prevention": "0",
"outer_wall_acceleration": "0",
"overhang_1_4_speed": "25",
"overhang_2_4_speed": "20",
"overhang_3_4_speed": "15",
"overhang_4_4_speed": "15",
"post_process": [
""
],