Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.9.0] move new asset i18n to engine #16280

Merged
merged 2 commits into from
Sep 19, 2023

Conversation

yanOO1497
Copy link
Contributor

@yanOO1497 yanOO1497 commented Sep 19, 2023

RT

@github-actions
Copy link

Interface Check Report

This pull request does not change any public interfaces !

@VisualSJ VisualSJ merged commit 3511d6b into cocos:develop Sep 19, 2023
8 of 9 checks passed
yanOO1497 added a commit to yanOO1497/engine that referenced this pull request Nov 27, 2023
* move new asset i18n to engine

* update
VisualSJ pushed a commit that referenced this pull request Nov 30, 2023
* move new asset i18n to engine (#16280)

* move new asset i18n to engine

* update

* sort default file content (#16249)

# Conflicts:
#	editor/assets/default_file_content/animation-graph-variant/default.animgraphvari.meta
#	editor/assets/default_file_content/animation-graph/default.animgraph.meta
#	editor/assets/default_file_content/animation-mask/default.animask.meta
#	editor/assets/default_file_content/effect.meta
#	editor/assets/default_file_content/effect/default.effect.meta
#	editor/assets/default_file_content/effect/effect-surface.effect.meta
#	editor/assets/default_file_content/flow.meta
#	editor/assets/default_file_content/js.meta
#	editor/assets/default_file_content/material/default.mtl.meta
#	editor/assets/default_file_content/pac.meta
#	editor/assets/default_file_content/physics-material/default.pmtl.meta
#	editor/assets/default_file_content/prefab.meta
#	editor/assets/default_file_content/render-pipeline/default.rpp.meta
#	editor/assets/default_file_content/render-pipeline/forward-pipeline.rpp.meta
#	editor/assets/default_file_content/rt.meta
#	editor/assets/default_file_content/scene.meta
#	editor/assets/default_file_content/scene/scene-2d.scene.meta
#	editor/assets/default_file_content/scene/scene-quality.scene.meta
#	editor/assets/default_file_content/stg.meta
#	editor/assets/default_file_content/terrain.meta

* Add auto material config (#16333)

* add auto material config

* update

* update default file content
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants