Merge remote-tracking branch 'origin/master'

zss

2024-08-10 b9d6c39b0bc0b65cbd943dfaedadb6a343bf799e

 .gitignore

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

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