Merge develop

This commit is contained in:
Pieter Vander Vennet 2023-10-17 16:57:49 +02:00
commit 553ee6d5aa
165 changed files with 6745 additions and 1720 deletions

View file

@ -8633,6 +8633,9 @@
},
"4": {
"question": "Tennis fields"
},
"5": {
"question": "Badminton fields"
}
}
}
@ -10010,6 +10013,10 @@
}
}
},
"show_crosshair": {
"question": "Should a crosshair be shown in the center of the display?",
"questionHint": "This can help to accurately position a new element"
},
"show_debug": {
"mappings": {
"0": {
@ -10629,4 +10636,4 @@
}
}
}
}
}