Merge remote-tracking branch 'origin/master'

zss

2024-07-24 ad10b5cfc215be14c68080c7484369186e9d5016

 .gitignore

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

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