From 5956ad38d5bc0a1e281dc30c99a25f00e500edf6 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:42:56 +0800 Subject: [PATCH 1/3] Update zh_cn.json --- .../assets/hexcasting/lang/zh_cn.json | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json index d437e9d9..34f8a459 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json +++ b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json @@ -336,12 +336,17 @@ "hexcasting.spell.hexcasting:zone_entity/not_player": "区域之馏化：非玩家", "hexcasting.spell.hexcasting:zone_entity/not_living": "区域之馏化：非生物", - "hexcasting.spell.hexcasting:duplicate": "双子之分解", - "hexcasting.spell.hexcasting:duplicate_n": "双子之策略", - "hexcasting.spell.hexcasting:over": "狄俄斯库里之策略", - "hexcasting.spell.hexcasting:stack_len": "群体之精思", "hexcasting.spell.hexcasting:swap": "弄臣之策略", + "hexcasting.spell.hexcasting:rotate": "轮换之策略", + "hexcasting.spell.hexcasting:rotate_reverse": "轮换之策略，第二型", + "hexcasting.spell.hexcasting:duplicate": "双子之分解", + "hexcasting.spell.hexcasting:over": "勘探者之策略", + "hexcasting.spell.hexcasting:tuck": "送葬者之策略", + "hexcasting.spell.hexcasting:2dup": "狄俄斯库里之策略", + "hexcasting.spell.hexcasting:duplicate_n": "双子之策略", + "hexcasting.spell.hexcasting:stack_len": "群体之精思", "hexcasting.spell.hexcasting:fisherman": "渔夫之策略", + "hexcasting.spell.hexcasting:fisherman/copy": "渔夫之策略，第二型", "hexcasting.spell.hexcasting:swizzle": "骗徒之策略", "hexcasting.spell.hexcasting:and_bit": "交叉之馏化", @@ -897,10 +902,15 @@ "hexcasting.page.stackmanip.pseudo-novice": "移除栈顶的 iota。", "hexcasting.page.stackmanip.duplicate": "复制栈顶的 iota。", "hexcasting.page.stackmanip.swap": "交换栈顶两个 iota 的位置。", - "hexcasting.page.stackmanip.rotate": "将栈顶往下第三元素拉至栈顶。[0, 1, 2] 变为 [1, 2, 0]。", "hexcasting.page.stackmanip.over": "将栈顶往下第二元素复制至栈顶。[0, 1] 变为 [0, 1, 0]。", + "hexcasting.page.stackmanip.rotate": "将栈顶往下第三元素拉至栈顶。[0, 1, 2] 变为 [1, 2, 0]。", + "hexcasting.page.stackmanip.rotate_reverse": "将栈顶元素沉至栈顶往下第三位处。[0, 1, 2] 变为 [2, 0, 1]。", + "hexcasting.page.stackmanip.over": "将栈底往上第二元素复制至栈顶。[0, 1] 变为 [0, 1, 0]。", + "hexcasting.page.stackmanip.tuck": "将栈底元素复制至栈顶往下第二元素下方。[0, 1] 变为 [1, 0, 1]。", + "hexcasting.page.stackmanip.2dup": "复制栈顶的两个 iota。[0, 1] 变为 [0, 1, 0, 1]。", "hexcasting.page.stackmanip.duplicate_n": "移除栈顶的数，然后将现在的栈顶元素复制该数次。（若所给数为 2，则栈顶会有两个同一元素。）", "hexcasting.page.stackmanip.fisherman": "提出下标为所给数的元素并将其置于栈顶。", + "hexcasting.page.stackmanip.fisherman/copy": "与$(action)渔夫之策略/$类似，但会复制 iota 而非将其提出。", "hexcasting.page.stackmanip.stack_len": "以数的形式压入栈中元素的个数。（例如，一个形如 [0, 1] 的栈会变为 [0, 1, 2]。）", "hexcasting.page.stackmanip.last_n_list": "移除$(italic)所给数/$个元素，然后压入一个由其组成的列表。", "hexcasting.page.stackmanip.splat": "移除栈顶的列表，然后依次压入其元素。", From 52726ba522b3ef3800767c0ef73c27ab1ce22309 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Mon, 21 Nov 2022 00:53:06 +0800 Subject: [PATCH 2/3] fix --- Common/src/main/resources/assets/hexcasting/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json index 34f8a459..ddfb5598 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json +++ b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json @@ -905,7 +905,7 @@ "hexcasting.page.stackmanip.over": "将栈顶往下第二元素复制至栈顶。[0, 1] 变为 [0, 1, 0]。", "hexcasting.page.stackmanip.rotate": "将栈顶往下第三元素拉至栈顶。[0, 1, 2] 变为 [1, 2, 0]。", "hexcasting.page.stackmanip.rotate_reverse": "将栈顶元素沉至栈顶往下第三位处。[0, 1, 2] 变为 [2, 0, 1]。", - "hexcasting.page.stackmanip.over": "将栈底往上第二元素复制至栈顶。[0, 1] 变为 [0, 1, 0]。", + "hexcasting.page.stackmanip.over": "将栈顶往下第二元素复制至栈顶。[0, 1] 变为 [0, 1, 0]。", "hexcasting.page.stackmanip.tuck": "将栈底元素复制至栈顶往下第二元素下方。[0, 1] 变为 [1, 0, 1]。", "hexcasting.page.stackmanip.2dup": "复制栈顶的两个 iota。[0, 1] 变为 [0, 1, 0, 1]。", "hexcasting.page.stackmanip.duplicate_n": "移除栈顶的数，然后将现在的栈顶元素复制该数次。（若所给数为 2，则栈顶会有两个同一元素。）", From 6cdb34efbb16ba5a0a95e2e96ecb4f2d47274017 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Mon, 21 Nov 2022 07:45:52 +0800 Subject: [PATCH 3/3] Update zh_cn.json --- Common/src/main/resources/assets/hexcasting/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json index ddfb5598..acbe7e1f 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json +++ b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.json @@ -270,7 +270,7 @@ "hexcasting.spell.book.hexcasting:const/vec/x": "向量之精思，+X/-X型", "hexcasting.spell.book.hexcasting:const/vec/y": "向量之精思，+Y/-Y型", "hexcasting.spell.book.hexcasting:const/vec/z": "向量之精思，+Z/-Z型", - "hexcasting.spell.book.hexcasting:write/entity": "编年史家之策略", + "hexcasting.spell.book.hexcasting:read/entity": "编年史家之纯化", "hexcasting.spell.book.hexcasting:number": "数字之精思", "hexcasting.spell.book.hexcasting:mask": "簿记员之策略",