Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-16 58a75277a83e48baa8ff9906e27975960659ff8a

 .gitignore

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

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