Skip to content

Quark 文件结构改动+审阅#1

Open
SlimeSB wants to merge 7 commits intoqznfbnj:quark-1.20from
SlimeSB:quark-change
Open

Quark 文件结构改动+审阅#1
SlimeSB wants to merge 7 commits intoqznfbnj:quark-1.20from
SlimeSB:quark-change

Conversation

@SlimeSB
Copy link
Copy Markdown

@SlimeSB SlimeSB commented Aug 13, 2024

我在这里审

commit 40b6c2a
Merge: 2511473 932e1b7
Author: SlimeSB <86453765+SlimeSB@users.noreply.github.com>
Date:   Tue Aug 13 16:00:53 2024 +0800

    Merge remote-tracking branch 'upstream/main' into pr/3326

commit 2511473
Author: [qzn to fb’s nj12] <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 13 01:05:10 2024 +0800

    参考建议的更改来修改翻译

commit 2b5fc8f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 2 15:07:13 2024 +0800

    与 1.20 同步

commit 67aa257
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Apr 14 17:51:03 2024 +0800

    配置汉化:花树→花木

commit 7d764f8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Mar 30 23:04:27 2024 +0800

    同步1.20更改,修正“来追我啊”进度描述

commit 42af2a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 15:22:39 2024 +0800

    同步1.20更改

commit 164756e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 15:06:58 2024 +0800

    一致性

commit 7e2cd77
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:44:52 2024 +0800

    同步官方英文格式

commit 49adb80
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:31:21 2024 +0800

    Apply ZZZank's suggestions with my modification

commit e3afbac
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:06:59 2024 +0800

    async local change

commit 755fcad
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:37:46 2023 +0800

    将格式转换为官方使用的格式

commit 800eb77
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:34:42 2023 +0800

    失误

commit dbf4aed
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:33:43 2023 +0800

    螺旋尖顶描述

commit f220958
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:10:21 2023 +0800

    myalite_crystal_viaduct

commit 582c8a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 21:07:48 2023 +0800

    myalite_crystal_grow

    Co-authored-by: ZZZank <47418975+ZZZank@users.noreply.github.com>

commit 15f9799
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Dec 28 22:53:23 2023 +0800

    竹席描述

commit 8d0531c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Dec 25 15:21:13 2023 +0800

    tools.pathfinder_maps.desc

commit 8f6eebf
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 22:05:38 2023 +0800

    charcoal_block_and_blaze_lantern_stay_on_fire_forever

commit f896001
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 21:34:26 2023 +0800

    脚手架:更说人话

commit 6366811
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 20:42:19 2023 +0800

    寻路地图/羽毛笔

commit 374256c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 19:58:41 2023 +0800

    火永久燃烧

commit 754bca9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 00:12:18 2023 +0800

    Tooltip 工具提示→提示框/提示信息

commit ce0aa8a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 23:53:25 2023 +0800

    monster_box.desc

commit af744e5
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 23:19:07 2023 +0800

    allowed_screens.name

    Co-authored-by: ZZZank <47418975+ZZZank@users.noreply.github.com>

commit f8e56e1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 22:29:42 2023 +0800

    blaze_lantern

commit 5807c1a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 22:20:31 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

    big_harvesting_hoes

commit 6c990b6
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Dec 6 15:23:06 2023 +0800

    翻译1.19化

commit ddc2233
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Dec 5 22:24:52 2023 +0800

    竹竿→竹杆

commit d4ccdef
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Nov 26 11:28:51 2023 +0800

    概率 → 几率

commit 05986f1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Nov 21 12:45:54 2023 +0800

    % => %%

commit 907dfa7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 21 13:04:09 2023 +0800

    失误

commit 6cd9779
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 21 13:03:04 2023 +0800

    跟随官方 Update zh_cn.json

commit aafa500
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 21:57:04 2023 +0800

    Hotfix for zh_cn.json

commit 1ee3dcd
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 21:54:24 2023 +0800

    跟随官方更新 zh_cn.json

commit 82c7abe
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 18:48:36 2023 +0800

    Update en_us.json

commit 9245a35
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 7 20:49:59 2023 +0800

    修改部分字幕翻译

commit 3958ff3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 18:50:24 2023 +0800

    跟随官方,删除多余条目

