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

Merge branch 'merge-upstream'

Browse source 
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
This commit is contained in:
SoftFever 2023-09-30 08:44:32 +08:00
commit 59bab91da9
579 changed files with 23269 additions and 11097 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/web/image/printer/Bambu Lab P1P_cover.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 279 KiB

BIN
resources/web/image/printer/Bambu Lab P1S_cover.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
resources/web/image/printer/Bambu Lab X1 Carbon_cover.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
resources/web/image/printer/Bambu Lab X1_cover.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 18 KiB

4
resources/web/orca/missing_connection.html
View file

@ -14,8 +14,8 @@
</head>
<body onLoad="OnInit()">
<div class="container">
<h1 class="trans" tid="t93">Printer Connection</h1>
<p class="trans" tid="t94">Please set up your printer connection to view the device.</p>
<h1 class="trans">Printer Connection</h1>
<p class="trans">Please set up your printer connection to view the device.</p>
<img src="setup_connection.gif" alt="Printer connection setup demonstration" style="max-width: 100%; height: auto; display: block;"/>
</div>
</body>