Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-23 8451f8d8cc95b45ddac57b3936bce13425031269

 .gitignore

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

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