Merge branch 'master' into cnas

zss

2024-12-26 4497f5b1e322eba5ec519ebc1955317ed656aa8e

 .gitignore

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

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