commit 14e8029
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 12:47:31 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit a247356
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 12:46:39 2023 +0800

    Apply suggestions from code review

    按钮脉冲,铁砧升级

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit 502d342
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Oct 3 16:33:01 2023 +0800

    跟随官方 Update zh_cn.json

commit 95b70f1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Oct 3 16:32:40 2023 +0800

    跟随官方 Update en_us.json

commit d71f5eb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Oct 2 23:01:50 2023 +0800

    跟随官方 Update en_us.json

commit b0d28f4
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Oct 2 23:01:23 2023 +0800

    跟随官方 Update zh_cn.json

commit 7991c7e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Oct 1 14:12:39 2023 +0800

    跟随官方 fix some spelling errors

commit 6a22b12
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Sep 29 14:58:41 2023 +0800

    Update zh_cn.json

    跟随官方

commit de6ff0a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Sep 29 14:56:06 2023 +0800

    Update en_us.json

    跟随官方

commit 4788ad7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Sep 23 22:11:43 2023 +0800

    Apply suggestions from code review

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit ba07f34
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Sep 23 21:57:05 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit ca42a9a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Sep 21 22:51:23 2023 +0800

    L87,埃德·鲍斯

commit c8971d8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 22:43:51 2023 +0800

    修改部分标签,删除未显示标签

commit 7358d91
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 13:25:48 2023 +0800

    将云朵捕捉到瓶子中 -> 把云朵捕捉到瓶子中

commit 8e8840c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 13:20:48 2023 +0800

    修改部分翻译

commit f70471c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 23:34:59 2023 +0800

    删除注释,摘自中文Minecraft Wiki

commit 0ce9211
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 23:30:22 2023 +0800

    去除译注

commit ce8b6e3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 22:05:35 2023 +0800

    撤销「微调:缩减过长名称/无法缩减的不再重复名称」

commit 9b3084f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 22:03:12 2023 +0800

    撤销英中对照、描述对标题的重复

commit ba000ce
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:36:34 2023 +0800

    Update zh_cn.json

    删除失误重复行

commit c1bffb1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:26:38 2023 +0800

    Update zh_cn.json

commit e4f131f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:07:55 2023 +0800

    Update zh_cn.json

    2023/8/28 - 微调:缩减过长名称/无法缩减的不再重复名称

commit 4abb4f3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 26 01:04:00 2023 +0800

    Update zh_cn.json

    2023/8/26 - 使配置变为【英文 | 中文】的格式

commit bb30c03
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 22 23:37:34 2023 +0800

    Update zh_cn.json

    跟进官方更新

commit 5c20785
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 19 21:51:44 2023 +0800

    Update zh_cn.json

    小修改

commit f739567
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 19 17:51:05 2023 +0800

    Update zh_cn.json

    2023/8/19 - 完成全部配置翻译

commit 317acdc
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 22:46:26 2023 +0800

    Update zh_cn.json

    2023/8/17

commit 2c2b772
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 12:19:46 2023 +0800

    Update en_us.json

commit fc77cb0
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 00:02:12 2023 +0800

    Update zh_cn.json

    2023/8/17 - 完成奇思妙想类别的模块翻译,正在进行子分类的翻译

commit 53812bc
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 15 22:41:14 2023 +0800

    Update zh_cn.json

    2023/8/15 - 更新新版本翻译

commit f4934b8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 15 15:56:39 2023 +0800

    Update en_us.json

commit cdd7822
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 12 22:09:29 2023 +0800

    Update zh_cn.json

    2023/8/12

commit d5a3e04
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 23:07:06 2023 +0800

    Update zh_cn.json

    2023/8/9  - 矩阵附魔很难懂

commit 823d610
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:58:23 2023 +0800

    Update en_us.json

commit bdda236
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:56:22 2023 +0800

    Update en_us.json

commit 91a8d18
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:54:31 2023 +0800

    Update en_us.json for official update

commit 0348fd7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 8 00:01:47 2023 +0800

    Update zh_cn.json

    2023/8/7 - 没什么进展

commit 7fe6045
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 7 00:43:55 2023 +0800

    Update zh_cn.json

    2023/8/6 - 客户端类别完成。奇思妙想类别

commit 8aa3492
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 5 23:28:51 2023 +0800

    Update zh_cn.json

    2023/8/5 - 客户端类别

commit 5ef95a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 5 22:26:20 2023 +0800

    Update en_us.json

    official typo fix

