From 5e7069161f554733ad1b8120be29ec5b4369a5b0 Mon Sep 17 00:00:00 2001 From: Hileb <107909747+Ecdcaeb@users.noreply.github.com> Date: Wed, 1 Jan 2025 01:53:32 +0800 Subject: [PATCH 1/2] Porting of #158 solves the problem that the problem reappears when main is merged into foundation. (#272) --- .../resources/assets/forge/lang/{en_US.lang => en_us.lang} | 0 .../resources/assets/forge/lang/{ko_KR.lang => ko_kr.lang} | 0 .../resources/assets/forge/lang/{zh_CN.lang => zh_cn.lang} | 0 .../resources/assets/forge/lang/{zh_TW.lang => zh_tw.lang} | 0 src/main/resources/pack.mcmeta | 6 ++++++ 5 files changed, 6 insertions(+) rename src/main/resources/assets/forge/lang/{en_US.lang => en_us.lang} (100%) rename src/main/resources/assets/forge/lang/{ko_KR.lang => ko_kr.lang} (100%) rename src/main/resources/assets/forge/lang/{zh_CN.lang => zh_cn.lang} (100%) rename src/main/resources/assets/forge/lang/{zh_TW.lang => zh_tw.lang} (100%) create mode 100644 src/main/resources/pack.mcmeta diff --git a/src/main/resources/assets/forge/lang/en_US.lang b/src/main/resources/assets/forge/lang/en_us.lang similarity index 100% rename from src/main/resources/assets/forge/lang/en_US.lang rename to src/main/resources/assets/forge/lang/en_us.lang diff --git a/src/main/resources/assets/forge/lang/ko_KR.lang b/src/main/resources/assets/forge/lang/ko_kr.lang similarity index 100% rename from src/main/resources/assets/forge/lang/ko_KR.lang rename to src/main/resources/assets/forge/lang/ko_kr.lang diff --git a/src/main/resources/assets/forge/lang/zh_CN.lang b/src/main/resources/assets/forge/lang/zh_cn.lang similarity index 100% rename from src/main/resources/assets/forge/lang/zh_CN.lang rename to src/main/resources/assets/forge/lang/zh_cn.lang diff --git a/src/main/resources/assets/forge/lang/zh_TW.lang b/src/main/resources/assets/forge/lang/zh_tw.lang similarity index 100% rename from src/main/resources/assets/forge/lang/zh_TW.lang rename to src/main/resources/assets/forge/lang/zh_tw.lang diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 000000000..d7895a25b --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Cleanroom Resources", + "pack_format": 3 + } +} \ No newline at end of file From 118b5817f388c1f9b13ae347561faf8a1a5e6e7c Mon Sep 17 00:00:00 2001 From: HIKARIE <101081378+Oganesson897@users.noreply.github.com> Date: Sat, 25 Jan 2025 16:25:10 +0900 Subject: [PATCH 2/2] feat: project icon in intellij (#286) --- .gitignore | 4 +++- .idea/icon.svg | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .idea/icon.svg diff --git a/.gitignore b/.gitignore index ade01d143..ca1f8f616 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/.idea/ +/.idea/* /.run/ /.gradle/ /projects/ @@ -8,3 +8,5 @@ version.txt src/main/java/com/cleanroommc/common/CleanroomVersion.java build/ + +!/.idea/icon.svg \ No newline at end of file diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 000000000..5f2bd79d0 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +