Merge remote-tracking branch 'origin/master'

zss

2024-07-18 4d7d9ee75f529c9e1d66f98608edf18221f76acd

 .gitignore

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

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