commit ec61b3e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Aug 4 22:35:19 2023 +0800

    Update zh_cn.json

    2023/8/4 - 客户端类别

commit c583a58
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 3 00:36:37 2023 +0800

    Update zh_cn.json

    2023/8/2 - 完成生物类别

commit 99ad786
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 1 21:51:25 2023 +0800

    Update zh_cn.json

    2023/8/1 - 世界类别完成。头疼,提前结束

commit 88dfb5c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 31 00:09:59 2023 +0800

    Update zh_cn.json

    2023/7/30 - 永冻石

commit 5359ea3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jul 28 00:29:21 2023 +0800

    Update zh_cn.json

    2023/7/27 - 进度:仙女花环

commit 4205a42
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Jul 26 23:34:04 2023 +0800

    Update zh_cn.json

    2023/7/26 紫颂植被

commit c98af6f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 25 23:45:48 2023 +0800

    Update zh_cn.json

    2023/7/25

commit 30ec946
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 23 22:30:04 2023 +0800

    Update zh_cn.json

    2023/7/23

commit 0a185ec
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 23 00:00:41 2023 +0800

    Update zh_cn.json

    2023/7/22

commit 010b1db
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jul 21 23:48:51 2023 +0800

    Update zh_cn.json

    2023/7/21

commit c221619
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Jul 20 22:36:52 2023 +0800

    Update zh_cn.json

    2023/7/20

commit 1a7a29f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 18 21:58:51 2023 +0800

    Update zh_cn.json

    完成「工具」类别的翻译

commit ae20cd5
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 18 00:01:40 2023 +0800

    Update zh_cn.json

    2023/7/17 - 翻译到彩色符文

commit 2e55c32
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 16 23:19:46 2023 +0800

    Update zh_cn.json

    开始翻译 management 模块

commit df233e4
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 16 01:01:44 2023 +0800

    Update zh_cn.json

    更新非配置条目,配置条目主要翻译了皮卡镖

commit b626fa7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 10 21:33:16 2023 +0800

    Update en_us.json

commit a5f084e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 10 21:31:39 2023 +0800

    Update en_us.json

commit a124758
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 22:25:42 2023 +0800

    Hot fix for 火把

commit ed1ea65
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 22:23:35 2023 +0800

    finish building config catagory and stop updating

commit 7ca0b6b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 01:27:28 2023 +0800

    Update zh_cn.json for 6月3日_2

commit 0e91a6b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 01:24:26 2023 +0800

    Update zh_cn.json for 6月3日

commit 87d6bc9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jun 2 23:31:52 2023 +0800

    Update zh_cn.json for 6月2日

commit 8b33a6a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Jun 1 23:30:50 2023 +0800

    Update zh_cn.json - work of today

commit 4749dc9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed May 31 23:06:39 2023 +0800

    Update zh_cn.json - kyou no oshigoto

commit e58c3fe
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed May 31 17:16:27 2023 +0800

    finish general config catagory

commit f61aa5d
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue May 30 23:29:39 2023 +0800

    Use the configuration name as the first line of the configuration description

commit b68014c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue May 30 18:33:00 2023 +0800

    Update en_us.json for official update

commit 09a4fbb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:38 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit b365ecb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:18 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit 04d2780
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:06 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit 10b4aae
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun May 28 21:00:20 2023 +0800

     Restore some other 荧光 to 发光

commit 0a5ab60
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun May 28 20:56:32 2023 +0800

    Restore some 荧光 to 发光

commit eb23d8b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 23:50:07 2023 +0800

    Update zh_cn.json

commit 6ef5777
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 16:10:39 2023 +0800

    Update zh_cn.json

commit 2c7f9a2
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 16:09:44 2023 +0800

    Update zh_cn.json

commit 05708e9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 12:38:28 2023 +0800

    Update zh_cn.json

commit 5fd76b8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 12:23:18 2023 +0800

    Update zh_cn.json

commit 518673d
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:58:53 2023 +0800

    Update en_us.json

commit 4cdd7be
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:58:20 2023 +0800

    Update en_us.json

commit c67b692
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:55:06 2023 +0800

    Update en_us.json
commit 40b6c2a
Merge: 2511473 932e1b7
Author: SlimeSB <86453765+SlimeSB@users.noreply.github.com>
Date:   Tue Aug 13 16:00:53 2024 +0800

    Merge remote-tracking branch 'upstream/main' into pr/3326

