Skip to content

Commit

Permalink
Merge branch 'meta-dev' into meta
Browse files Browse the repository at this point in the history
  • Loading branch information
mrFq1 committed Jun 7, 2023
2 parents 107cee5 + 8ba52a1 commit f5f425a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
- name: create zip
run: |
ditto -c -k --sequesterRsrc --keepParent archive/ClashX.xcarchive/Products/Applications/ClashX\ Meta.app ClashX\ Meta.zip
ditto -c -k --sequesterRsrc --keepParent archive/ClashX\ SwiftUI.xcarchive/Products/Applications/ClashX\ Meta.app ClashX\ Meta\ SwiftUI\ macOS\ 12.0+.zip
ditto -c -k --sequesterRsrc --keepParent archive/ClashX.xcarchive/Products/Applications/ClashX\ Meta.app "ClashX Meta.zip"
ditto -c -k --sequesterRsrc --keepParent archive/ClashX\ SwiftUI.xcarchive/Products/Applications/ClashX\ Meta.app "ClashX Meta SwiftUI macOS 12.0+.zip"
- name: upload Artifact
uses: actions/upload-artifact@v3
Expand All @@ -69,6 +69,6 @@ jobs:
with:
generate_release_notes: true
files: |
"ClashX Meta.zip"
"ClashX Meta SwiftUI macOS 12.0+.zip"
ClashX Meta.zip
ClashX Meta SwiftUI macOS 12.0+.zip
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ A rule based proxy For Mac base on [Clash Meta](https://github.com/MetaCubeX/Cla

You can download from [Release](https://github.com/MetaCubeX/Clash.Meta/releases) page

**[AppCenter](https://install.appcenter.ms/users/clashx/apps/clashx-pro/distribution_groups/public) 免费下载ClashX Pro版本,支持增强模式以及更多Clash Premium Core特性。**

## Build
- Make sure have python3 and golang installed in your computer.
Expand Down Expand Up @@ -105,5 +104,5 @@ script:
Note:强烈不推荐这么做,这可能导致clashx的很多重要错误提醒无法显示。

### 全局快捷键
- 在菜单栏配置->更多配置中,自定义对应功能的快捷键。(需要1.116.1之后的版本
- 在菜单栏配置->更多配置中,自定义对应功能的快捷键。(需要v1.2.6之后的版本
- 使用AppleScript设置, 详情点击 [全局快捷键](Shortcuts.md)

0 comments on commit f5f425a

Please sign in to comment.