Skip to content

Commit 9d6e155

Browse files
authored
Merge branch 'SoftFever:main' into main
2 parents ee6223c + 84d3bd2 commit 9d6e155

File tree

169 files changed

+8095
-8456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+8095
-8456
lines changed

.cursorignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ build_*/
44
build/
55
localization/
66
sandboxes/
7-
resources/
7+
resources/*
8+
!resources/web/
9+
!resources/dailytip
10+
!resources/shaders

.github/workflows/build_all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
include:
52-
# Deprecate appimage
52+
# Deprecate 20.04appimage
5353
# - os: ubuntu-20.04
54-
# - os: ubuntu-24.04
54+
- os: ubuntu-24.04
5555
- os: windows-latest
5656
- os: macos-14
5757
arch: arm64

.github/workflows/build_orca.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ jobs:
267267
chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
268268
269269
- name: Build orca_custom_preset_tests
270-
if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
270+
if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04'
271271
working-directory: ${{ github.workspace }}/build/src
272272
shell: bash
273273
run: |
@@ -307,7 +307,7 @@ jobs:
307307
message: "nightly-builds"
308308

309309
- name: Deploy orca_custom_preset_tests
310-
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
310+
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
311311
uses: WebFreak001/[email protected]
312312
with:
313313
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}

deps/TIFF/TIFF.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (APPLE)
1717
else()
1818
orcaslicer_add_cmake_project(TIFF
1919
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
20-
URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
20+
URL_HASH SHA256=17a3e875acece9be40b093361cfef47385d4ef22c995ffbf36b2871f5785f9b8
2121
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
2222
CMAKE_ARGS
2323
-Dlzma:BOOL=OFF
@@ -27,7 +27,4 @@ else()
2727
-Dpixarlog:BOOL=OFF
2828
)
2929

30-
endif()
31-
32-
33-
30+
endif()

0 commit comments

Comments
 (0)