Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-18 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d

 .gitignore

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

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