commit 2511473
Author: [qzn to fb’s nj12] <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 13 01:05:10 2024 +0800

    参考建议的更改来修改翻译

commit 2b5fc8f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 2 15:07:13 2024 +0800

    与 1.20 同步

commit 67aa257
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Apr 14 17:51:03 2024 +0800

    配置汉化:花树→花木

commit 7d764f8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Mar 30 23:04:27 2024 +0800

    同步1.20更改,修正“来追我啊”进度描述

commit 42af2a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 15:22:39 2024 +0800

    同步1.20更改

commit 164756e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 15:06:58 2024 +0800

    一致性

commit 7e2cd77
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:44:52 2024 +0800

    同步官方英文格式

commit 49adb80
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:31:21 2024 +0800

    Apply ZZZank's suggestions with my modification

commit e3afbac
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Jan 6 14:06:59 2024 +0800

    async local change

commit 755fcad
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:37:46 2023 +0800

    将格式转换为官方使用的格式

commit 800eb77
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:34:42 2023 +0800

    失误

commit dbf4aed
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:33:43 2023 +0800

    螺旋尖顶描述

commit f220958
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 22:10:21 2023 +0800

    myalite_crystal_viaduct

commit 582c8a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 30 21:07:48 2023 +0800

    myalite_crystal_grow

    Co-authored-by: ZZZank <47418975+ZZZank@users.noreply.github.com>

commit 15f9799
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Dec 28 22:53:23 2023 +0800

    竹席描述

commit 8d0531c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Dec 25 15:21:13 2023 +0800

    tools.pathfinder_maps.desc

commit 8f6eebf
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 22:05:38 2023 +0800

    charcoal_block_and_blaze_lantern_stay_on_fire_forever

commit f896001
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 21:34:26 2023 +0800

    脚手架:更说人话

commit 6366811
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 20:42:19 2023 +0800

    寻路地图/羽毛笔

commit 374256c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 19:58:41 2023 +0800

    火永久燃烧

commit 754bca9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Dec 24 00:12:18 2023 +0800

    Tooltip 工具提示→提示框/提示信息

commit ce0aa8a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 23:53:25 2023 +0800

    monster_box.desc

commit af744e5
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 23:19:07 2023 +0800

    allowed_screens.name

    Co-authored-by: ZZZank <47418975+ZZZank@users.noreply.github.com>

commit f8e56e1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 22:29:42 2023 +0800

    blaze_lantern

commit 5807c1a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Dec 23 22:20:31 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

    big_harvesting_hoes

commit 6c990b6
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Dec 6 15:23:06 2023 +0800

    翻译1.19化

commit ddc2233
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Dec 5 22:24:52 2023 +0800

    竹竿→竹杆

commit d4ccdef
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Nov 26 11:28:51 2023 +0800

    概率 → 几率

commit 05986f1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Nov 21 12:45:54 2023 +0800

    % => %%

commit 907dfa7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 21 13:04:09 2023 +0800

    失误

commit 6cd9779
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 21 13:03:04 2023 +0800

    跟随官方 Update zh_cn.json

commit aafa500
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 21:57:04 2023 +0800

    Hotfix for zh_cn.json

commit 1ee3dcd
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 21:54:24 2023 +0800

    跟随官方更新 zh_cn.json

commit 82c7abe
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 14 18:48:36 2023 +0800

    Update en_us.json

commit 9245a35
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Oct 7 20:49:59 2023 +0800

    修改部分字幕翻译

commit 3958ff3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 18:50:24 2023 +0800

    跟随官方,删除多余条目

commit 14e8029
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 12:47:31 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit a247356
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Oct 5 12:46:39 2023 +0800

    Apply suggestions from code review

    按钮脉冲,铁砧升级

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit 502d342
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Oct 3 16:33:01 2023 +0800

    跟随官方 Update zh_cn.json

commit 95b70f1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Oct 3 16:32:40 2023 +0800

    跟随官方 Update en_us.json

commit d71f5eb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Oct 2 23:01:50 2023 +0800

    跟随官方 Update en_us.json

commit b0d28f4
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Oct 2 23:01:23 2023 +0800

    跟随官方 Update zh_cn.json

commit 7991c7e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Oct 1 14:12:39 2023 +0800

    跟随官方 fix some spelling errors

