diff --git a/Assets/Sprites/Backgrounds/Hills/Hill.json b/Assets/Sprites/Backgrounds/Hills/Hill.json index ca699e16..5edbcd83 100644 --- a/Assets/Sprites/Backgrounds/Hills/Hill.json +++ b/Assets/Sprites/Backgrounds/Hills/Hill.json @@ -334,4 +334,4 @@ } } } -} \ No newline at end of file +} diff --git a/Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json b/Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json index a86eff03..6a31d096 100644 --- a/Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json +++ b/Assets/Sprites/Backgrounds/SecondaryMushrooms/Mushrooms.json @@ -143,4 +143,4 @@ "link": "Underwater" } } -} \ No newline at end of file +} diff --git a/Assets/Sprites/Backgrounds/SecondaryTrees/SecondaryTrees.json b/Assets/Sprites/Backgrounds/SecondaryTrees/SecondaryTrees.json index b0037ded..a22f80d2 100644 --- a/Assets/Sprites/Backgrounds/SecondaryTrees/SecondaryTrees.json +++ b/Assets/Sprites/Backgrounds/SecondaryTrees/SecondaryTrees.json @@ -210,4 +210,4 @@ } } } -} \ No newline at end of file +} diff --git a/Assets/Sprites/Blocks/QuestionBlock.json b/Assets/Sprites/Blocks/QuestionBlock.json index 2f136f88..9acec1f9 100644 --- a/Assets/Sprites/Blocks/QuestionBlock.json +++ b/Assets/Sprites/Blocks/QuestionBlock.json @@ -153,4 +153,4 @@ ] } } -} \ No newline at end of file +} diff --git a/Assets/Sprites/Enemies/Goomba.json b/Assets/Sprites/Enemies/Goomba.json index b33fe668..85ffca19 100644 --- a/Assets/Sprites/Enemies/Goomba.json +++ b/Assets/Sprites/Enemies/Goomba.json @@ -336,4 +336,4 @@ } } } -} \ No newline at end of file +} diff --git a/Resources/Locale/locale.csv.import b/Resources/Locale/locale.csv.import index 7646cde7..b857d0b1 100644 --- a/Resources/Locale/locale.csv.import +++ b/Resources/Locale/locale.csv.import @@ -15,3 +15,5 @@ dest_files=["res://Resources/Locale/locale.description.translation", "res://Reso compress=true delimiter=0 +unescape_keys=false +unescape_translations=true diff --git a/Resources/Locale/locale.de.translation b/Resources/Locale/locale.de.translation index 522e8267..ec2447d5 100644 Binary files a/Resources/Locale/locale.de.translation and b/Resources/Locale/locale.de.translation differ diff --git a/Resources/Locale/locale.description.translation b/Resources/Locale/locale.description.translation index 8916490f..f9269127 100644 Binary files a/Resources/Locale/locale.description.translation and b/Resources/Locale/locale.description.translation differ diff --git a/Resources/Locale/locale.en.translation b/Resources/Locale/locale.en.translation index 95f3f8ca..62ea6c2d 100644 Binary files a/Resources/Locale/locale.en.translation and b/Resources/Locale/locale.en.translation differ diff --git a/Resources/Locale/locale.es.translation b/Resources/Locale/locale.es.translation index b1714ad9..e57f0d9d 100644 Binary files a/Resources/Locale/locale.es.translation and b/Resources/Locale/locale.es.translation differ diff --git a/Resources/Locale/locale.fil.translation b/Resources/Locale/locale.fil.translation index f25f9302..101fb70c 100644 Binary files a/Resources/Locale/locale.fil.translation and b/Resources/Locale/locale.fil.translation differ diff --git a/Resources/Locale/locale.fr.translation b/Resources/Locale/locale.fr.translation index 6a9bb421..e0f9138c 100644 Binary files a/Resources/Locale/locale.fr.translation and b/Resources/Locale/locale.fr.translation differ diff --git a/Resources/Locale/locale.ga.translation b/Resources/Locale/locale.ga.translation index 3835c1e0..eb73ab82 100644 Binary files a/Resources/Locale/locale.ga.translation and b/Resources/Locale/locale.ga.translation differ diff --git a/Resources/Locale/locale.id.translation b/Resources/Locale/locale.id.translation index 1e18ca85..74bc4214 100644 Binary files a/Resources/Locale/locale.id.translation and b/Resources/Locale/locale.id.translation differ diff --git a/Resources/Locale/locale.it.translation b/Resources/Locale/locale.it.translation index dcf55ee2..a0b775ae 100644 Binary files a/Resources/Locale/locale.it.translation and b/Resources/Locale/locale.it.translation differ diff --git a/Resources/Locale/locale.jp.translation b/Resources/Locale/locale.jp.translation index b1a76e6a..34b72844 100644 Binary files a/Resources/Locale/locale.jp.translation and b/Resources/Locale/locale.jp.translation differ diff --git a/Resources/Locale/locale.pl.translation b/Resources/Locale/locale.pl.translation index a6bf0425..deb32694 100644 Binary files a/Resources/Locale/locale.pl.translation and b/Resources/Locale/locale.pl.translation differ diff --git a/Resources/Locale/locale.pt.translation b/Resources/Locale/locale.pt.translation index a34d1599..989556a2 100644 Binary files a/Resources/Locale/locale.pt.translation and b/Resources/Locale/locale.pt.translation differ diff --git a/Resources/Locale/locale.ru.translation b/Resources/Locale/locale.ru.translation index 019aabe2..66c872aa 100644 Binary files a/Resources/Locale/locale.ru.translation and b/Resources/Locale/locale.ru.translation differ diff --git a/Resources/Locale/locale.tr.translation b/Resources/Locale/locale.tr.translation index fe09e237..d1422f48 100644 Binary files a/Resources/Locale/locale.tr.translation and b/Resources/Locale/locale.tr.translation differ diff --git a/Scenes/Prefabs/UI/TileModifierMenu.tscn b/Scenes/Prefabs/UI/TileModifierMenu.tscn index c82c4f85..b6a0b544 100644 --- a/Scenes/Prefabs/UI/TileModifierMenu.tscn +++ b/Scenes/Prefabs/UI/TileModifierMenu.tscn @@ -10,14 +10,14 @@ border_width_right = 1 border_width_bottom = 1 border_color = Color(1, 1, 1, 1) -[node name="TileModifierMenu" type="PanelContainer"] +[node name="TileModifierMenu" type="PanelContainer" unique_id=1893735265] self_modulate = Color(1, 1, 1, 0.497) offset_right = 8.0 offset_bottom = 8.0 theme_override_styles/panel = SubResource("StyleBoxFlat_wognt") script = ExtResource("2_0slfq") -[node name="Container" type="VBoxContainer" parent="."] +[node name="Container" type="VBoxContainer" parent="." unique_id=924516056] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 diff --git a/project.godot b/project.godot index c4bc7d68..83f8c2f0 100644 --- a/project.godot +++ b/project.godot @@ -18,10 +18,10 @@ warnings/check_angle_interpolation_type_conflicting=false config/name="SMB1R" run/main_scene="uid://bn66tnn8nlpi7" config/use_custom_user_dir=true -config/features=PackedStringArray("4.5", "Forward Plus") +config/features=PackedStringArray("4.6", "Forward Plus") boot_splash/bg_color=Color(0, 0, 0, 1) boot_splash/show_image=false -boot_splash/fullsize=false +boot_splash/stretch_mode=0 boot_splash/use_filter=false config/icon="res://icon.png" use_discord=true