Merge remote-tracking branch 'origin/master'

zss

2024-07-03 9a98121231685145fdc0f78ac2d48d02e0eb68d6

 .gitignore

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

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