Merge remote-tracking branch 'origin/master'

zss

2024-07-30 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98

 .gitignore

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

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