Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

# Thanks to RaySajuuk, it's working now
- name: Sign app and notary
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || github.ref == 'refs/heads/2.3.0-final') && inputs.os == 'macos-14'
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release_') || github.ref == 'refs/heads/2.3.0-final') && inputs.os == 'macos-14'
working-directory: ${{ github.workspace }}
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
fi

- name: Create DMG without notary
if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14' && github.ref != 'refs/heads/2.3.0-final'
if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14' && github.ref != 'refs/heads/2.3.0-final' && !startsWith(github.ref, 'refs/heads/release_')
working-directory: ${{ github.workspace }}
run: |
mkdir -p ${{ github.workspace }}/build/universal/Snapmaker_Orca_dmg
Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/Snapmaker_Orca.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8646,6 +8646,9 @@ msgstr ""
msgid "Beta version"
msgstr ""

msgid "Release"
msgstr ""

msgid "Updating"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -8469,6 +8469,9 @@ msgstr "更新固件"
msgid "Beta version"
msgstr "Beta 版"

msgid "Release"
msgstr "版本"

msgid "Updating"
msgstr "更新中"

Expand Down Expand Up @@ -15306,7 +15309,7 @@ msgid ""
"The mix ratios for %s in the Color Mapping list are outside the recommended %d"
"%%–%d%% range. Adjust the mix ratios manually for better results."
msgstr ""
"Color Mapping 列表中 %s 的混色比例超出推荐范围 %d%%–%d%%。请手动调整混色比例以获得更好效果。"
"颜色映射列表中 %s 混色比例超出推荐范围 %d%%–%d%%。建议手动调整混色比例,以获得更好的颜色效果。"

