mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 00:52:04 +00:00
9956ad5b48
# Description Adresses #13294 - Adds the X2D printer definition, machine presets, process presets, filament presets, BBL profile index entries, CLI config entries, filament blacklist updates, and printer/load/calibration/cover assets. - Updates dual-nozzle handling to use configured toolhead labels and match Bambu X2D hotend placeholders. - Adds X2D-specific wipe tower cooling placeholder support and 3MF filament/nozzle change sequence metadata import/export plumbing. # Note I own a P2S and an X2D. That's all. I frankly have no idea if my changes cause regression on other printers, and have no capability to test. I know that for my X2D, which runs an AMS, .2mm nozzles, SuperTack, and in LAN mode, this has been working without issue. # Screenshots/Recordings/Graphs <img width="606" height="380" alt="Dual nozzle control" src="https://github.com/user-attachments/assets/0d1c1063-4621-4097-b97c-d739557bf18c" /> *Dual nozzle control* <img width="726" height="260" alt="image" src="https://github.com/user-attachments/assets/270355b7-ca67-4ca3-ad19-582b8f11411b" /> *Multi nozzle filament override* <img width="416" height="202" alt="X2D Machine config and dual nozzle support" src="https://github.com/user-attachments/assets/6a5c07b2-0d20-4819-8f42-d60731313249" /> *X2D Machine config and dual nozzle support* <img width="397" height="142" alt="Filament for Supports test prints" src="https://github.com/user-attachments/assets/3c7546bd-0e27-4d56-89b7-d9ca18c976f9" /> *Filament for Supports has been used in over 20 hours of test prints* <img width="210" height="263" alt="Left vs Right filament distinction" src="https://github.com/user-attachments/assets/03322268-b669-4f14-8d77-c4d96843d219" /> *Left vs Right filament distinction* <img width="557" height="327" alt="Custom filament mapping" src="https://github.com/user-attachments/assets/c1c4396f-7359-474e-80bd-78fec22f9c82" /> *Custom filament mapping* <img width="556" height="314" alt="Auto map" src="https://github.com/user-attachments/assets/d83e3217-edce-4340-886e-043962003a30" /> *Auto map* <img width="689" height="664" alt="LAN mode send print with X2D preview and no errors" src="https://github.com/user-attachments/assets/76009bbf-31d3-4a6c-979c-8643b487c824" /> *LAN mode send print with X2D preview and no errors, dual nozzle selection* ## Tests - 20 hours of dual-nozzle printing. - 100% CTest tests passed - Validated 208 changed JSON files. <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts) Fix #13294
22 lines
716 B
PHP
22 lines
716 B
PHP
# Included by CMakeLists, edited by the build script
|
|
# (the version numbers are generated by the build script from the git current label)
|
|
|
|
set(SLIC3R_APP_NAME "OrcaSlicer")
|
|
set(SLIC3R_APP_KEY "OrcaSlicer")
|
|
|
|
if(NOT DEFINED BBL_INTERNAL_TESTING)
|
|
set(BBL_INTERNAL_TESTING "0")
|
|
endif()
|
|
set(SoftFever_VERSION "2.4.0-dev")
|
|
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
|
|
SoftFever_VERSION_MATCH ${SoftFever_VERSION})
|
|
set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})
|
|
set(ORCA_VERSION_MINOR ${CMAKE_MATCH_2})
|
|
set(ORCA_VERSION_PATCH ${CMAKE_MATCH_3})
|
|
|
|
set(SLIC3R_VERSION "02.06.00.51")
|
|
|
|
if (NOT DEFINED ORCA_UPDATER_SIG_KEY)
|
|
set(ORCA_UPDATER_SIG_KEY "" CACHE STRING "Base64url encoded updater signature key")
|
|
endif()
|