commit 6a22b12
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Sep 29 14:58:41 2023 +0800

    Update zh_cn.json

    跟随官方

commit de6ff0a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Sep 29 14:56:06 2023 +0800

    Update en_us.json

    跟随官方

commit 4788ad7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Sep 23 22:11:43 2023 +0800

    Apply suggestions from code review

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit ba07f34
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Sep 23 21:57:05 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

    Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com>

commit ca42a9a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Sep 21 22:51:23 2023 +0800

    L87,埃德·鲍斯

commit c8971d8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 22:43:51 2023 +0800

    修改部分标签,删除未显示标签

commit 7358d91
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 13:25:48 2023 +0800

    将云朵捕捉到瓶子中 -> 把云朵捕捉到瓶子中

commit 8e8840c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Sep 20 13:20:48 2023 +0800

    修改部分翻译

commit f70471c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 23:34:59 2023 +0800

    删除注释,摘自中文Minecraft Wiki

commit 0ce9211
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 23:30:22 2023 +0800

    去除译注

commit ce8b6e3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 22:05:35 2023 +0800

    撤销「微调:缩减过长名称/无法缩减的不再重复名称」

commit 9b3084f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Sep 19 22:03:12 2023 +0800

    撤销英中对照、描述对标题的重复

commit ba000ce
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:36:34 2023 +0800

    Update zh_cn.json

    删除失误重复行

commit c1bffb1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:26:38 2023 +0800

    Update zh_cn.json

commit e4f131f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 28 20:07:55 2023 +0800

    Update zh_cn.json

    2023/8/28 - 微调:缩减过长名称/无法缩减的不再重复名称

commit 4abb4f3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 26 01:04:00 2023 +0800

    Update zh_cn.json

    2023/8/26 - 使配置变为【英文 | 中文】的格式

commit bb30c03
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 22 23:37:34 2023 +0800

    Update zh_cn.json

    跟进官方更新

commit 5c20785
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 19 21:51:44 2023 +0800

    Update zh_cn.json

    小修改

commit f739567
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 19 17:51:05 2023 +0800

    Update zh_cn.json

    2023/8/19 - 完成全部配置翻译

commit 317acdc
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 22:46:26 2023 +0800

    Update zh_cn.json

    2023/8/17

commit 2c2b772
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 12:19:46 2023 +0800

    Update en_us.json

commit fc77cb0
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 17 00:02:12 2023 +0800

    Update zh_cn.json

    2023/8/17 - 完成奇思妙想类别的模块翻译,正在进行子分类的翻译

commit 53812bc
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 15 22:41:14 2023 +0800

    Update zh_cn.json

    2023/8/15 - 更新新版本翻译

commit f4934b8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 15 15:56:39 2023 +0800

    Update en_us.json

commit cdd7822
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 12 22:09:29 2023 +0800

    Update zh_cn.json

    2023/8/12

commit d5a3e04
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 23:07:06 2023 +0800

    Update zh_cn.json

    2023/8/9  - 矩阵附魔很难懂

commit 823d610
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:58:23 2023 +0800

    Update en_us.json

commit bdda236
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:56:22 2023 +0800

    Update en_us.json

commit 91a8d18
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Aug 9 17:54:31 2023 +0800

    Update en_us.json for official update

commit 0348fd7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 8 00:01:47 2023 +0800

    Update zh_cn.json

    2023/8/7 - 没什么进展

commit 7fe6045
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Aug 7 00:43:55 2023 +0800

    Update zh_cn.json

    2023/8/6 - 客户端类别完成。奇思妙想类别

commit 8aa3492
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 5 23:28:51 2023 +0800

    Update zh_cn.json

    2023/8/5 - 客户端类别

commit 5ef95a1
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat Aug 5 22:26:20 2023 +0800

    Update en_us.json

    official typo fix

commit ec61b3e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Aug 4 22:35:19 2023 +0800

    Update zh_cn.json

    2023/8/4 - 客户端类别

commit c583a58
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Aug 3 00:36:37 2023 +0800

    Update zh_cn.json

    2023/8/2 - 完成生物类别

commit 99ad786
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Aug 1 21:51:25 2023 +0800

    Update zh_cn.json

    2023/8/1 - 世界类别完成。头疼,提前结束

