Skip to content

Commit

Permalink
Merge pull request #90 from rememberber/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@rememberber
rememberber authored Sep 19, 2023
2 parents 3e85693 + eae2e9b commit bcc643c
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 55 deletions.
6 changes: 3 additions & 3 deletions download_links.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.4/MooTool-1.5.4-windows.exe",
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.4/MooTool_1.5.4.dmg",
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.4/MooTool_1.5.4.deb"
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.5/MooTool-1.5.5-windows.exe",
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.5/MooTool_1.5.5.dmg",
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.5/MooTool_1.5.5.deb"
}
90 changes: 45 additions & 45 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,38 +259,38 @@
<vmArgs>--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</vmArgs>
</configuration>
<executions>
<execution>
<id>bundling-for-windows</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>windows</platform>
<createZipball>true</createZipball>
<customizedJre>false</customizedJre>
<additionalModules>jdk.crypto.ec,jdk.charsets,com.jthemedetector</additionalModules>
<administratorRequired>true</administratorRequired>
<winConfig>

<!-- general properties -->
<generateSetup>true</generateSetup>
<generateMsi>true</generateMsi>
<generateMsm>true</generateMsm>

<!-- setup generation properties -->
<setupMode>installForAllUsers</setupMode>
<createDesktopIconTask>true</createDesktopIconTask>
<disableDirPage>false</disableDirPage>
<disableFinishedPage>false</disableFinishedPage>
<removeOldLibs>true</removeOldLibs>
<setupLanguages>
<english>compiler:Default.isl</english>
<!-- <spanish>compiler:Languages\Chinese.isl</spanish>-->
</setupLanguages>
</winConfig>
</configuration>
</execution>
<!-- <execution>-->
<!-- <id>bundling-for-windows</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>windows</platform>-->
<!-- <createZipball>true</createZipball>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets,com.jthemedetector</additionalModules>-->
<!-- <administratorRequired>true</administratorRequired>-->
<!-- <winConfig>-->

<!-- &lt;!&ndash; general properties &ndash;&gt;-->
<!-- <generateSetup>true</generateSetup>-->
<!-- <generateMsi>true</generateMsi>-->
<!-- <generateMsm>true</generateMsm>-->

<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<!-- <setupMode>installForAllUsers</setupMode>-->
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<!-- <disableDirPage>false</disableDirPage>-->
<!-- <disableFinishedPage>false</disableFinishedPage>-->
<!-- <removeOldLibs>true</removeOldLibs>-->
<!-- <setupLanguages>-->
<!-- <english>compiler:Default.isl</english>-->
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
<!-- </setupLanguages>-->
<!-- </winConfig>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-linux</id>-->
<!-- <phase>package</phase>-->
Expand All @@ -304,19 +304,19 @@
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-mac</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>mac</platform>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <createTarball>true</createTarball>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>mac</platform>
<customizedJre>false</customizedJre>
<createTarball>true</createTarball>
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
13 changes: 6 additions & 7 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ Windows • Linux • macOS

![Overview](screen_shoot/regex_mac.png)

<p align="center">
<a href="https://gitee.com/zhoubochina/MooTool/raw/master/screen_shoot/mt-favoriteColor.png">
<img alt="MooTool" src="https://gitee.com/zhoubochina/MooTool/raw/master/screen_shoot/mt-favoriteColor.png">
</a>
</p>
![Overview](screen_shoot/cron_mac.png)

![Overview](screen_shoot/mt-favoriteColor.png)

![Overview](screen_shoot/quick_note_light_mac.png)

Expand All @@ -65,13 +63,14 @@ Windows • Linux • macOS
+ **网络/IP**（ip地址转换/本机ip信息/根据域名获取ip）
+ **调色板**（取色器/颜色管理）
+ **图片助手**（本地图床/剪贴板图片快速管理/Base64转图片/图片转Base64）
+ **正则**（正则匹配测试、正则表达式收藏、常用正则表达式）
+ **正则**（正则匹配测试、收藏、常用正则表达式）
+ **Cron表达式**（Cron表达式生成、解析、转自然语言、最近运行时间、收藏、常用Cron表达式）

## 计划中支持的功能

+ 词典、翻译
+ Cron表达式
+ 图片压缩
+ 国密加解密

## 下载

Expand Down
Binary file added screen_shoot/cron_mac.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bcc643c

Please sign in to comment.