Merge remote-tracking branch 'origin/master'

zss

2024-08-07 55d7987024ec302f27b58d75c6788ff8e04df636

 .gitignore

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

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