Skip to content

Commit 61903c8

Browse files
hemiao2023hemiao2023
authored
Merge branch 'master' into patch-1
2 parents 6cac90e + 9d22ea8 commit 61903c8

1,331 files changed

Lines changed: 216643 additions & 30573 deletions

File tree

Some content is hidden

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

‎.github/FUNDING.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
github: SoftFever
2+
ko_fi: SoftFever
3+
custom: https://paypal.me/softfever3d

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
name: 🐞 Bug Report
2+
description: File a bug report
3+
labels: ["bug"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
**Thank you for using Orca Slicer and wanting to report a bug.**
9+
10+
Please note that this is not the place to make feature requests or ask for help.
11+
For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
12+
13+
Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
14+
- type: checkboxes
15+
attributes:
16+
label: Is there an existing issue for this problem?
17+
description: Please search to see if an issue already exists for the bug you encountered.
18+
options:
19+
- label: I have searched the existing issues
20+
required: true
21+
- type: input
22+
id: version
23+
attributes:
24+
label: OrcaSlicer Version
25+
description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
26+
placeholder: e.g. 1.9.0
27+
validations:
28+
required: true
29+
- type: dropdown
30+
id: os_type
31+
attributes:
32+
label: "Operating System (OS)"
33+
description: "What OSes are you are experiencing issues on?"
34+
multiple: true
35+
options:
36+
- Linux
37+
- macOS
38+
- Windows
39+
validations:
40+
required: true
41+
- type: input
42+
id: os_version
43+
attributes:
44+
label: "OS Version"
45+
description: "What OS version does this relate to?"
46+
placeholder: "i.e. OS: Windows 7/8/10/11 ..., Ubuntu 22.04/Fedora 36 ..., macOS 10.15/11.1/12.3 ..."
47+
validations:
48+
required: true
49+
- type: textarea
50+
id: system_info
51+
attributes:
52+
label: Additional system information
53+
description: For the performance issue, please also show the CPU, Memory information; For the 3D Rendering issue, please also show the Display Card information.
54+
placeholder: |
55+
CPU: 11th gen Intel r core tm i7-1185g7/AMD Ryzen 7 6800h/...
56+
Memory: 32/16 GB...
57+
Display Card: NVIDIA Quadro P400/...
58+
validations:
59+
required: false
60+
- type: input
61+
id: printer
62+
attributes:
63+
label: Printer
64+
description: Which printer was selected
65+
placeholder: Voron 2.4/VzBot/Prusa MK4/Bambu Lab X1 series/Bambu Lab P1P/...
66+
validations:
67+
required: true
68+
- type: textarea
69+
id: reproduce_steps
70+
attributes:
71+
label: How to reproduce
72+
description: Please described the detailed steps to reproduce this issue
73+
placeholder: |
74+
1. Go to '...'
75+
2. Click on '...'
76+
3. Scroll down to '...'
77+
4. See error
78+
validations:
79+
required: true
80+
- type: textarea
81+
id: actual_results
82+
attributes:
83+
label: Actual results
84+
description: What happens after the above steps? Please, enclose a screenshot whenever possible (even when you think the description is clear).
85+
validations:
86+
required: true
87+
- type: textarea
88+
id: expected_results
89+
attributes:
90+
label: Expected results
91+
description: What should happen after the above steps?
92+
validations:
93+
required: true
94+
- type: markdown
95+
id: file_required
96+
attributes:
97+
value: |
98+
Please be sure to add the following files:
99+
* Please upload a ZIP archive containing the **project file** used when the problem arise. Please export it just before or after the problem occurs. Even if you did nothing and/or there is no object, export it! (We need the configurations in project file).
100+
You can export the project file from the application menu in `File`->`Save project as...`, then zip it
101+
* A **log file** for crashes and similar issues.
102+
You can find your log file here:
103+
Windows: `%APPDATA%\OrcaSlicer\log` or usually `C:\Users\<your username>\AppData\Roaming\OrcaSlicer\log`
104+
MacOS: `$HOME/Library/Application Support/OrcaSlicer/log`
105+
Linux: `$HOME/.config/OrcaSlicer/log`
106+
If Orca Slicer still starts, you can also reach this directory from the application menu in `Help` -> `Show Configuration Folder`
107+
You can zip the log directory, or just select the newest logs when this issue happens, and zip them
108+
- type: textarea
109+
id: file_uploads
110+
attributes:
111+
label: Project file & Debug log uploads
112+
description: Drop the project file and debug log here
113+
placeholder: |
114+
Project File: `File` -> `Save project as...` then zip it & drop it here
115+
Log File: `Help` -> `Show Configuration Folder`, then zip the log directory, or just select the newest logs in `log` when this issue happens and zip them, then drop the zip file here
116+
validations:
117+
required: true
118+
- type: checkboxes
119+
id: file_checklist
120+
attributes:
121+
label: Checklist of files to include
122+
options:
123+
- label: Log file
124+
- label: Project file
125+
- type: textarea
126+
attributes:
127+
label: Anything else?
128+
description: |
129+
Screenshots? References? Anything that will give us more context about the issue you are encountering!
130+
131+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
132+
validations:
133+
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Community Support (Discord channel)
4+
url: https://discord.gg/P4VE9UY9gJ
5+
about: Please ask and answer support "how do I?"questions here.
6+
- name: Discussion Forum
7+
url: https://github.com/SoftFever/OrcaSlicer/discussions
8+
about: Please raise ideas and feature suggestions here.

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: 🚀 Feature Request / Enhancement
2+
description: Suggest an improvement to make Orca Slicer even better!
3+
labels: ["enhancement"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this feature request!
9+
10+
If your idea is still at the formulation stage, or you're not sure it would
11+
be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
12+
or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
13+
- type: checkboxes
14+
attributes:
15+
label: Is there an existing issue for this feature request?
16+
description: |
17+
Please search to see if an issue already exists for a feature, or perhaps one similar.
18+
You can then comment and react so that we know know much interest there is in the feature request.
19+
options:
20+
- label: I have searched the existing issues
21+
required: true
22+
- type: textarea
23+
attributes:
24+
label: Is your feature request related to a problem?
25+
description: A clear and concise description of what the problem is.
26+
placeholder: I'm always frustrated when [...]
27+
validations:
28+
required: true
29+
- type: dropdown
30+
attributes:
31+
label: Which printers will be beneficial to this feature?
32+
description: Select affected printer firmware type.
33+
multiple: true
34+
options:
35+
- Klipper
36+
- Marlin
37+
- Others
38+
- All
39+
validations:
40+
required: true
41+
- type: textarea
42+
attributes:
43+
label: Describe the solution you'd like
44+
description: A clear and concise description of what you want to happen.
45+
placeholder: It should do [...]
46+
validations:
47+
required: true
48+
- type: textarea
49+
attributes:
50+
label: Describe alternatives you've considered
51+
description: A clear and concise description of any alternative solutions or features you've considered.
52+
placeholder: |
53+
1. [...]
54+
2. [...]
55+
3. [...]
56+
validations:
57+
required: false
58+
- type: textarea
59+
attributes:
60+
label: Additional context
61+
description: |
62+
Add any other context, diagrams, illustations or screenshots about the feature request here.
63+
64+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
65+
validations:
66+
required: false

‎.github/dependabot.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
# Only care about major updates to github actions
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "monthly"
8+
ignore: # Only suggest major updates for built-in actions
9+
- dependency-name: "github/*"
10+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]
11+
- dependency-name: "actions/*"
12+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]
13+
# Docker dependencies
14+
- package-ecosystem: "docker"
15+
directory: "/"
16+
schedule:
17+
interval: "monthly"
18+
# no support for c/cpp

