Merge remote-tracking branch 'origin/master'

zss

2024-08-06 d63b0929a9756d0b1e1d4129bf16ab119f650ffc

 .gitignore

@@ -19,7 +19,7 @@
*.iml
*.ipr
*.log
*.jar
#*.jar

### NetBeans ###
/nbproject/private/