Merge remote-tracking branch 'origin/master'

zss

2024-07-04 8f1cc22902458459caaa41cde90952e25f869a8d

 .gitignore

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

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