Merge remote-tracking branch 'origin/master'

zss

2024-08-06 c3ee76c79cc5c5db479b548e1b4eca67327e7396

 .gitignore

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

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