Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-30 19f2daee178ac2526d78470b5941ad6d0d57963c

 .gitignore

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

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