Merge remote-tracking branch 'origin/master'

zss

2024-07-23 dd301742784e570ec01098907f56e5c9c19b5a99

 .gitignore

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

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