Merge remote-tracking branch 'origin/master'

zss

2024-08-12 2c00320ecf5745742b9dc9a960f506165e880727

 .gitignore

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

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