diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 98d942d858..cff5a5adfb 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -43,5 +43,5 @@ jobs: run: ./BuildLinux.sh -isr - uses: actions/upload-artifact@v3 with: - name: BambuStudio-SoftFever_Linux + name: OrcaSlicer_Linux path: './build/BambuStudio_ubu64.AppImage' diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 64bd07ddac..0a83327bea 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -50,5 +50,5 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: BambuStudio-SoftFever_Mac - path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip \ No newline at end of file + name: OrcaSlicer_Mac + path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip \ No newline at end of file diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index e5f18795a3..07b3a52d59 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -51,5 +51,5 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: BambuStudio-SoftFever_Mac - path: ${{ github.workspace }}/build/BambuStudio-SoftFever/BambuStudio-SoftFever*.zip \ No newline at end of file + name: OrcaSlicer_Mac + path: ${{ github.workspace }}/build/OrcaSlicer/OrcaSlicer*.zip \ No newline at end of file diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index efeafcf712..2e5f8279f5 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -53,10 +53,10 @@ jobs: # - name: pack app # working-directory: ${{ github.workspace }}/build # shell: cmd - # run: '"C:/Program Files/7-Zip/7z.exe" a -tzip BambuStudio-SoftFever_dev_build.zip ${{ github.workspace }}/build/BambuStudio-SoftFever' + # run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer' - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: BambuStudio-SoftFever_Win64_nightly - path: ${{ github.workspace }}/build/BambuStudio-SoftFever \ No newline at end of file + name: OrcaSlicer_Win64_nightly + path: ${{ github.workspace }}/build/OrcaSlicer \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f912ed546..cdaabcb1a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -706,7 +706,7 @@ elseif (SLIC3R_FHS) ) endforeach() elseif (CMAKE_MACOSX_BUNDLE) - install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/BambuStudio.app/Contents/resources") + install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources") else () install(FILES src/platform/unix/BambuStudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications) install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") diff --git a/README.md b/README.md index ed9274e484..e814fd218f 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ A modified version of Bambu Studio with many handy features. It's fully compatible with Bambulab X1/X1-C/P1P printers. It also supports Anycubic, Anker, Creality, Prusa MK3S, RatRig and Voron printers. -You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases +You can download it here: https://github.com/SoftFever/OrcaSlicer/releases ## BambuStudio SoftFever change notes: -### [V1.4.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.2): +### [V1.4.2 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.4.2): - Change the color theme :) - Fixed a crash issue when selecting vase mode on some machines - Port firmware retraction and Extra length on restart retraction feature from PrusaSlicer @@ -30,9 +30,9 @@ fixed an issue that user presets were not loaded when Auto sync user preset opti 5. CICD for Linux build - thanks @fang64 Known issues: -The Calibration menu is missing on some Mac machines. Try restarting the App can usually fix it. See [#120](https://github.com/SoftFever/BambuStudio-SoftFever/issues/120) +The Calibration menu is missing on some Mac machines. Try restarting the App can usually fix it. See [#120](https://github.com/SoftFever/OrcaSlicer/issues/120) -### [V1.4.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.1): +### [V1.4.1 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.4.1): - Added a feature for checking and displaying a notification for a new version - Added RatRig printer profiles, thanks @erebus04 for working this - Added support for the Creality CR-10 Max and Anker M5 printers. @@ -49,7 +49,7 @@ The Calibration menu is missing on some Mac machines. Try restarting the App can
👉 "Click here" for OLD Release Note -### [V1.4.0 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.4.0): +### [V1.4.0 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.4.0): - Add Layer Time/Layer time(Log) display (NOTE: need more tweaking work for BBL printers as the layer time is skewed by the preparing time) - Add `sandwich`(inner-outer-inner-infill) mode support for Arachne engine. - Change default `wall loop` from 2 to 3 @@ -62,7 +62,7 @@ The Calibration menu is missing on some Mac machines. Try restarting the App can 2. AMS filaments were added to non-Bambulab printers 3. Wrong bed setting was applied -### [V1.3.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.4): +### [V1.3.4 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.3.4): 1. Add a new printer order - sandwich mode: This new order is similar to the outer-wall-first mode in achieving the best dimensional accuracy. This new approach however avoids printing outer walls right after a long travel, which may cause artifacts on the surface in many cases. sandwich-mode1 @@ -71,7 +71,7 @@ sandwich-mode2 3. Fix a compatibility issue for gcode-preview 4. Merge upstream changes -### [V1.3.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.3): +### [V1.3.3 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.3.3): 1. Improve top surface quality. Fix a bug that internal solid infills didn't use monotonic when top surface is using monotonic lines 2. New feature: filter out tiny gaps. @@ -84,13 +84,13 @@ a filament/extruder change action. This change only affects multi-color printing 8. Force using linear PA model when manual PA override is enabled for Bambu machines 9. Remember the last used filament 10. Skip checking BL network plugin for third-party printers. -### [V1.3.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.2-sf): +### [V1.3.2 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.3.2-sf): 1. Support device control view for 3rd party printers 2. Port `Small perimeters` feature from PrusaSlicer. I also add an extra option to adjust the small perimeter threshold You might want to reduce speed for small perimeter parts to prevent failures like bellow: 3. Add fan speed preview mode 4. Fix an issue that print time estimation is inaccurate when `Klipper` g-code style is used. -### [V1.3.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.1-sf): +### [V1.3.1 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.3.1-sf): 1. Support change bed size and nozzle diameter 2. Allow users to specify the bridge infill direction 3. bridge_infill_direction1 @@ -101,30 +101,30 @@ You might want to reduce speed for small perimeter parts to prevent failures lik 8. Support Klipper Exclude Objects 9. Better support for Moonraker's metadata. -### [V1.2.5.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5.3-sf): +### [V1.2.5.3 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.2.5.3-sf): 1. Label objects to support Klipper Exclude Objects feature 2. Allow users to change output file name format 3. Fix a bug that pressure advance value was not saved in the profile 4. Optimize non-Bambu printer profiles 5. Remove M900 S0 which is not necessary. -### [V1.2.5 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5-sf): +### [V1.2.5 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.2.5-sf): 1. Add options to adjust jerk for different line types 2. Add an option to adjust acceleration for travel. Higher acceleration for travel and lower acceleration for the outer wall makes it possible to print faster and nicer. 3. Add an option to manually override the Pressure Advance / Linear Advance for each filament. -### [V1.2.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.4-sf): +### [V1.2.4 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.2.4-sf): 1. Allow users to adjust accelerations for inner/outer walls separately. 2. Allow users to adjust the bottom surface flow-rate 3. Fix an issue that bed temperature for other layers is not set properly. This bug exists in the upstream as well. My PR here(bambulab#319) -### [V1.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2-sf): +### [V1.2 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.2-sf): 1. Allow user to change machine limits 2. Allow users to adjust the top surface flow-rate. 3. Unlock some cool hidden features in BambuStudio. 4. Fix an issue that the software connected to Bambulab's staging server by default. (Only Bambulab machines were affected) -### [V1.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.1): +### [V1.1 changes](https://github.com/SoftFever/OrcaSlicer/releases/tag/v1.1): 1. Support third-party printers: - Voron 2.4 - Voron Trident @@ -144,8 +144,8 @@ Demo video: https://youtu.be/vSNE9iGj2II Apple requires a subscription(costs 99$ yearly) for developers to sign their app. I don't do a lot of dev work on Mac, and this is a nonprofit open-source project, so I decided not to pay the money ;) ## 2. If you have troubles to run the build, you might need to install following runtimes: -- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) -- [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) +- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe) +- [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe) ## 3. BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer. - For Voron and any Klipper based printers: diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index f86e9a0678..49526ca48f 100644 --- a/bbl/i18n/de/BambuStudio_de.po +++ b/bbl/i18n/de/BambuStudio_de.po @@ -9437,8 +9437,8 @@ msgstr "" #~ msgid "Hide Others" #~ msgstr "Andere ausblenden" -#~ msgid "Hide BambuStudio-SoftFever" -#~ msgstr "BambuStudio-SoftFever ausblenden" +#~ msgid "Hide OrcaSlicer" +#~ msgstr "OrcaSlicer ausblenden" #~ msgid "Select presets to compare" #~ msgstr "Wähle Voreinstellungen zum Vergleich aus" diff --git a/build_release.bat b/build_release.bat index 214d23a0fa..3c1157fa12 100644 --- a/build_release.bat +++ b/build_release.bat @@ -18,6 +18,6 @@ cd %WP% mkdir build cd build -cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" +cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" cmake --build . --config Release --target ALL_BUILD -- -m cmake --build . --target install --config Release \ No newline at end of file diff --git a/build_release_macos.sh b/build_release_macos.sh index 46c151ed8c..adf67181e3 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -69,17 +69,17 @@ cd $WD mkdir -p build_$ARCH cd build_$ARCH echo "building studio..." -cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever_$ARCH" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH} +cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer_$ARCH" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH} cmake --build . --config Release --target ALL_BUILD -mkdir -p BambuStudio-SoftFever_$ARCH -cd BambuStudio-SoftFever_$ARCH -rm -r ./BambuStudio-SoftFever.app -cp -pR ../src/Release/BambuStudio.app ./BambuStudio-SoftFever.app -resources_path=$(readlink ./BambuStudio-SoftFever.app/Contents/Resources) -rm ./BambuStudio-SoftFever.app/Contents/Resources -cp -R $resources_path ./BambuStudio-SoftFever.app/Contents/Resources +mkdir -p OrcaSlicer_$ARCH +cd OrcaSlicer_$ARCH +rm -r ./OrcaSlicer.app +cp -pR ../src/Release/OrcaSlicer.app ./OrcaSlicer.app +resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources) +rm ./OrcaSlicer.app/Contents/Resources +cp -R $resources_path ./OrcaSlicer.app/Contents/Resources # delete .DS_Store file -find ./BambuStudio-SoftFever.app/ -name '.DS_Store' -delete +find ./OrcaSlicer.app/ -name '.DS_Store' -delete # extract version export ver="_dev" echo $PWD @@ -90,4 +90,4 @@ then fi -zip -FSr BambuStudio-SoftFever${ver}_Mac_${ARCH}.zip BambuStudio-SoftFever.app +zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app diff --git a/build_relwithdebinfo.bat b/build_relwithdebinfo.bat index 2f3e4887e0..b5f581c138 100644 --- a/build_relwithdebinfo.bat +++ b/build_relwithdebinfo.bat @@ -18,6 +18,6 @@ cd %WP% mkdir build cd build -cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" +cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" cmake --build . --config RelWithDebInfo --target ALL_BUILD -- -m @REM cmake --build . --target install --config RelWithDebInfo \ No newline at end of file diff --git a/src/.doxygen b/src/.doxygen index 623ec7f68f..18b61b82f7 100644 --- a/src/.doxygen +++ b/src/.doxygen @@ -184,7 +184,7 @@ FULL_PATH_NAMES = YES # will be relative from the directory where doxygen is started. # This tag requires that the tag FULL_PATH_NAMES is set to YES. -STRIP_FROM_PATH = /Users/lijiang/lab/BambuStudio-SoftFever/ +STRIP_FROM_PATH = /Users/lijiang/lab/OrcaSlicer/ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # path mentioned in the documentation of a class, which tells the reader which diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42f8e12e2e..b854a20065 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -236,7 +236,7 @@ else () set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/../resources") endif () if (CMAKE_MACOSX_BUNDLE) - set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/$/BambuStudio.app/Contents/Resources") + set(BIN_RESOURCES_DIR "${CMAKE_CURRENT_BINARY_DIR}/$/OrcaSlicer.app/Contents/Resources") set(MACOSX_BUNDLE_ICON_FILE Icon.icns) set(MACOSX_BUNDLE_BUNDLE_NAME "Bambu Studio") set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${SLIC3R_VERSION}) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 6b3a684b6e..8f0788eefd 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -38,7 +38,7 @@ using namespace nlohmann; namespace Slic3r { -static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/softfever/bambustudio-softfever/releases"; +static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/softfever/OrcaSlicer/releases"; static const std::string MODELS_STR = "models"; const std::string AppConfig::SECTION_FILAMENTS = "filaments"; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 63326e8e90..90648937bd 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1887,7 +1887,7 @@ void GUI_App::init_download_path() void GUI_App::init_app_config() { // Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release. - SetAppName("BambuStudio-SoftFever"); + SetAppName("OrcaSlicer"); // SetAppName(SLIC3R_APP_KEY "-alpha"); // SetAppName(SLIC3R_APP_KEY "-beta"); // SetAppDisplayName(SLIC3R_APP_NAME); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index aa502e7ac5..669b505420 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2538,7 +2538,7 @@ void MainFrame::init_menubar_as_editor() // help append_menu_item(m_topbar->GetCalibMenu(), wxID_ANY, _L("Tutorial"), _L("Calibration help"), - [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://github.com/SoftFever/BambuStudio-SoftFever/wiki/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr, + [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://github.com/SoftFever/OrcaSlicer/wiki/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr, [this]() {return m_plater->is_view3D_shown();; }, this); #else @@ -2604,7 +2604,7 @@ void MainFrame::init_menubar_as_editor() [this]() {return m_plater->is_view3D_shown();; }); // help append_menu_item(calib_menu, wxID_ANY, _L("Tutorial"), _L("Calibration help"), - [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://github.com/SoftFever/BambuStudio-SoftFever/wiki/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr, + [this](wxCommandEvent&) { wxLaunchDefaultBrowser("https://github.com/SoftFever/OrcaSlicer/wiki/Calibration", wxBROWSER_NEW_WINDOW); }, "", nullptr, [this]() {return m_plater->is_view3D_shown();; }, this); m_menubar->Append(calib_menu,wxString::Format("&%s", _L("Calibration"))); diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 39fa9e9ebf..d8b8cdb048 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -1239,7 +1239,7 @@ wxString OptionsGroup::get_url(const std::string& path_end) } // Softfever: point to sf wiki for seam parameters if (path_end == "Seam") { - return wxString::Format(L"https://github.com/SoftFever/BambuStudio-SoftFever/wiki/%s", from_u8(path_end)); + return wxString::Format(L"https://github.com/SoftFever/OrcaSlicer/wiki/%s", from_u8(path_end)); } else { //BBS