Skip to content

Commit 922ab68

Browse files
committed
Merge branch 'main' into bevy_0.16
2 parents 6bae518 + 4d11149 commit 922ab68

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/bevy_mod_scripting.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ jobs:
170170
contents: write
171171
pull-requests: write
172172
runs-on: ubuntu-latest
173+
if: github.repository_owner == 'makspll'
173174
steps:
174175
- name: Checkout
175176
uses: actions/checkout@v4

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ test_utils = { workspace = true }
104104
libtest-mimic = "0.8"
105105
tracing-tracy = "0.11"
106106
regex = "1.11"
107-
bevy_console = { git = "https://github.com/Katsutoshii/bevy-console", branch = "bevy-0.16.0"}
107+
bevy_console = { git = "https://github.com/RichoDemus/bevy-console" }
108108

109109
[workspace]
110110
members = [

crates/bevy_mod_scripting_core/src/asset.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,14 @@ pub(crate) fn dispatch_script_asset_events(
225225
let script_id = converter(path);
226226

227227
let language = settings.select_script_language(path);
228+
if language == Language::Unknown {
229+
let extension = path
230+
.path()
231+
.extension()
232+
.and_then(|ext| ext.to_str())
233+
.unwrap_or_default();
234+
warn!("A script {:?} was added but its language is unknown. Consider adding the {:?} extension to the `ScriptAssetSettings`.", &script_id, extension);
235+
}
228236
let metadata = ScriptMetadata {
229237
asset_id: *id,
230238
script_id,

0 commit comments

Comments
 (0)