commit 88dfb5c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 31 00:09:59 2023 +0800

    Update zh_cn.json

    2023/7/30 - 永冻石

commit 5359ea3
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jul 28 00:29:21 2023 +0800

    Update zh_cn.json

    2023/7/27 - 进度:仙女花环

commit 4205a42
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed Jul 26 23:34:04 2023 +0800

    Update zh_cn.json

    2023/7/26 紫颂植被

commit c98af6f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 25 23:45:48 2023 +0800

    Update zh_cn.json

    2023/7/25

commit 30ec946
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 23 22:30:04 2023 +0800

    Update zh_cn.json

    2023/7/23

commit 0a185ec
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 23 00:00:41 2023 +0800

    Update zh_cn.json

    2023/7/22

commit 010b1db
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jul 21 23:48:51 2023 +0800

    Update zh_cn.json

    2023/7/21

commit c221619
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Jul 20 22:36:52 2023 +0800

    Update zh_cn.json

    2023/7/20

commit 1a7a29f
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 18 21:58:51 2023 +0800

    Update zh_cn.json

    完成「工具」类别的翻译

commit ae20cd5
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue Jul 18 00:01:40 2023 +0800

    Update zh_cn.json

    2023/7/17 - 翻译到彩色符文

commit 2e55c32
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 16 23:19:46 2023 +0800

    Update zh_cn.json

    开始翻译 management 模块

commit df233e4
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jul 16 01:01:44 2023 +0800

    Update zh_cn.json

    更新非配置条目,配置条目主要翻译了皮卡镖

commit b626fa7
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 10 21:33:16 2023 +0800

    Update en_us.json

commit a5f084e
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon Jul 10 21:31:39 2023 +0800

    Update en_us.json

commit a124758
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 22:25:42 2023 +0800

    Hot fix for 火把

commit ed1ea65
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 22:23:35 2023 +0800

    finish building config catagory and stop updating

commit 7ca0b6b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 01:27:28 2023 +0800

    Update zh_cn.json for 6月3日_2

commit 0e91a6b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun Jun 4 01:24:26 2023 +0800

    Update zh_cn.json for 6月3日

commit 87d6bc9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri Jun 2 23:31:52 2023 +0800

    Update zh_cn.json for 6月2日

commit 8b33a6a
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Thu Jun 1 23:30:50 2023 +0800

    Update zh_cn.json - work of today

commit 4749dc9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed May 31 23:06:39 2023 +0800

    Update zh_cn.json - kyou no oshigoto

commit e58c3fe
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Wed May 31 17:16:27 2023 +0800

    finish general config catagory

commit f61aa5d
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue May 30 23:29:39 2023 +0800

    Use the configuration name as the first line of the configuration description

commit b68014c
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Tue May 30 18:33:00 2023 +0800

    Update en_us.json for official update

commit 09a4fbb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:38 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit b365ecb
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:18 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit 04d2780
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Mon May 29 01:25:06 2023 +0800

    Update projects/1.19/assets/quark/quark/lang/zh_cn.json

commit 10b4aae
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun May 28 21:00:20 2023 +0800

     Restore some other 荧光 to 发光

commit 0a5ab60
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sun May 28 20:56:32 2023 +0800

    Restore some 荧光 to 发光

commit eb23d8b
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 23:50:07 2023 +0800

    Update zh_cn.json

commit 6ef5777
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 16:10:39 2023 +0800

    Update zh_cn.json

commit 2c7f9a2
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Sat May 27 16:09:44 2023 +0800

    Update zh_cn.json

commit 05708e9
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 12:38:28 2023 +0800

    Update zh_cn.json

commit 5fd76b8
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 12:23:18 2023 +0800

    Update zh_cn.json

commit 518673d
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:58:53 2023 +0800

    Update en_us.json

commit 4cdd7be
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:58:20 2023 +0800

    Update en_us.json

commit c67b692
Author: 其智乃反不能及 <100760086+qznfbnj@users.noreply.github.com>
Date:   Fri May 26 11:55:06 2023 +0800

    Update en_us.json
@SlimeSB SlimeSB changed the title Quark change Quark 文件结构改动+审阅 Aug 13, 2024
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json
@SlimeSB SlimeSB marked this pull request as ready for review August 13, 2024 16:10
Copy link
Copy Markdown

@bucketBrian bucketBrian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

尽量找出了些问题。

