Merge remote-tracking branch 'origin/master'

zss

2024-07-30 4d9364da736f322cfeeec2815e83f2a3f6534223

 .gitignore

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

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