Merge remote-tracking branch 'origin/master'

zss

2024-07-31 df40860e183704a18d9b4a5d04931c86f6fe3dd7

 .gitignore

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

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