许轲 ffaa91ca9a Merge remote-tracking branch 'origin/release-v1.1.12' into feature-I7XXVS ...

# Conflicts:
#	src/main/java/module-info.java
#	src/main/java/org/jcnc/jnotepad/LunchApp.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/NewFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/OpenFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/RenameFile.java
#	src/main/java/org/jcnc/jnotepad/controller/event/handler/menubar/SaveFile.java
#	src/main/java/org/jcnc/jnotepad/root/RootBorderPane.java
#	src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java
#	src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java
#	src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java
#	src/main/java/org/jcnc/jnotepad/root/top/RootTopBorderPane.java
#	src/main/java/org/jcnc/jnotepad/tool/SingletonUtil.java
#	src/main/java/org/jcnc/jnotepad/tool/UiUtil.java
#	src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java

2023-09-02 12:43:41 +08:00

..

java

Merge remote-tracking branch 'origin/release-v1.1.12' into feature-I7XXVS

2023-09-02 12:43:41 +08:00

resources

把设置按钮放到侧边栏

2023-09-01 00:25:02 +08:00