juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: unfinished merge conflict

Browse Source 
jira: [none]
Change-Id: Id97c30a091957c7fe7c96f1818d1073f7993b581
(cherry picked from commit 8ca806abdf5d63bb93c1cf9b3001d961b34f5a44)
This commit is contained in:
xin.zhang
2025-04-24 10:01:50 +08:00
committed by Noisyfox
parent c7ba6684c1
commit 5ce62285be
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/printers/version.txt
View File

@@ -1,5 +1 @@
<<<<<<< HEAD (9f2e21 FIX: protect the EndModal functions while top dialog is not )
02.00.00.14
=======
02.00.00.17
>>>>>>> CHANGE (04056a ENH: update temperature limit for all printer)