Merge remote-tracking branch 'origin/master'

zss

2024-06-18 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3

 .gitignore

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

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