Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
Update Main (#18)
Browse files Browse the repository at this point in the history
* add UndoValueUIManager from PS

from prusa3d/PrusaSlicer@32ff20d

Co-authored-by: YuSanka <[email protected]>

* Implement Preparation for Edit Custom Gcode

Original Commit: prusa3d/PrusaSlicer@7db83d5

Co-authored-by: YuSanka <[email protected]>

* Add first impl of EditGCodeDialog

Only current issue is that the grabber for the resizeable window is currently white (ongoing issue for Orca)

Original Commit: prusa3d/PrusaSlicer@a8307bf

Co-authored-by: YuSanka <[email protected]>

* Implement ParamsViewCtrl
+ GUI_App : Fixed update of the dark mode, when DataViewCtrl doesn't have header
-Orca: currently doesn't seem to display dataview labels properly. TBD if it continues to be an issue.

Original Commit: prusa3d/PrusaSlicer@c577b7f

Co-authored-by: YuSanka <[email protected]>

* Improved ParamsViewCtrl

Original Commit: prusa3d/PrusaSlicer@59af551

Co-authored-by: YuSanka <[email protected]>

* Partial Automation of getting Gcode placeholders

Included pre-generated files specific to Orca rather than PS provided files

Original Commit: prusa3d/PrusaSlicer@55d5921

Co-authored-by: YuSanka <[email protected]>

* Implemented new grouping for the params

Original Commit: prusa3d/PrusaSlicer@b2bd7f5

Co-authored-by: YuSanka <[email protected]>

* Add parameter description

Original Commit: prusa3d/PrusaSlicer@d652f15

Co-authored-by: YuSanka <[email protected]>

* Edit Custom G-Codes Improvements

Orca: Added option to use CMake config option ORCA_CHECK_GCODE_PLACEHOLDERS to check custom gcode placeholders rather than using debug

Original Commit: prusa3d/PrusaSlicer@b8bb7f2

Co-authored-by: YuSanka <[email protected]>

* Add wrapping description

Original Commit: prusa3d/PrusaSlicer@83b8988

Co-authored-by: YuSanka <[email protected]>

* Update Labels

Original Commit: prusa3d/PrusaSlicer@7efdbec

Co-authored-by: Lukas Matena <[email protected]>

* Add fix for linux

Original Commit: prusa3d/PrusaSlicer@361ef22

Co-authored-by: YuSanka <[email protected]>

* Remove extraneous options

* Fix duplicate else statement

* Update Icons

Add new icons from PS and update to use Orca color scheme

Original Commit: prusa3d/PrusaSlicer@37afe79

Co-authored-by: YuSanka <[email protected]>

* Remove SlicingState Options that aren't in Orca

Also organized and added missing options to `s_CustomGcodeSpecificPlaceholders`

* Improve checking placeholders

Dialog now shows all issues within the same dialog

If a custom gcode value is not specified within the config, a testing value is added. This ensures that (most) of the custom gcode is parsed, and thus checked against the definitions.

* Make Compatible with wx 3.1.5

This should be reverted when wxWidgets 3.2.1 is re-implemented

* Use proper config when checking for custom gcode

make sure that the local copy of the config is being used when checking if there is custom gcode otherwise it would be possible it doesn't get run during testing

* Don't show option if defined with type coNone

* Add defs for custom gcode

* Subgroup presets by page

* fix spacing in tooltip

* Check if cmake option is truthy rather than defined

* Add the rest of the param defs

Also added temperatures category to handle them

* Override full config defs in non-preset categories

* Remove unused code

* fix linux compilation

* Implement Search for GCode DataView

* Add search term highlighting to EditGCodeDialog

Now leaves text stored in ParamsNode un-formatted and uses flags to determine the formatting. The GetFormattedText function now returns the markup text.

* Append extra parameters from preset

If an option is not under a category in the tab but is part of the preset, it is added to the dataview.

* Hardcode Location of Add Button

Hardcoding it prevents the add button from jumping around when switching between parameters with single-line and multi-line descriptions

* Remove Resizeable Border

Helps with previous commit
DataView currently doesn't resize vertically
Also, at the moment, the resize grabber is not respecting dark mode and this solves that too.

* Document building and debugging with XCode. (SoftFever#3733)

* Document building and debugging with XCode.

* Account for Intel Macs!

* Fixes SoftFever#3721 - Typo in lang files (SoftFever#3722)

* Update OrcaSlicer.pot

* Update CreatePresetsDialog.cpp

* Update OrcaSlicer_hu.po

* Update OrcaSlicer_nl.po

* Update OrcaSlicer_ja.po

* Update OrcaSlicer_sv.po

* Update OrcaSlicer_en.po

* Update OrcaSlicer_tr.po - TURKISH translation update (SoftFever#3732)

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* elegoo_neptune4pro_buildplate_texture.png updated

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

---------

Co-authored-by: SoftFever <[email protected]>

* Fix linux crashing when opening EditGcodeDialog

* [FEATURE] Experimental small area flow compensation (SoftFever#3334)

* [FEATURE] Experimental small area flow compensation

This is a native implementation of the [Small Area Flow Compensation](https://github.com/Alexander-T-Moss/Small-Area-Flow-Comp)
post-processor by Alexander Þór for OrcaSlicer.

Quite often small areas of solid infill appear to be over-extruded, despite
the rest of a print looking like it has a well-dialled-in EM/Flow. Currently,
there isn't a good understanding of why this happens, so this is an attempt
at a brute-force approach to treat the symptom.

This feature modifies the flow of extrusion lines inversely proportional to
the length of the extrusion line (the shorter the extrusion, the less flow
it should have).

Alexander Þór: Author of the original script implementation
Weaslus: Proof Reader, Hypeman & pestered folks into making this

* [TASK] Whitespace cleanup

* [TASK] Add credits, format code, improve input labels

* [TASK] Use multi-line textbox as input for flow model

* [TASK] Toggle flow compensation per object

* [TASK] Enable flow compensation for first layer

---------

Co-authored-by: SoftFever <[email protected]>

* Don't check the temperature of multi filament for multi toolhead printers (SoftFever#3649)

do not check the temperature of multi filaments for multi toolhead printers

* Allow specifying print order within each layer (SoftFever#3685)

* Allow reordering objects regardless of print seq

* Add option to control the layer print order

* Sort object by their order in object list instead of id

* Show print order when print order is the same as the object list

* Ensure the print order when print order is same as object list

* Update option name

---------

Co-authored-by: SoftFever <[email protected]>

* Add plate name edit btn (SoftFever#3756)

* Re-enable printing by object gcode (SoftFever#3691)

Re-enable printing by object gcide

* Add project info editor (SoftFever#3754)

* Add button to add model info

* Initial impl of project info editor

* Add sidebar item to edit project info

* Add license selector

* Fix use of deprecated apis

* Fix license combox dark mode

* Add back button on project info editor screen

---------

Co-authored-by: SoftFever <[email protected]>

* QoL: Some UI improvements to Cut Gizmo (SoftFever#3752)

* Cut: Add color legend for upper & lower part

* Cut: Make grabber larger

* fix DE localization after feature updates (SoftFever#3746)

* Retain mirror state when scaling using text input (SoftFever#3643) (SoftFever#3719)

* Fixes for French translations (SoftFever#3773)

* Fixes for French

* Added missing translations

* Revert to BBL get_line function

* [BUGFIX] Prevent crash in small area infill comp with gcode comments (SoftFever#3786)

Enabling the option "Verbose G-Code" would trigger a crash in the Small Area Infill flow compensation due to concurrent access/modification of the gcode comment.

* Fix duplicate entry of Only Lift Z above and below in the extruder tab (SoftFever#3788)

* Create SECURITY.md (SoftFever#3696)

* Update Spanish translation (SoftFever#3793)

* Update Spanish translation

* Update Spanish translation

* nightly release (SoftFever#3792)

* nightly release

* corrected printable_area (SoftFever#3527)

* corrected printable_area

* adjusted to keep origin at 0x0

* Debug Improvments on Windows (SoftFever#3275)

* fix assert statements

* Add ORCA_INCLUDE_DEBUG_INFO to deps cmake

adds option ORCA_INCLUDE_DEBUG_INFO to deps build script to allow an alternative for RelWithDebInfo that works on windows

* add build type option to windows script

* update .gitignore to include build*

* Creality K1 Profiles improvements (and K1C addition) (SoftFever#3728)

* Added K1C and fixed some settings (took from config files instead of Creality Print)

* Files renaming

* New PLA-CF, prettify json for K1C, naming uniformisation, ...

* Port Special PLA profiles to K1/K1 Max

* Changed slow down layer time and slow down min speed in order to improve overall speed on details.

* Raised PLA bed temp to 55°C

* Optimisations for ABS, ASA and added Generic PC profile.

* Added PA-CF and fixed PC profiles.

* Added new filaments to default materials

* QoL: Port profile value transfer on profile diff dialog from PrusaSlicer (SoftFever#3737)

* DiffDialog: Implemented a transfer of options from one preset to another
Related to [Feature Request] SoftFever#5384 - Copy values in Profile comparaison dialog

Cherry-picked from prusa3d/PrusaSlicer@0b8d738

Co-authored-by: YuSanka <[email protected]>

* Remove save button

* Sync with latest PS

* Use Orca button style

* Show tips about trasnfer disabled

---------

Co-authored-by: YuSanka <[email protected]>

* Modifiers should load at object offset like in Prusaslicer (SoftFever#3802)

* fix precedence errors

Fix a handful of precedence errors and 1 logic/precedence error.  None of the code will compile as intended without these changes.

* Update GUI_ObjectList.cpp

Modifiers should load at same offset as object they are created against.  Based on prusaslicer ObjectList::load_from_files where it works correctly.

---------

Co-authored-by: SoftFever <[email protected]>

* Fix build errors on main branch caused by version string

* Fix SoftFever#3311: filament Load / Unload time was not used in time estimation (SoftFever#3706)

* Fix for SoftFever#3311:

The `config.filament_load_time.values` and `config.filament_unload_time.values` are completely ignored. This was working in PrusaSlicer and apparently BBS converted the `GCodeProcessor::TimeProcessor.filament_load_times` and `GCodeProcessor::TimeProcessor.filament_unload_times` from being `std::vector<float>` to just `float` and they were using the BBS specific and currently hidden `machine_load_filament_time` and `machine_unload_filament_time` config values. Reverted that change by copying those lines from PrusaSlicer.

* Fix for SoftFever#3311:

Updated the previously fixed to code to keep compatibility with BBS printer .

* Fix for SoftFever#3311:

Updated `GCodeProcessor::get_filament_unload_time()` to keep compatibility with BBS printers.

* fix PR build on lInux

* handle the case when source file and target file is the same file

* Update the naming of the layer order option to intra-layer order (SoftFever#3834)

* Feature/merge 1.8.4 (SoftFever#3827)

* FIX: the logic of buried points that were not buried

JIRA: none

Signed-off-by: Kunlong Ma <[email protected]>
Change-Id: Id95174659c5fce7feba409eb5e14916608745fa4

* ci: update network module based on commit bc7ca98

Change-Id: I923526f0bf9ce5a288144fa1f9b0f2fc640f41b7

* Fix Firefox
Co-authored-by: hadess <[email protected]>

* FIX: cali: custom created filament from AMS displayed as incompatible

jira: new

remove the condition: is_system

Change-Id: Ib1366966bbdbe01bc9e2483d9914d270ebefa976

* FIX: duplicated items in comboBox at calibration completed page

jira: new

Change-Id: I4749a2206df16c438e0d3098e36274b2a20f313e

* ENH:update support for P1S plus

jira:[for p1s plus]

Change-Id: Id577d4e94e2162cb0045d261dfaa5f396ecded2f

* ENH: CLI: add mk information support

JIRA: no jira
Change-Id: Idd89b143d439de50d9f52eb8aec95b262d66875d

* ENH:calibration support p1p plus

jira:[plus]

Change-Id: Ia290d3a8a8b9adaac7a6ee26d9a8b5ea0c1b3aee

* FIX: add log for base_id and filament_id

github: SoftFever#3087

Change-Id: Iebfbd0f224fce49f33fc81c71e6108f6e3abb5ff

* FIX: sync whole preset vendor directory

Change-Id: I191dbe979a87ff35d38cab1149b7975664344838
Jira: STUDIO-5534
(cherry picked from commit 628866608116336453804aa1217dd55db04d47ad)

* FIX: use t_utc for debug only

Change-Id: Ia05d8969d4de3dd38908980d6e17a3ebb11ca279
Github 3045

Change-Id: I77935df53bbf2772b1146e5c330c537165a3a2e6

* FIX:make sort_volumes right

Jira: STUDIO-5645
Change-Id: If324c9115bfaaf0c1b7b4be7c7ee96ba6b8ac890

* ENH:keep an unload logic

jira:[for unload]

Change-Id: Id30ec71ffa5b2dac89346ea47ca48a62479e3ab1

* FIX: several problems with mesh boolean

1. Cut with multiple volumes are OK now.
2. Close mesh boolean fail error with new object or open object
3. Fix wrong name and config of boolean resulting object

github: SoftFever#3118
jira: none

Change-Id: If2c9dbfb36cbdfe4917a2371217923891bb7909c
(cherry picked from commit 982c0ecb92cf7c2b5ae5972ab900a6b10e7dda50)

* NEW:limit the length of project name

jira:[project name]

Change-Id: I955620f7073b3b7fda280d1118524f561d047751

* ENH:adjusting the warning level of timelpase

jira:[STUDIO-5662]

Change-Id: I4902b22d316f5e09a97a62c88b8a98e55c405434

* FIX: 3mf specification: change namespace form slic3rpe to BambuStudio

Jira: XXXX

Change-Id: Id705affc875ef23fdf2ac6d79f0cb0aafc4f7050

* NEW: Open MakerWorld With BambuStudio GetParam

JIRA: none
Change-Id: I0d65b364f1cd2d634a88882ab072c3e61ea89167
(cherry picked from commit 8eaf45e5359439a7c796fd79876c86775abcf48e)

* FIX: Filament issue generated when creating a printer

Jira: XXXX

Change-Id: I976770b69b47641bd54aa7a9c56fba7f58d1ab68
(cherry picked from commit ba42188b93c58b3954234d72acdd9769a68e3d3c)

* FIX: Blank page appears when editing presets

Jira: 5563

Change-Id: I4c49e05515b1beff55991e92f8079c4499c27eab
(cherry picked from commit e86517d290f4cd0765a230d811b0ddf2c9f34c17)

* FIX: context menu didn't update UI

jira: STUDIO-5691

Change-Id: Ia66b8623d832eba805aff5320941233a68ff258b

* FIX: crash of "filling bed"

"get_arrange_settings() const" gets trapped in infinite recursive calling.
Now we delete this function.

jira: STUDIO-5688
Change-Id: Ia39974734bb37b2a2f06b5bf78185f01be726872

* FIX: boolean hangs in the middle of color painting

Can't do splits in combine_mesh_fff, as do_boolean of mcut will split meshes.

jira: STUDIO-5693
Change-Id: Idddb7d20dd7ca386c39ddd3d87d9defc3136aa5d
(cherry picked from commit 6c67d015941458e37faaf0015b6509b5a0eadc0e)

* Fix: Fix a number of compilation problems

issues found when using gcc version 13.2.0 (GCC) in a Flatpak sandbox

github : bambulab/BambuStudio#3074
github pull request: bambulab/BambuStudio#3096

Change-Id: I08aeac593eb1ce7675894df72e8489200bae713d
(cherry picked from commit 069d133d66bfa682de4a860e379d5dc16b3d907c)

* fix: macos icns issue when icon was not attached

github pull request:bambulab/BambuStudio#3116

Change-Id: I49072ad49f3af7669a6d307c791594ade210da50
(cherry picked from commit c977e5582e3a30ad16dd267810037423aad9a53c)

* FIX: Add flush_length for change_filament_gcode

Change-Id: I30f4b97d3d61c2a57f0e92f157cbd31c38aa7265
Jira: XXXX
(cherry picked from commit 92eb2bac977a0c4095b316cbbc6580fb5228b710)

* FIX: edit preset dialog can't close on mac

Jira: 5696

Change-Id: Ib33dfd07cc588ddd3805e3490a4d8c36dcd890ac

* ENH: add dev_ota_version in ssdp

JIRA: STUDIO-5740

Change-Id: Ic80e6d4b9bf82813fdc4a76604a3d36213d12b03
Signed-off-by: Stone Li <[email protected]>

* NEW:Adapt to multicolour and gradient colour

JIRA:xxxx
Change-Id: I8084cab603d5681cbcaf2d6f5e0d7ad5419cb2af

* NEW:Adaptation of semi transparent materials

JIRA: XXXX
Change-Id: Ie32d8ce67c37b85eb6d7d6594cb514a696307e68

* FIX: disable flush options if prime tower is unchecked

jira: STUDIO-5639

Change-Id: I25081584d430bc7d062e14bcc2cdbf7522cf9d99

* ENH: refine GetVersion for HMS query

JIRA: STUDIO-5763

Change-Id: Ia3ccc07d79cc0736eb12e9782da50211abb74772
Signed-off-by: Stone Li <[email protected]>

* FIX: Prefer old selection when sync AMS not compatible

Change-Id: I6b18db51887132a997cf78d70fff9a92e23bc44a
Jira: STUDIO-5416
(cherry picked from commit 077fae29823cf4f3071d408b1b40f55ee0cb33c6)

* FIX: The flushing was not auto-calc when sync ams list

JIRA: STUDIO-5551

1. flushing volume auto-calc when sync ams list
2. flushing volume takes the larger calculation value when filament has
   multi-colors

Signed-off-by: Kunlong Ma <[email protected]>
Change-Id: I72e6f9780ea56103a44c2da6068440a4615c254d

* FIX:fixed invalid links

jira:[fixed link]

Change-Id: I036a38b6e8e94da762f93805bd7be706538771fe

* FIX: Prompt to delete problematic presets

Jira: XXXX

Change-Id: Ic43f7bb782794d7ab0b6acbffbb5d73e94f6ed73

* FIX:fixed incorrect HMS content

jira:[STUDIO-5818]

Change-Id: Ia2896d6f0ab1ffedbc850e54168acece8e47bdbb

* FIX:external transparent material display error

JIRA: STUDIO-5845
Change-Id: I0a4f05ac5d5c0ac49d85a704ee65a7221c5f1e1d

* FIX: [5846] Custom Filament Page show System Filament

Simultaneously solve: When downloading Preset from the cloud, the filament_id of the preset in m_preset is null.

Jira: 5846

Change-Id: I6ba1b46fe92e345614b6a4af3fffa87d81fa2456

* FIX:A1 and p1 series do not support custom materials

JIRA:XXXX
Change-Id: Ib0459273d1f9a7152a5563757204634a8d0cd6f5

* FIX: exception when comparing profiles

jira:[NEW]

Signed-off-by: XunZhangBambu <[email protected]>
Change-Id: I946b5fcd35f779d271df2b3de731fdcada5aab29
(cherry picked from commit 00e739570812e5c4be3e0f7702ce8c72c0f9e72b)

* FIX: hide_id_middle_string

Change-Id: I28f32ec526b443d31d7992971b80ab1cb737deb6
Github: STUDIO-5825

* ENH: modify some logs level

JIRA: STUDIO-5958

Change-Id: I5a8592dfb8ffa9a81952535cb30944f867aa0e22
Signed-off-by: Stone Li <[email protected]>

* NEW:build plate marker detect

Change-Id: I70f03efea688bb6ce71c3f5990bb3c50605ab184

* FIX: Studio UI Freeze when saving user preset

github: SoftFever#3335

Change-Id: Idaf53f673a3e46408826c06bdde2c592395d358b

* update bbl plugin version

* fix build errors

* update bbl profiles

* update color

---------

Signed-off-by: Kunlong Ma <[email protected]>
Signed-off-by: Stone Li <[email protected]>
Co-authored-by: Kunlong Ma <[email protected]>
Co-authored-by: gerrit <[email protected]>
Co-authored-by: liz.li <[email protected]>
Co-authored-by: tao wang <[email protected]>
Co-authored-by: lane.wei <[email protected]>
Co-authored-by: maosheng.wei <[email protected]>
Co-authored-by: chunmao.guo <[email protected]>
Co-authored-by: zhou.xu <[email protected]>
Co-authored-by: Arthur <[email protected]>
Co-authored-by: Bastien Nocera <[email protected]>
Co-authored-by: zhimin.zeng <[email protected]>
Co-authored-by: hu.wang <[email protected]>
Co-authored-by: Stone Li <[email protected]>
Co-authored-by: XunZhangBambu <[email protected]>

* Fix asserts which would not compile. (SoftFever#3741)

* Add Artillery Genius Pro Profile (SoftFever#3742)

* add photos required for genius pro

* add genius pro

* add genius pro

* add genius pro

* added genius pro, changed bed temp to 60c, nozzle temp 200c

* add genius pro, changed bed temp 60c, nozzle temp 200c

* add genius pro

* add genius pro and 0.4mm nozzle

* elafant foot to 0.15mm, 2 walls

* add genius pro print settings

* add genius pro paths

* Fixes 3833 ("Miss spelling") (SoftFever#3840)

* Add the Polish language (SoftFever#3622)

* Update localazy.json

Add localization pl

* Update Preferences.cpp

Add polish language

* OrcaSlicer_pl.po

Add OrcaSlicer_pl.po

* Update text.js

Add pl_PL translate

* Rename OrcaStudio_pl.po to OrcaSlicer_pl.po

* Add files via upload

* Update HMS.cpp

* Add files via upload

Update OrcaSlicer_pl

* Update OrcaSlicer_pl.po

* revert irrelevant change

* fix one misspelling

---------

Co-authored-by: SoftFever <[email protected]>

* update locale

* update plug-in page text

* Add Devcontainer Support (SoftFever#3777)

* add devcontainer files

* update postCreate

* add chmod for postCreate

* set CORES env variable to pass to build tool

* remove ssh functionality

* Move delete env file cmd to postStartCommand

* update how env file is done

* Update

- Move to older version of ubuntu for compatability
- Change vnc password to orca

* Prevent extra wall generation when sparse infill is zero (SoftFever#3775)

Co-authored-by: SoftFever <[email protected]>

* Refactor anker (SoftFever#3845)

* Bring over bed and cover files

* Initial refactored configuration file with placeholders for adding more nozzles

* Uniqueify filament profiles

* Initial refactored machine profiles

* Remove placeholders

* Correct machine selection flow

* Correct Typo

* Add placeholders to bring CE profile settings current with new format

* Fixes SoftFever#3326

* Port 0.4 Normal Mode Profiles

* Port fast mode profiles

* Remove superfluous settings

* Migrate existing filament profiles

* Update available nozzles and default materials

* Remove 'with' from file names

* Remove 'with' from file names

* Correct support object distance default

* Correct transcription errors

* Correct transcription error

* Bring max_travel_detour_distance into convention with other profiles

* Replace old profiles with the refactored profiles

* Correct name used from Extra Draft to Superdraft

* Re-use original names so printer profiles don't break

---------

Co-authored-by: Geofrey Ward <[email protected]>

* [Fix] Polish translation update (SoftFever#3855)

* [Fix] Polish translation update

* [Fix] Polish translation update text.js

* Fixes Anker M5C profiles (SoftFever#3862)

Fixes M5C profiles to use the old naming convention so they don't break existing M5c profiles

Co-authored-by: Geofrey Ward <[email protected]>

* Port "No Unsupported Perimeters" feature from SS (SoftFever#3189)

* first impl

* Properly handle extra bridges in `detect_surfaces_type()`

* Pass `perimeter_spacing` and `ext_perimeter_width` as parameters instead of instance property

* Make `process_no_bridge()` private

* Attempt to run `process_no_bridge()` in arachne

* Update `BridgeDetector::coverage` to give us more precise bridge coverage

Co-authored-by: supermerill <[email protected]>

* Fix bridge infill margin scaling

* Rename the option name as well as add tooltip

---------

Co-authored-by: Noisyfox <[email protected]>
Co-authored-by: supermerill <[email protected]>
Co-authored-by: SoftFever <[email protected]>

* Fix DEBUG build (SoftFever#3861)

* Fix asserts which would not compile.

* Fix DEBUG build.

Fully enable checking gcode placeholders in debug builds.

* Update OrcaSlicer_tr.po - TURKISH translation update (SoftFever#3864)

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* elegoo_neptune4pro_buildplate_texture.png updated

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

* Update OrcaSlicer_tr.po - TURKISH translation update

---------

Co-authored-by: SoftFever <[email protected]>

* Update Spanish translation (SoftFever#3873)

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Merge remote-tracking branch 'upstream/main' into spanish_translation"

This reverts commit 694a900, reversing
changes made to 4f53ce4.

* Revert "Update OrcaSlicer_es.po"

This reverts commit 4f53ce4.

* Revert "Revert "Update OrcaSlicer_es.po""

This reverts commit 53bd156.

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Update OrcaSlicer_es.po"

This reverts commit b21aad0.

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_en.po

* Update OrcaSlicer_es.po

* Traduccion de OrcaSlicer al español

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

---------

Co-authored-by: SoftFever <[email protected]>

* Enforce retraction before wipe (SoftFever#3888)

enforce retraction before wipe

* Change from "Back" to "Return" in the project tab (SoftFever#3867)

* Add a new handy model: Orca string hell (SoftFever#3892)

* add string hell

* tweak message

* Fix some rotation-related issues (SoftFever#3890)

* Fix issue with max_z after rotation

* Don't use `object.bounding_box()`, use `bounding_box_exact()` instead.

* Fix auto-orient

---------

Co-authored-by: SoftFever <[email protected]>

* Fix issue with PA pattern test using travel acceleration and jerk for the PA patterns (SoftFever#3851)

* Update orca_bot.yml (SoftFever#3798)

* Update orca_bot.yml

Just for discussion :)

Also would be nice to set a different style of "stale" label, maybe with an icon... it is quite not visible on smartphone anr Github app.

* Update orca_bot.yml

* Fix issue with auto orient a scaled object. (SoftFever#3904)

Partly revert 73ab032

* Update Polish translation (SoftFever#3903)

* Improve ExtrusionLine::simplify, eliminating many very-short extrusion segments which led to blemishes in thin-wall models sliced with Arachne - Take 2 (SoftFever#3750)

* Improve toolpath simplification to avoid blemishes when using Arachne on thin walls.

* Avoid reducing closed perimeters below 3 points.

Downstream code contains assumptions that closed ExtrusionLines are not
degenerate. Open ExtrusionLines already are not reduced below 2 points by
ExtrusionLine::simplify().

---------

Co-authored-by: SoftFever <[email protected]>

* A *lot* of import fixes for flatpak (SoftFever#3909)

* A *lot* of import fixes for flatpak

Aside, thank you @hadess for the majority of these fixes. You are the
base point for a lot of issues fixed during the creation of this
flatpak.

* Use slic3r::load_string_file

Boost 1.84 removed `boost::fs::load_string_file` so use the func located
in Utils.hpp

* [Fix] Polish translation update (SoftFever#3934)

* Update Polish translation

* Update Polish translation

* [Fix] Polish translation

* [Fix] Polish translation update

* [Fix] Polish translation

* [Fix] Polish translation

* [Fix] Polish translation

* [Fix] Polish translation

* 🔧 add Peopoly Magneto X profiles (SoftFever#3944)

* Fix crashing on AMS filament edit (SoftFever#3981)

* Update build_release.bat (SoftFever#3961)

Missing double-quotes after "Visual Studio 16 2019
on lines 32, 33, 44 and 45.

* Give CGAL a boost::prior (import) (SoftFever#3978)

CGAL uses boost::prior but doesn't import it properly. A small hack here
just imports it before importing anything CGAL.

* New printer profile : TwoTrees SK1 (SoftFever#3982)

* Initial profile for TwoTrees SK1

* Added PAUSE command instead of M601 and added machine_pause_gcode

* Enabled multi bed types and removed skirt loop

* Fixed non-ascii characters

* Added PETG, PLA-CF plus clean ups and fixes.

* Optimizations, and added PLA Silk

* Maximum velocity is too high on Klipper settings, lowered to 730mm/s, this was obtained with Klipper Auto Speed

* Ditto

* Small optimizations

* Added one layer to bottom for HSpeed profile

* Update orca_bot.yml (SoftFever#3986)

Update orca_bot.yml

I hope this one will make Orca BOT happy again :)

* Update Polish translation (SoftFever#3998)

* Update Polish translation

* Update Polish translation

* Fixed and integrated some Italian translations (SoftFever#4008)

* Update OrcaSlicer_it.po

* Update OrcaSlicer_it.po

* Update OrcaSlicer_it.po

* Security: skip writing print_host and apikey in gcode (SoftFever#4030)

* Creality Ender 3   and Prusa Mk3s   0,2;0,4,06 and 0,8 profiles (SoftFever#4029)

* Ender 3 - All nozzles and Quality Profiles

Ender 3 Profiles.

0.20 Nozzle
0.40 Nozzle
0.60 Nozzle
0.80 Nozzle

0.12 to 0.24 Quality Profiles for every Nozzle in Process Folder

* all

all

* Ender 3 Profiles

Ender 3 Profiles for: 0,2;0,4;0,6;0,8

5 Different and independent Quality profiles for each Nozzle.

Fine, Optimal, Standard, Draft and Superdraft

* aa

aa

* aa

aa

* aa

aa

* Prusa Mk3s Profiles

Prusa Mk3s Profiles

* Mk3s FIXED

mk3s FIXED

---------

Co-authored-by: SoftFever <[email protected]>

* Update HMS.cpp set language code to en by default for PL language (SoftFever#4034)

* Update HMS.cpp set language code to en by default for PL language

* Creality Ender-3 V3 SE: Fix present print (SoftFever#4031)

* Creality Ender-3 V3 SE: Fix present print

* Decouple filament minimum print speed from overhang slowdown (SoftFever#3859)

* fix Orca bot

* New Language: Catalan language for OrcaSlicer 1.9.0 (SoftFever#4036)

* Create OrcaSlicer_ca.po

* New Language: Catalan language for OrcaSlicer 1.9.0

New Language: Catalan language for OrcaSlicer 1.9.0

* Add code changes to support Catalan

---------

Co-authored-by: SoftFever <[email protected]>

* skip .stl/.png file when copying system profiles

* Russian translation update (SoftFever#4049)

Russian translation update OrcaSlicer V2.0.0-dev
+ update text.js (added and translated missing lines)

* Various Emboss improvements from PS (SoftFever#4039)

* Fix: invalid distance from surface when load from 3mf

Cherry-picked from prusa3d/PrusaSlicer@e1d9393

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

* Apply rotation angle given by style for new text object
Turn off feature 'use_surface' for new text object

Cherry-picked from prusa3d/PrusaSlicer@1cb156c

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

* Store/Load align and per_glyph in Slicer.ini for text style

Cherry-picked from prusa3d/PrusaSlicer@fe16f5b

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

* Store undo/redo snap after stop input-sliding

Cherry-picked from prusa3d/PrusaSlicer@fb4e471

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

* Initialize SvgFile object in optional different way.

Cherry-picked from prusa3d/PrusaSlicer@0ff255e

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

* SPE-2103
Make snap-shot to undo/redo stack only on release slider

Connected with attributes:
Text/advanced(char gap, line gap, boldness, skew ratio)
SVG(size)

Also change range for Boldness. VRT font-Ascent.
(different font may have different slider value range)

Fix line gap (it was denied when per glyph was false)

Cherry-picked from prusa3d/PrusaSlicer@ee3546b

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>

---------

Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>
Co-authored-by: SoftFever <[email protected]>

* Fixed typo "Confing" (SoftFever#4071)

* Support profile OTA update for Orca Slicer (SoftFever#4069)

profile ota support

* Fix for SoftFever#4047 (SoftFever#4072)

* Security: skip more print_host related info

* Update orca_bot.yml (SoftFever#4044)

* Update orca_bot.yml

My mistake, now should be fixed. 

SoftFever@ef9ff99

* Update orca_bot.yml

* Fixed Ender 3 profile inheritance (SoftFever#4089)

Fixed 4087

* Make reporting easier - part I (SoftFever#4080)

* Make reporting easier - part I

Make reporting easier - part I

* Update config.yml

* Update bug_report.yml (SoftFever#4082)

* Update bug_report.yml

Make it easier and nice r.)

* Update bug_report.yml

* Update and rename feature_request.md to feature_request.yml (SoftFever#4084)

* Update and rename feature_request.md to feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Update feature_request.yml

* Bug Fixed: Added "Printer Variant"  to all Ender 3  and Prusa Mk3s Profiles (SoftFever#4098)

Added "Printer Variant"  to all Ender 3  and Prusa Mk3s Profiles

Bug Fixed:

When selected only 1 profile from menu ,   Orcaslicer imports all  nozzle from the printer.

Added "printer_variant": "" for each nozzle.

Now it imports correct only the selected nozzled in the menu.

* Catalan Language updated to V1.9.1 (SoftFever#4131)

* Fix for postprocessing scripts not working on UNIX when $SHELL is undefined (SoftFever#4101)

Fix for PP scripts not working on UNIX when $SHELL is undefined

thanks @jfbauer432 for pointing the problem out.
thanks @lukasmatena for fixing it in PrusaSlicer (commit 87a5116)

Co-authored-by: Lukáš Matěna <[email protected]>

* Show dialog when opening 3mf files to choose whether to import settings. (SoftFever#4110)

* Show dialog when opening 3mf files to choose whether to import settings.

* Merge branch 'main' into main

* Fix move gizmo on parts (SoftFever#4138)

* Update Spanish translation (SoftFever#4142)

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Merge remote-tracking branch 'upstream/main' into spanish_translation"

This reverts commit 694a900, reversing
changes made to 4f53ce4.

* Revert "Update OrcaSlicer_es.po"

This reverts commit 4f53ce4.

* Revert "Revert "Update OrcaSlicer_es.po""

This reverts commit 53bd156.

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Update OrcaSlicer_es.po"

This reverts commit b21aad0.

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_en.po

* Update OrcaSlicer_es.po

* Traduccion de OrcaSlicer al español

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Add new text translations for profile and filament management

---------

Co-authored-by: SoftFever <[email protected]>

* Fix object list crash on click (SoftFever#2823) (SoftFever#4164)

* Fix caucluation of rotation between two vectors during auto-orient (SoftFever#4144)

* Properly extract rotation matrix

* Another attempt to fix auto-orient

* Show warning notification if jerk is set to 1

* apply precise_outer_wall for inner-outer wall seq only

* Show a warning dlg when enabling `Make overhangs printable` option
Fixes SoftFever#4078

* FlyingBear profiles updates: abs filament (SoftFever#4165)

* Update fdm_klipper_common.json

* Update fdm_filament_abs.json

* Update fdm_filament_pa.json

* Update fdm_filament_abs.json

* Update FlyingBear Generic ABS.json

* Update fdm_klipper_common.json

* InfiMech profile updates: Change some parameterts and Update ABS filament (SoftFever#4166)

* Update InfiMech Generic ABS.json

* Update fdm_filament_abs.json

* TwoTrees SK1 Profiles : New filament (PLA Matte) and tuned volumetric flow rates (SoftFever#4172)

* Increased max volumetric flow of PETG and PLA silk

* New filament profile for TT SK1 : PLA Matte

* Increased Max volumetric flow rate for PLA-CF

* Allow specify wall directions (SoftFever#4156)

* Add wall direction option

* Force wall direction if specified

* Format

* Rename default to auto

* Some tiny UI adjustment

* Add direct adaptive bed mesh support (SoftFever#4212)

* Add direct adaptive bed mesh support

* fix Linux build error

* update tooltip

* Fixed a bug that caused bed textures to scale improperly
Fixes SoftFever#1175

* Allow exporting filament profiles for non-bbl printers (SoftFever#4217)

Allow exporting non-bbl profiles

* General profile tweak
1. Adjust bed textures for some printer to accommodate bed texture scale bug fix d3309b9
2. Reduce some bed model size

---------

Signed-off-by: Kunlong Ma <[email protected]>
Signed-off-by: Stone Li <[email protected]>
Co-authored-by: Ocraftyone <[email protected]>
Co-authored-by: YuSanka <[email protected]>
Co-authored-by: Lukas Matena <[email protected]>
Co-authored-by: SoftFever <[email protected]>
Co-authored-by: Seth LaForge <[email protected]>
Co-authored-by: Eldenroot <[email protected]>
Co-authored-by: Olcay ÖREN <[email protected]>
Co-authored-by: Morton Jonuschat <[email protected]>
Co-authored-by: Dylan <[email protected]>
Co-authored-by: Noisyfox <[email protected]>
Co-authored-by: Heiko Liebscher <[email protected]>
Co-authored-by: Thomas <[email protected]>
Co-authored-by: Ioannis Giannakas <[email protected]>
Co-authored-by: Giveen <[email protected]>
Co-authored-by: duub qnnp <[email protected]>
Co-authored-by: Ryan Whipple <[email protected]>
Co-authored-by: foghatredbird <[email protected]>
Co-authored-by: Erkan Ozgur Yilmaz <[email protected]>
Co-authored-by: Kunlong Ma <[email protected]>
Co-authored-by: gerrit <[email protected]>
Co-authored-by: liz.li <[email protected]>
Co-authored-by: tao wang <[email protected]>
Co-authored-by: lane.wei <[email protected]>
Co-authored-by: maosheng.wei <[email protected]>
Co-authored-by: chunmao.guo <[email protected]>
Co-authored-by: zhou.xu <[email protected]>
Co-authored-by: Arthur <[email protected]>
Co-authored-by: Bastien Nocera <[email protected]>
Co-authored-by: zhimin.zeng <[email protected]>
Co-authored-by: hu.wang <[email protected]>
Co-authored-by: Stone Li <[email protected]>
Co-authored-by: XunZhangBambu <[email protected]>
Co-authored-by: Mr-PBH <[email protected]>
Co-authored-by: KrisMorr <[email protected]>
Co-authored-by: Oleksii Suprun <[email protected]>
Co-authored-by: Geoffrey Ward <[email protected]>
Co-authored-by: Geofrey Ward <[email protected]>
Co-authored-by: supermerill <[email protected]>
Co-authored-by: Carlos Caruncho <[email protected]>
Co-authored-by: Aidan <[email protected]>
Co-authored-by: Peopoly <[email protected]>
Co-authored-by: tsmith35 <[email protected]>
Co-authored-by: frankieorabona <[email protected]>
Co-authored-by: goyetus <[email protected]>
Co-authored-by: Oleksii Dashkevych <[email protected]>
Co-authored-by: davidjuanesb <[email protected]>
Co-authored-by: Andy <[email protected]>
Co-authored-by: YFilip Sykala - NTB T15p <[email protected]>
Co-authored-by: pagdot <[email protected]>
Co-authored-by: markleaf131313 <[email protected]>
Co-authored-by: FlyingbearOfficial <[email protected]>
Co-authored-by: InfimechOfficial <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 689 changed files with 63,366 additions and 16,960 deletions.
51 changes: 51 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"name": "OrcaSlicer",
"image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04",
"runArgs": ["--env-file", "/tmp/devcontainer.env"],
"features": {
"ghcr.io/devcontainers/features/desktop-lite:1": {
"password": "orca"
}
},
"customizations": {
"vscode": {
"settings": {
"cmake.configureArgs": [
"-DSLIC3R_GTK=3",
"-DBBL_RELEASE_TO_PUBLIC=1",
"-DBBL_INTERNAL_TESTING=0",
"-DSLIC3R_STATIC=1",
"-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local"
],
"cmake.buildToolArgs": [
"-l${containerEnv:CORES}"
]
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.cmake-tools",
"ms-vscode.cpptools-extension-pack"
]
}
},

"forwardPorts": [6080],
"portsAttributes": {
"6080": {
"label": "VNC web client (noVNC)",
"onAutoForward": "silent"
}
},
"otherPortsAttributes": {
"onAutoForward": "ignore"
},

"initializeCommand": {
"Setup Temporary Env File": "echo \"CORES=`nproc --all`\" > /tmp/devcontainer.env"
},
"onCreateCommand": {
"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
},
"postCreateCommand": "sudo .devcontainer/postCreate.sh"
}
14 changes: 14 additions & 0 deletions .devcontainer/postCreate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
# Update and upgrade all system packages
apt update
apt upgrade -y

echo "-----------------------------------------"
echo "Running BuildLinux.sh with update flag..."
echo "-----------------------------------------"
./BuildLinux.sh -u

echo "------------------------------"
echo "Installing missing packages..."
echo "------------------------------"
apt install -y libgl1-mesa-dev m4 autoconf libtool
55 changes: 43 additions & 12 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,58 @@
name: Bug Report
name: 🐞 Bug Report
description: File a bug report
labels: bug
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
**Thank you for using Orca Slicer and wanting to report a bug.**
Please note that this is not the place to make feature requests or ask for help.
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.
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.
- type: checkboxes
attributes:
label: Is there an existing issue for this problem?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: input
id: version
attributes:
label: OrcaSlicer Version
description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
placeholder: e.g. 1.6.6
placeholder: e.g. 1.9.0
validations:
required: true
- type: dropdown
id: os_type
attributes:
label: "Operating System (OS)"
description: "What OSes are you are experiencing issues on?"
multiple: true
options:
- Linux
- macOS
- Windows
validations:
required: true
- type: input
id: os_info
id: os_version
attributes:
label: OS version
description: Which OS version are you using?
placeholder: |
OS: Windows 7/8/10/11 ... , Ubuntu 22.04/Fedora 36 ... , macOS 10.15/11.1/12.3 ...
label: "OS Version"
description: "What OS version does this relate to?"
placeholder: "i.e. OS: Windows 7/8/10/11 ..., Ubuntu 22.04/Fedora 36 ..., macOS 10.15/11.1/12.3 ..."
validations:
required: true
- type: textarea
id: system_info
attributes:
label: Additional system information
description: For the performance issue, please also show the CPUMemory information; For the 3D Rendering issue, please also show the Display Card information.
description: For the performance issue, please also show the CPU, Memory information; For the 3D Rendering issue, please also show the Display Card information.
placeholder: |
CPU: 11th gen intel r core tm i7-1185g7/amd ryzen 7 6800h/...
CPU: 11th gen Intel r core tm i7-1185g7/AMD Ryzen 7 6800h/...
Memory: 32/16 GB...
Display Card: NVIDIA Quadro P400/...
validations:
Expand All @@ -50,8 +72,8 @@ body:
description: Please described the detailed steps to reproduce this issue
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
2. Click on '...'
3. Scroll down to '...'
4. See error
validations:
required: true
Expand Down Expand Up @@ -100,3 +122,12 @@ body:
options:
- label: Log file
- label: Project file
- type: textarea
attributes:
label: Anything else?
description: |
Screenshots? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Community Support (Discord channel)
url: https://discord.gg/P4VE9UY9gJ
about: Please ask and answer support "how do I?"questions here.
- name: Discussion Forum
url: https://github.com/SoftFever/OrcaSlicer/discussions
about: Please raise ideas and feature suggestions here.
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: 🚀 Feature Request / Enhancement
description: Suggest an improvement to make Orca Slicer even better!
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request!
If your idea is still at the formulation stage, or you're not sure it would
be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
- type: checkboxes
attributes:
label: Is there an existing issue for this feature request?
description: |
Please search to see if an issue already exists for a feature, or perhaps one similar.
You can then comment and react so that we know know much interest there is in the feature request.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Is your feature request related to a problem?
description: A clear and concise description of what the problem is.
placeholder: I'm always frustrated when [...]
validations:
required: true
- type: dropdown
attributes:
label: Which printers will be beneficial to this feature?
description: Select affected printer firmware type.
multiple: true
options:
- Klipper
- Marlin
- Others
- All
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
placeholder: It should do [...]
validations:
required: true
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
placeholder: |
1. [...]
2. [...]
3. [...]
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: |
Add any other context, diagrams, illustations or screenshots about the feature request here.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
65 changes: 54 additions & 11 deletions .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
env:
date:
ver:
ver_pure:

steps:
- name: Checkout
Expand All @@ -36,15 +37,14 @@ jobs:
- name: Get the version and date on Ubuntu and macOS
if: inputs.os != 'windows-latest'
run: |
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
ver="nightly$(date +'%y%m%d')"
elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
ver="PR${{ github.event.number }}"
ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
ver="PR-${{ github.event.number }}"
else
ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
ver=V$ver
ver=V$ver_pure
fi
echo "ver=$ver" >> $GITHUB_ENV
echo "ver_pure=$ver_pure" >> $GITHUB_ENV
echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
shell: bash

Expand All @@ -56,9 +56,7 @@ jobs:
$eventName = "${{ github.event_name }}"
$prNumber = "${{ github.event.number }}"
if ($ref -eq 'refs/heads/main') {
$ver = "nightly" + $date.Substring(2)
} elseif ($eventName -eq 'pull_request') {
if ($eventName -eq 'pull_request') {
$ver = "PR" + $prNumber
} else {
$versionContent = Get-Content version.inc -Raw
Expand Down Expand Up @@ -130,6 +128,17 @@ jobs:
name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg

- name: Deploy Mac release
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
asset_name: OrcaSlicer_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

# Windows
- name: setup MSVC
if: inputs.os == 'windows-latest'
Expand Down Expand Up @@ -185,6 +194,28 @@ jobs:
name: PDB
path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z

- name: Deploy Windows release portable
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip
asset_content_type: application/x-zip-compressed
max_releases: 1

- name: Deploy Windows release installer
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
asset_content_type: application/x-msdownload
max_releases: 1

# Ubuntu
- name: Install dependencies
if: inputs.os == 'ubuntu-20.04'
Expand All @@ -211,11 +242,23 @@ jobs:
shell: bash
run: |
./BuildLinux.sh -isr
chmod +x ./build/OrcaSlicer_ubu64.AppImage
mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
- name: Upload artifacts Ubuntu
if: inputs.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Linux_${{ env.ver }}
path: './build/OrcaSlicer_ubu64.AppImage'
path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage'

- name: Deploy Ubuntu release
if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
asset_name: OrcaSlicer_Linux_${{ 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
Loading

0 comments on commit 05f25ed

Please sign in to comment.