Merge remote-tracking branch 'origin/master'

zss

2024-08-08 bc7ee9878359b52c666c7c5f386a8e0c65d2056f

 .gitignore

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

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