Merge remote-tracking branch 'origin/master'

zss

2024-07-24 7c331e84a7151c943d900b34fbd57475d69cdc27

 .gitignore

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

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