Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ categories = [
exclude = [".github/**/*"]

[dependencies]
bevy = { version = "0.18", default-features = false, features = [
bevy = { version = "0.19.0", default-features = false, features = [
"bevy_asset",
"bevy_log",
] }
Expand All @@ -31,11 +31,11 @@ intl-memoizer = "0.5.1"
ron = "0.12"
serde = { version = "1.0.197", features = ["derive"] }
serde_yaml = "0.9.32"
thiserror = "1.0.58"
thiserror = "2.0.18"
tracing = "0.1.40"
unic-langid = { version = "0.9.4", features = ["serde"] }
uuid = { version = "1.7.0", features = ["serde", "v4", "v5"] }

[dev-dependencies]
bevy = "0.18"
bevy = "0.19.0"
unic-langid = { version = "0.9.4", features = ["macros"] }
16 changes: 8 additions & 8 deletions examples/ui/systems/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ pub fn setup(
parent.spawn((
Text(choose_language),
TextFont {
font: font.0.clone(),
font_size: 64.0,
font: font.0.clone().into(),
font_size: FontSize::Px(64.0),
..default()
},
TextColor(Color::WHITE),
Expand Down Expand Up @@ -92,8 +92,8 @@ pub fn setup(
parent.spawn((
Text("<".to_string()),
TextFont {
font: font.0.clone(),
font_size: 64.0,
font: font.0.clone().into(),
font_size: FontSize::Px(64.0),
..default()
},
TextColor(Color::WHITE),
Expand All @@ -116,8 +116,8 @@ pub fn setup(
parent.spawn((
Text(locale),
TextFont {
font: font.0.clone(),
font_size: 64.0,
font: font.0.clone().into(),
font_size: FontSize::Px(64.0),
..default()
},
TextColor(Color::WHITE),
Expand All @@ -142,8 +142,8 @@ pub fn setup(
parent.spawn((
Text(">".to_string()),
TextFont {
font: font.0.clone(),
font_size: 64.0,
font: font.0.clone().into(),
font_size: FontSize::Px(64.0),
..default()
},
TextColor(Color::WHITE),
Expand Down
7 changes: 1 addition & 6 deletions src/assets/bundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ async fn load(data: Data, load_context: &mut LoadContext<'_>) -> Result<BundleAs
path = parent.join(path);
}
}
let loaded = load_context
.loader()
.immediate()
.with_unknown_type()
.load(path)
.await?;
let loaded = load_context.load_builder().load_untyped_value(path).await?;
let resource = loaded.get::<ResourceAsset>().unwrap();
if let Err(errors) = bundle.add_resource(resource.0.clone()) {
warn_span!("add_resource").in_scope(|| {
Expand Down
Loading