From 0851534d8091fae1e7608dec999ed73f9058f199 Mon Sep 17 00:00:00 2001 From: womendoushihaoyin Date: Thu, 10 Oct 2024 16:01:11 +0800 Subject: [PATCH] rebase fix fix rebase and fix the Snapmaker_Orca_aoubt.svg fix build_orca.yml fix build_orca fix Snapmaker.json --- .github/workflows/build_orca.yml | 21 +++--- resources/images/Snapmaker_Orca_about.svg | 87 +++++++++++++++++++++++ resources/profiles/Snapmaker.json | 8 --- src/slic3r/Utils/Http.cpp | 2 +- 4 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 resources/images/Snapmaker_Orca_about.svg diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 9afde5c804c..bfc73a87219 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -140,8 +140,8 @@ jobs: with: upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label} release_id: 169912305 - asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg - asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg + asset_path: ${{ github.workspace }}/Snapmaker_Orca_Mac_${{inputs.arch}}_${{ env.ver }}.dmg + asset_name: Snapmaker_Orca_Mac_${{inputs.arch}}_${{ env.ver }}.dmg asset_content_type: application/octet-stream max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted @@ -159,9 +159,6 @@ jobs: - name: Build slicer Win if: inputs.os == 'windows-latest' working-directory: ${{ github.workspace }} - env: - WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\' - WindowsSDKVersion: '10.0.22000.0\' run: .\build_release_vs2022.bat slicer - name: Create installer Win @@ -209,8 +206,8 @@ jobs: with: upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label} release_id: 169912305 - asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip - asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip + asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip + asset_name: Snapmaker_Orca_Windows_${{ env.ver }}_portable.zip asset_content_type: application/x-zip-compressed max_releases: 1 @@ -220,8 +217,8 @@ jobs: with: upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label} release_id: 169912305 - asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe - asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe + asset_path: ${{ github.workspace }}/build/Snapmaker_Orca_Windows_Installer_${{ env.ver }}.exe + asset_name: Snapmaker_Orca_Windows_Installer_${{ env.ver }}.exe asset_content_type: application/x-msdownload max_releases: 1 @@ -287,8 +284,8 @@ jobs: with: upload_url: https://uploads.github.com/repos/Snapmaker/OrcaSlicer/releases/169912305/assets{?name,label} release_id: 169912305 - asset_path: ./build/OrcaSlicer_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage - asset_name: OrcaSlicer_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage + asset_path: ./build/Snapmaker_Orca_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage + asset_name: Snapmaker_Orca_Linux${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage asset_content_type: application/octet-stream max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted @@ -301,4 +298,4 @@ jobs: asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip asset_name: orca_custom_preset_tests.zip asset_content_type: application/octet-stream - max_releases: 1 + max_releases: 1 \ No newline at end of file diff --git a/resources/images/Snapmaker_Orca_about.svg b/resources/images/Snapmaker_Orca_about.svg new file mode 100644 index 00000000000..401babdf82d --- /dev/null +++ b/resources/images/Snapmaker_Orca_about.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index a684336394c..0a321389709 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -940,14 +940,6 @@ "name": "Snapmaker Breakaway Support", "sub_path": "filament/Snapmaker Breakaway Support.json" }, - { - "name": "Snapmaker Breakaway Support @base", - "sub_path": "filament/Snapmaker Breakaway Support @base.json" - }, - { - "name": "Snapmaker Breakaway Support", - "sub_path": "filament/Snapmaker Breakaway Support.json" - }, { "name": "Snapmaker Dual TPE", "sub_path": "filament/Snapmaker Dual TPE.json" diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp index bfd9eab2f02..77a44e699ba 100644 --- a/src/slic3r/Utils/Http.cpp +++ b/src/slic3r/Utils/Http.cpp @@ -184,7 +184,7 @@ Http::priv::priv(const std::string &url) set_timeout_max(DEFAULT_TIMEOUT_MAX); ::curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, log_trace); ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); // curl makes a copy internally - ::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_APP_NAME "/" SoftFever_VERSION); + ::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_APP_NAME "/" SLIC3R_VERSION); ::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer.front()); #ifdef __WINDOWS__ ::curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_MAX_TLSv1_2);