msgid "Cannot enable both Variable Layer Height and Subdivide Mix Layer."
msgstr "可变层高与混色细分层高功能互斥,请勿同时开启。"
Expand Down
4 changes: 4 additions & 0 deletions resources/images/filament_picker_left_arrow_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/filament_picker_right_arrow_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/images/icon_minus_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/icon_plus_light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
"textured_plate_temp_initial_layer": ["100"],
"overhang_fan_speed": ["80"],
"activate_air_filtration": ["1"],
"filament_type": ["ABS"]
"filament_type": ["ABS"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@
"activate_air_filtration": ["1"],
"supertack_plate_temp": ["0"],
"supertack_plate_temp_initial_layer": ["0"],
"filament_type": ["ABS"]
"filament_type": ["ABS"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@
"textured_plate_temp": ["100"],
"textured_plate_temp_initial_layer": ["100"],
"activate_air_filtration": ["1"],
"filament_type": ["ABS"]
"filament_type": ["ABS"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"textured_plate_temp_initial_layer": ["100"],
"activate_air_filtration": ["1"],
"filament_type": ["ABS"],
"nozzle_temperature": ["265"]
"nozzle_temperature": ["265"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@
"textured_plate_temp_initial_layer": ["100"],
"filament_type": ["ASA"],
"hot_plate_temp": ["100"],
"temperature_vitrification": ["100"]
"temperature_vitrification": ["100"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@
"activate_air_filtration": ["1"],
"supertack_plate_temp": ["0"],
"supertack_plate_temp_initial_layer": ["0"],
"filament_type": ["ASA"]
"filament_type": ["ASA"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
"textured_plate_temp_initial_layer": ["100"],
"activate_air_filtration": ["1"],
"filament_type": ["ASA"],
"temperature_vitrification": ["100"]
"temperature_vitrification": ["100"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"textured_plate_temp_initial_layer": ["100"],
"activate_air_filtration": ["1"],
"filament_type": ["ASA"],
"temperature_vitrification": ["100"]
"temperature_vitrification": ["100"],
"filament_is_high_temperature": ["1"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"temperature_vitrification": ["70"],
"textured_plate_temp": ["80"],
"textured_plate_temp_initial_layer": ["80"],
"supertack_plate_temp": ["60"],
"supertack_plate_temp_initial_layer": ["60"],
"supertack_plate_temp": ["0"],
"supertack_plate_temp_initial_layer": ["0"],
"filament_type": ["PETG-CF"]
}
7 changes: 5 additions & 2 deletions resources/web/flutter_web/assets/assets/i10n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,14 @@
"delete_time_lapse_desc": "Do you want to delete this video?",
"delete_time_lapse_success": "{name} deleted",
"delete_time_lapse_failed_format": "Delete video failed {}",
"time_lapse_video_downloaded_success_format": "Video {} downloaded",
"time_lapse_video_downloaded_success_2_format": "Video {} downloadedbut export video failed",
"time_lapse_video_downloaded_success_format": "Video {} saved to gallery",
"time_lapse_video_downloaded_success_2_format": "Video {} downloaded but failed to save to gallery",
"time_lapse_video_start_downloading": "Start downloading...",
"time_lapse_video_download_completed": "{name} downloaded",
"time_lapse_video_export_video_failed": "Export video failed",
"time_lapse_cover_load_failed": "Failed to load",
"time_lapse_cover_retry": "Reload",
"time_lapse_exit_confirm_title": "Leaving will interrupt the download. Exit now?",
"Network may be unstable, device connection may be unreliable.": "Network may be unstable, device connection may be unreliable",
"network_unstable_partial_operation_failed": "Network unstable, partial operation may failed",
"camera_turn_off_countdown": "Camera turn-off countdown",
Expand Down
7 changes: 5 additions & 2 deletions resources/web/flutter_web/assets/assets/i10n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -735,11 +735,14 @@
"delete_time_lapse_desc": "确定要删除这个视频吗?",
"delete_time_lapse_success": "{name} 已删除",
"delete_time_lapse_failed_format": "删除视频失败 {}",
"time_lapse_video_downloaded_success_format": "视频 {} 已下载",
"time_lapse_video_downloaded_success_2_format": "视频 {} 已下载,但导出视频到相册失败",
"time_lapse_video_downloaded_success_format": "视频 {} 已下载到相册",
"time_lapse_video_downloaded_success_2_format": "视频 {} 已下载,但保存到相册失败",
"time_lapse_video_start_downloading": "正在下载视频……",
"time_lapse_video_download_completed": "{name} 已下载",
"time_lapse_video_export_video_failed": "导出视频失败",
"time_lapse_cover_load_failed": "加载失败",
"time_lapse_cover_retry": "重新加载",
"time_lapse_exit_confirm_title": "离开会中断下载,是否确定退出?",
"camera_turn_off_countdown": "摄像机关闭倒计时",
"continue_camera": "继续播放",
"Export": "导出",
Expand Down
2 changes: 1 addition & 1 deletion resources/web/flutter_web/flutter_bootstrap.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions resources/web/flutter_web/flutter_service_worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const MANIFEST = 'flutter-app-manifest';
const TEMP = 'flutter-temp-cache';
const CACHE_NAME = 'flutter-app-cache';

const RESOURCES = {"flutter_bootstrap.js": "1906fcdff09f4e5d280cfdfb34123339",
"version.json": "e9e1c908a47bb34d9499a54df9c55a5d",
const RESOURCES = {"flutter_bootstrap.js": "55901e5d54fc665bb2aeecf306755f83",
"version.json": "b473b358ea48d6ed69f69b8e4bfa5755",
"index.html": "751409a24c4cb586f019e9eb2d6cb09f",
"/": "751409a24c4cb586f019e9eb2d6cb09f",
"main.dart.js": "382d0a177e81142897fea44584948a0c",
"main.dart.js": "f754452f34980f015f2b8b62dbed386d",
"flutter.js": "f31737fb005cd3a3c6bd9355efd33061",
"version.changelog": "de1f1633fee9ea06348828c40b5815ee",
"favicon.png": "be8d1ab28c20907c9869c345d0482962",
Expand All @@ -29,8 +29,8 @@ const RESOURCES = {"flutter_bootstrap.js": "1906fcdff09f4e5d280cfdfb34123339",
"assets/AssetManifest.bin": "423a0ab5115fb109a27a08b61a8bae15",
"assets/fonts/MaterialIcons-Regular.otf": "08b2291fc81adcfec56009502699d9ad",
"assets/assets/404.png": "e8a45c994c2f6f551cf1e052f64dba1c",
"assets/assets/i10n/zh-CN.json": "d4f2d13969141c93081ca96bc4867ea3",
"assets/assets/i10n/en.json": "dca841c6d0be83d71fd07c6af5b68f33",
"assets/assets/i10n/zh-CN.json": "9f2eb77f69b1eafb9475b6fc221cbf75",
"assets/assets/i10n/en.json": "f0d961f09c750c25ebf488b87c156994",
"assets/assets/images/deviceNoResponse.webp": "1ca23a7feedfdc34362ea5789ccf895b",
"assets/assets/images/deviceAuthorized.webp": "8eb814193bed15cec22658018871aba8",
"assets/assets/images/IpInputGuide.webp": "06c11ce1dadc2910676aec6d40a5eea5",
Expand Down
Loading