Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-17 50fb9412ad853bdef90947d94eeb7eed6ac24439

 .gitignore

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

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