‎.github/pull_request_template.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Description
2+
3+
<!--
4+
> Please provide a summary of the changes made in this PR. Include details such as:
5+
> * What issue does this PR address or fix?
6+
> * What new features or enhancements does this PR introduce?
7+
> * Are there any breaking changes or dependencies that need to be considered?
8+
-->
9+
10+
# Screenshots/Recordings/Graphs
11+
12+
<!--
13+
> Please attach relevant screenshots to showcase the UI changes.
14+
> Please attach images that can help explain the changes.
15+
-->
16+
17+
## Tests
18+
19+
<!--
20+
> Please describe the tests that you have conducted to verify the changes made in this PR.
21+
-->

‎.github/workflows/build_all.yml‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
name: Build all
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
- release/*
9+
paths:
10+
- 'deps/**'
11+
- 'src/**'
12+
- '**/CMakeLists.txt'
13+
- 'version.inc'
14+
- 'localization/**'
15+
- 'resources/**'
16+
- ".github/workflows/build_*.yml"
17+
- 'flatpak/**'
18+
19+
pull_request:
20+
branches:
21+
- main
22+
- release/*
23+
paths:
24+
- 'deps/**'
25+
- 'src/**'
26+
- '**/CMakeLists.txt'
27+
- 'version.inc'
28+
- ".github/workflows/build_*.yml"
29+
- 'BuildLinux.sh'
30+
- 'build_release_vs2022.bat'
31+
- 'build_release_macos.sh'
32+
- 'flatpak/**'
33+
34+
workflow_dispatch: # allows for manual dispatch
35+
inputs:
36+
build-deps-only:
37+
description: 'Only build dependencies (bypasses caching)'
38+
type: boolean
39+
default: false
40+
41+
concurrency:
42+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
43+
cancel-in-progress: true
44+
45+
46+
jobs:
47+
build_all:
48+
name: Build All
49+
strategy:
50+
fail-fast: false
51+
matrix:
52+
include:
53+
# Deprecate appimage
54+
# - os: ubuntu-20.04
55+
# - os: ubuntu-24.04
56+
- os: windows-latest
57+
- os: macos-14
58+
arch: arm64
59+
uses: ./.github/workflows/build_check_cache.yml
60+
with:
61+
os: ${{ matrix.os }}
62+
arch: ${{ matrix.arch }}
63+
build-deps-only: ${{ inputs.build-deps-only || false }}
64+
secrets: inherit
65+
flatpak:
66+
name: "Flatpak"
67+
container:
68+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-46
69+
options: --privileged
70+
volumes:
71+
- /usr/local/lib/android:/usr/local/lib/android
72+
- /usr/share/dotnet:/usr/share/dotnet
73+
- /opt/ghc:/opt/ghc1
74+
- /usr/local/share/boost:/usr/local/share/boost1
75+
strategy:
76+
matrix:
77+
variant:
78+
- arch: x86_64
79+
runner: ubuntu-24.04
80+
- arch: aarch64
81+
runner: ubuntu-24.04-arm
82+
runs-on: ${{ matrix.variant.runner }}
83+
env:
84+
date:
85+
ver:
86+
ver_pure:
87+
steps:
88+
- name: "Remove unneeded stuff to free disk space"
89+
run:
90+
rm -rf /usr/local/lib/android/* /usr/share/dotnet/* /opt/ghc1/* "/usr/local/share/boost1/*"
91+
- uses: actions/checkout@v4
92+
- name: Get the version and date
93+
run: |
94+
ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
95+
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
96+
ver="PR-${{ github.event.number }}"
97+
else
98+
ver=V$ver_pure
99+
fi
100+
echo "ver=$ver" >> $GITHUB_ENV
101+
echo "ver_pure=$ver_pure" >> $GITHUB_ENV
102+
echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
103+
shell: bash
104+
- uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
105+
with:
106+
bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
107+
manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml
108+
cache: true
109+
arch: ${{ matrix.variant.arch }}
110+
upload-artifact: false
111+
- name: Upload artifacts Flatpak
112+
uses: actions/upload-artifact@v4
113+
with:
114+
name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
115+
path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
116+
- name: Deploy Flatpak to nightly release
117+
if: ${{github.ref == 'refs/heads/main'}}
118+
uses: WebFreak001/deploy-nightly@v3.2.0
119+
with:
120+
upload_url: https://uploads.github.com/repos/CrealityOfficial/CrealityPrint/releases/168648306/assets{?name,label}
121+
release_id: 168648306
122+
asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
123+
asset_name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
124+
asset_content_type: application/octet-stream
125+
max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

0 commit comments

Comments
 (0)