Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 bf233b9eeb959091831bf0b9a11a180fee2b2d51

 .gitignore

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

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