Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-28 71a860affbf97e7be13a2059b6cb001bfd368adb

 .gitignore

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

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