Merge remote-tracking branch 'sasha/master'

# Conflicts: # scripts/interfer.gd
2025-07-25 14:13:02 +03:00
parent 4ac8dd6f3e 1a15594627
commit db8aa299fb
19 changed files with 378 additions and 271 deletions
--- a/scenes/pribor-uyep/pribor-uyep.gd
+++ b/scenes/pribor-uyep/pribor-uyep.gd
@@ -1 +1 @@
-extends "res://scenes/контроль/прибор.gd"
+extends 'res://scenes/контроль/прибор.gd'
--- a/scenes/pribor-uyep/spt25-view.gd
+++ b/scenes/pribor-uyep/spt25-view.gd
@@ -1,6 +1,6 @@
@tool

-extends "res://scenes/контроль/элемент-я.gd"
+extends 'res://scenes/контроль/элемент-я.gd'


 func on_line_changed(unit0):