"advancements.quark.apply_color_rune.description": "使用铁砧将彩色符文应用到物品上",
"advancements.quark.wear_full_rainbow.title": "吃定彩虹",
"advancements.quark.wear_full_rainbow.description": "装备一身带有彩虹符文效果的盔甲",
"advancements.quark.throw_parrot_egg.title": "只是鹦鹉",
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"advancements.quark.throw_parrot_egg.title": "只是鹦鹉",
"advancements.quark.throw_parrot_egg.title": "你哪也不是",

“Just the Parrots”进度我认为是在对应原版的“The Parrots and the Bats”(我从哪里来?),所以我的方案做了一点额外发挥。

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这样译是错误的,因为 the birds and the bees 是以性教育的图像代指性教育本身。
若认为 Just the Parrots 是 The Parrots and the Bats 的半句的话,也应加入性教育的意思,比如鸟下蛋繁衍之类的。
建议译作“你是蛋里面出来的”

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

那简化为“你从蛋里来”呢?正好和“我从哪里来?”对应。

Copy link
Copy Markdown
Author

@SlimeSB SlimeSB Oct 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

随便,你/我也随便。qz最后挑个顺眼的写上去就行了。

Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json Outdated
Comment thread projects/1.20/assets/quark/quark/lang/zh_cn-config.json Outdated
"quark.camera.header": "相机模式",
"quark.camera.info": "[%s退出,Enter摁下快门]",
"quark.camera.reset": "重置设置(需按住潜行键)",
"quark.camera.greetings": "来自%s的问候!",

Copy link
Copy Markdown

@bucketBrian bucketBrian Sep 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"death.attack.quark.pickarang": "%2$s用皮卡镖给%1$s来了个惊喜回马枪",
"death.attack.quark.pickarang.item": "%2$s用%3$s给%1$s来了个惊喜回马枪",

此处缺少了两个key,对应使用皮卡镖击杀玩家时的死亡提示。(只缺少了这两个)
原文分别为:
"%1$s was surprised by %2$s's pickarang coming back around"
"%1$s was surprised by %2$s's %3$s coming back around"

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

请分清 1.19 和 1.20

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

抱歉,查看时没发现1.20有被折叠的部分,无视即可。

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我就在这继续讨论吧。
我当时纠结于 surprised 是 偷袭 还是 惊讶于,不过更主要的是这条死亡提示对应的场景就是单纯把皮卡镖掷出砸死人而已,真正的“折返时的回旋镖”是根本不伤人的,所以我很难理解这俚语(可能……应该是俚语?)到底是什么意思
image
image
如果按你说的 杀个回马枪 的话,那就是说指的是玩家“背后”放冷枪了,那确实说得通了(可能?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

surprise本身确实能同时表达“惊讶”和“偷袭”的意思。
我的方案本身也有把这两个意思都同时表达出来的想法。“回马枪”本身的特性(突然向后调转)就使其有了和偷袭类似的含义。

Copy link
Copy Markdown
Author

@SlimeSB SlimeSB Oct 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

需要注意这里无论是惊讶还是奇袭都需要译作被动句。
A被B折返的C打了个措手不及
A被B折返的C惊讶到了

Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json
Comment thread projects/1.19/assets/quark/quark/lang/zh_cn.json
@bucketBrian
Copy link
Copy Markdown

	"death.attack.quark.pickarang": "%1$s被%2$s折返的皮卡镖偷袭了",  // TODO: 还需要继续推敲
	"death.attack.quark.pickarang.item": "%1$s惊讶于%2$s的%3$s会折返",  // TODO: 还需要继续推敲

关于这两条,也许可以考虑一下我的方案:

  "death.attack.quark.pickarang": "%2$s用皮卡镖给%1$s来了个惊喜回马枪",
  "death.attack.quark.pickarang.item": "%2$s用%3$s给%1$s来了个惊喜回马枪",

@qznfbnj
Copy link
Copy Markdown
Owner

qznfbnj commented Apr 18, 2025

不会玩 vscode,这下尴尬了(
image

qznfbnj added 2 commits April 19, 2025 07:44
从 vscode 中复制粘贴时出现失误
@SlimeSB
Copy link
Copy Markdown
Author

SlimeSB commented Apr 19, 2025

你改错分支了,你应该改你自己的quark-1.20。
虽然你有空弄了但是我没时间了。

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