Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-14 b434c283d2a4787b6eb840a0289d6adc62fba132

 .gitignore

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

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