Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-09 39f799b4eb5aad2d6fbe11f4154f879e51a45039

 .gitignore

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

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