Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-22 08cad817f057c4a10e1ea59e362fbb492f3381df

 .gitignore

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

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