Merge branch 'main' into port-ss-sacraficial-bridge-layer

SoftFever · Jan 27, 2024 · de3f5e3 · de3f5e3
2 parents f6e7419 + da7f8e8
commit de3f5e3
Show file tree

Hide file tree

Showing 247 changed files with 29,499 additions and 4,552 deletions.
diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
@@ -21,6 +21,7 @@ jobs:
     env:
       date:
       ver:
+      ver_pure:
 
     steps:
       - name: Checkout
@@ -36,13 +37,14 @@ jobs:
       - name: Get the version and date on Ubuntu and macOS
         if: inputs.os != 'windows-latest'
         run: |
+          ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            ver="PR${{ github.event.number }}"
+            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
 
@@ -240,6 +242,7 @@ jobs:
         shell: bash
         run: |
           ./BuildLinux.sh -isr
+          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

diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -26,6 +26,17 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleURLName</key>
+      <string>orcasliceropen url</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>orcasliceropen</string>
+      </array>
+    </dict>
+  </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -35,7 +46,7 @@
 			<string>STL</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>stl.icns</string>
+			<string>images/stl.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -52,7 +63,7 @@
 			<string>OBJ</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -69,7 +80,7 @@
 			<string>AMF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>AMF</string>
 			<key>CFBundleTypeRole</key>
@@ -86,7 +97,7 @@
 			<string>3MF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>OrcaSlicer.icns</string>
+			<string>images/OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>3MF</string>
 			<key>CFBundleTypeRole</key>
@@ -103,7 +114,7 @@
 			<string>GCODE</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>gcode.icns</string>
+			<string>images/gcode.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>GCODE</string>
 			<key>CFBundleTypeRole</key>

diff --git a/localazy.json b/localazy.json
@@ -68,6 +68,11 @@
 				"type": "po",
 				"pattern": "localization/i18n/tr/OrcaSlicer_tr.po",
 				"lang": "tr"
+			},
+			{
+				"type": "po",
+				"pattern": "localization/i18n/tr/OrcaSlicer_pl.po",
+				"lang": "pl"
 			}
 		]
 	},