Merge remote-tracking branch 'origin/master'

zss

2024-07-15 7f5af45919cbda45e8be3b82d613708fad93718b

 .gitignore

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

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