Merge remote-tracking branch 'origin/master'

zss

2024-08-07 e0c355147a2d4ac642c78c6bad7db211d4f9f708

 .gitignore

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

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