diff --git a/src/logic-scenes/card_burner/card_fire.sync-conflict-20250609-183310-525GJDH.material b/src/logic-scenes/card_burner/card_fire.sync-conflict-20250609-183310-525GJDH.material new file mode 100644 index 00000000..1b5353a4 Binary files /dev/null and b/src/logic-scenes/card_burner/card_fire.sync-conflict-20250609-183310-525GJDH.material differ diff --git a/src/logic-scenes/collectable/new_collectable_ui.tscn b/src/logic-scenes/collectable/new_collectable_ui.tscn index f09b42cc..ce92ede7 100644 --- a/src/logic-scenes/collectable/new_collectable_ui.tscn +++ b/src/logic-scenes/collectable/new_collectable_ui.tscn @@ -932,7 +932,7 @@ modulate = Color(0, 0, 0, 1) custom_minimum_size = Vector2(350, 90) layout_mode = 2 bbcode_enabled = true -text = "[b]CN:[/b] Eating issues, Alienation, Swearing" +text = "[b]MementoLabel_CN[/b]: MementoLabel_ChildhoodCN" fit_content = true horizontal_alignment = 1 vertical_alignment = 1