Skip to content

Commit 4c04b8f

Browse files
committed
Merge branch 'trunk' into 1.18.2
2 parents 87341dc + 6fd8983 commit 4c04b8f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/java/net/coderbot/iris/shaderpack/loading/ProgramId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public enum ProgramId {
3232
Item(ProgramGroup.Gbuffers, "item", TexturedLit),
3333

3434
Entities(ProgramGroup.Gbuffers, "entities", TexturedLit),
35-
EntitiesTrans(ProgramGroup.Gbuffers, "entities_trans", Entities),
35+
EntitiesTrans(ProgramGroup.Gbuffers, "entities_translucent", Entities),
3636
EntitiesGlowing(ProgramGroup.Gbuffers, "entities_glowing", Entities),
3737
ArmorGlint(ProgramGroup.Gbuffers, "armor_glint", Textured),
3838
SpiderEyes(ProgramGroup.Gbuffers, "spidereyes", Textured,

src/main/resources/assets/iris/lang/zh_tw.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"iris.sodium.failure.download": "下載 Sodium",
1717
"iris.sodium.failure.reason.notFound": "為了讓 Iris 有良好的效能表現,您需要安裝 Sodium。請先下載它、將它存放於模組資料夾後重新啟動遊戲。",
1818
"iris.sodium.failure.reason.incompatible": "為了讓 Iris 有良好的效能表現,您需要安裝版本相容的 Sodium。請先下載正確的版本、將它存放於模組資料夾、移除不正確的版本後重新啟動遊戲。",
19+
"iris.nec.failure.title": "%s:已偵測到「Not Enough Crashes」!",
20+
"iris.nec.failure.description": "「Not Enough Crashes」可能會在處理崩潰問題時,對遊戲造成嚴重破壞,並且無法提供精確結果。\n建議使用「MixinTrace」和「Crafty Crashes」替代,他們在辨識崩潰原因上更可靠,並且不會讓遊戲處於無效狀態。",
1921
"iris.unsupported.irisorpc": "Iris 或您的電腦",
2022
"iris.unsupported.iris": "Iris",
2123
"iris.unsupported.pc": "您的電腦",

0 commit comments

Comments
 (0)