许轲 3ef7326bbf Merge remote-tracking branch 'origin/release-v1.1.12' into release-v1.1.12
# Conflicts:
#	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/controller/event/handler/tool/SetBtn.java
#	src/main/java/org/jcnc/jnotepad/tool/UiUtil.java
#	src/main/java/org/jcnc/jnotepad/ui/module/LineNumberTextArea.java
2023-09-02 13:28:39 +08:00
..