Merge remote-tracking branch 'origin/master'

zss

2024-08-04 76c806e5ca84d7411b67ee3d6047cfc1454da8f1

 .gitignore

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

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