Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
935135b
Update zh_cn.lang
mamaruo Feb 6, 2022
0c87260
Update zh_cn.lang
mamaruo Feb 6, 2022
e2e972a
Update zh_cn.lang
mamaruo Feb 6, 2022
3a71219
Update zh_cn.lang
mamaruo Feb 6, 2022
53f18f1
弹出提示改漏了,补上
mamaruo Feb 6, 2022
4f5a3ef
少个空格
mamaruo Feb 6, 2022
34f6367
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 9, 2022
ad1926a
遵循译名标准化更正
mamaruo Feb 9, 2022
f2136f0
Update zh_cn.lang
mamaruo Feb 9, 2022
94b0126
Update zh_cn.lang
mamaruo Feb 9, 2022
7daf111
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 11, 2022
2a2517a
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 13, 2022
992f6d7
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 17, 2022
786e7d8
Revert "hmm"
mamaruo Feb 17, 2022
a85ccaa
Revert "dimtrc"
mamaruo Feb 17, 2022
3535fe4
Revert "staff no power"
mamaruo Feb 17, 2022
ec9fd06
Revert "vacuum dat vacuum"
mamaruo Feb 17, 2022
678a64f
Revert "pulse vibra stuff ii"
mamaruo Feb 17, 2022
23e35a3
振动改回脉冲
mamaruo Feb 17, 2022
3d2dbe2
revert
mamaruo Feb 17, 2022
fa00e6e
解决冲突
mamaruo Feb 17, 2022
f6d0e0f
Revert "endervoir"
mamaruo Feb 17, 2022
944fec1
Revert "pressurized. high? probly"
mamaruo Feb 17, 2022
4fea658
Revert ‘end steel’
mamaruo Feb 17, 2022
54e9031
[AdvancedGenerators] introducing 脉冲 and 玛玉灵 respectively
n0099 Feb 18, 2022
0eac018
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 18, 2022
aad46bc
补充 #1525
mamaruo Feb 18, 2022
66f7d5a
部分 revert 13c152d
mamaruo Feb 18, 2022
3f0cc8a
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 18, 2022
6d8cce4
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 19, 2022
2b06cbc
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 22, 2022
f729a16
Update en_us.json
mamaruo Feb 23, 2022
90cd821
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 24, 2022
6c7fe77
update glasscutter
mamaruo Feb 25, 2022
c3e3d85
Merge branch 'CFPAOrg:main' into main
mamaruo Feb 25, 2022
e302917
Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json
mamaruo Feb 26, 2022
83720ed
Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json
mamaruo Feb 26, 2022
975b065
Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json
mamaruo Feb 26, 2022
f1e854d
Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json
mamaruo Feb 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions projects/1.16/assets/glass-cutter/glasscutter/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,39 @@
{
"item.glasscutter.glasscutter": "Glass Cutter",
"item.glasscutter.glasscutter_strong": "Obsidian Glass Cutter"
"block.glasscutter.glasscutter": "Glasscutter",
"container.glasscutter.glasscutter": "Glasscutter",
"block.glasscutter.glass_stairs": "Glass Stairs",
"block.glasscutter.glass_slab": "Glass Slab",
"block.glasscutter.black_stained_glass_stairs": "Black Stained Glass Stairs",
"block.glasscutter.red_stained_glass_stairs": "Red Stained Glass Stairs",
"block.glasscutter.green_stained_glass_stairs": "Green Stained Glass Stairs",
"block.glasscutter.brown_stained_glass_stairs": "Brown Stained Glass Stairs",
"block.glasscutter.blue_stained_glass_stairs": "Blue Stained Glass Stairs",
"block.glasscutter.purple_stained_glass_stairs": "Purple Stained Glass Stairs",
"block.glasscutter.cyan_stained_glass_stairs": "Cyan Stained Glass Stairs",
"block.glasscutter.light_gray_stained_glass_stairs": "Light Gray Stained Glass Stairs",
"block.glasscutter.gray_stained_glass_stairs": "Gray Stained Glass Stairs",
"block.glasscutter.pink_stained_glass_stairs": "Pink Stained Glass Stairs",
"block.glasscutter.lime_stained_glass_stairs": "Lime Stained Glass Stairs",
"block.glasscutter.yellow_stained_glass_stairs": "Yellow Stained Glass Stairs",
"block.glasscutter.light_blue_stained_glass_stairs": "Light Blue Stained Glass Stairs",
"block.glasscutter.magenta_stained_glass_stairs": "Magenta Stained Glass Stairs",
"block.glasscutter.orange_stained_glass_stairs": "Orange Stained Glass Stairs",
"block.glasscutter.white_stained_glass_stairs": "White Stained Glass Stairs",
"block.glasscutter.black_stained_glass_slab": "Black Stained Glass Slab",
"block.glasscutter.red_stained_glass_slab": "Red Stained Glass Slab",
"block.glasscutter.green_stained_glass_slab": "Green Stained Glass Slab",
"block.glasscutter.brown_stained_glass_slab": "Brown Stained Glass Slab",
"block.glasscutter.blue_stained_glass_slab": "Blue Stained Glass Slab",
"block.glasscutter.purple_stained_glass_slab": "Purple Stained Glass Slab",
"block.glasscutter.cyan_stained_glass_slab": "Cyan Stained Glass Slab",
"block.glasscutter.light_gray_stained_glass_slab": "Light Gray Stained Glass Slab",
"block.glasscutter.gray_stained_glass_slab": "Gray Stained Glass Slab",
"block.glasscutter.pink_stained_glass_slab": "Pink Stained Glass Slab",
"block.glasscutter.lime_stained_glass_slab": "Lime Stained Glass Slab",
"block.glasscutter.yellow_stained_glass_slab": "Yellow Stained Glass Slab",
"block.glasscutter.light_blue_stained_glass_slab": "Light Blue Stained Glass Slab",
"block.glasscutter.magenta_stained_glass_slab": "Magenta Stained Glass Slab",
"block.glasscutter.orange_stained_glass_slab": "Orange Stained Glass Slab",
"block.glasscutter.white_stained_glass_slab": "White Stained Glass Slab",
"gui.jei.category.glassCutter": "Glasscutting"
}
40 changes: 39 additions & 1 deletion projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1 +1,39 @@
{}
{
"block.glasscutter.glasscutter": "切玻璃机",
"container.glasscutter.glasscutter": "切玻璃机",
"block.glasscutter.glass_stairs": "玻璃楼梯",
"block.glasscutter.glass_slab": "玻璃台阶",
"block.glasscutter.black_stained_glass_stairs": "黑色染色玻璃楼梯",
"block.glasscutter.red_stained_glass_stairs": "红色染色玻璃楼梯",
"block.glasscutter.green_stained_glass_stairs": "绿色染色玻璃楼梯",
"block.glasscutter.brown_stained_glass_stairs": "棕色染色玻璃楼梯",
"block.glasscutter.blue_stained_glass_stairs": "蓝色染色玻璃楼梯",
"block.glasscutter.purple_stained_glass_stairs": "紫色染色玻璃楼梯",
"block.glasscutter.cyan_stained_glass_stairs": "青色染色玻璃楼梯",
"block.glasscutter.light_gray_stained_glass_stairs": "淡灰色染色玻璃楼梯",
"block.glasscutter.gray_stained_glass_stairs": "灰色染色玻璃楼梯",
"block.glasscutter.pink_stained_glass_stairs": "粉红色染色玻璃楼梯",
"block.glasscutter.lime_stained_glass_stairs": "黄绿色染色玻璃楼梯",
"block.glasscutter.yellow_stained_glass_stairs": "黄色染色玻璃楼梯",
"block.glasscutter.light_blue_stained_glass_stairs": "淡蓝色染色玻璃楼梯",
"block.glasscutter.magenta_stained_glass_stairs": "品红色染色玻璃楼梯",
"block.glasscutter.orange_stained_glass_stairs": "橙色染色玻璃楼梯",
"block.glasscutter.white_stained_glass_stairs": "白色染色玻璃楼梯",
"block.glasscutter.black_stained_glass_slab": "黑色染色玻璃台阶",
"block.glasscutter.red_stained_glass_slab": "红色染色玻璃台阶",
"block.glasscutter.green_stained_glass_slab": "绿色染色玻璃台阶",
"block.glasscutter.brown_stained_glass_slab": "棕色染色玻璃台阶",
"block.glasscutter.blue_stained_glass_slab": "蓝色染色玻璃台阶",
"block.glasscutter.purple_stained_glass_slab": "紫色染色玻璃台阶",
"block.glasscutter.cyan_stained_glass_slab": "青色染色玻璃台阶",
"block.glasscutter.light_gray_stained_glass_slab": "淡灰色染色玻璃台阶",
"block.glasscutter.gray_stained_glass_slab": "灰色染色玻璃台阶",
"block.glasscutter.pink_stained_glass_slab": "粉红色染色玻璃台阶",
"block.glasscutter.lime_stained_glass_slab": "黄绿色染色玻璃台阶",
"block.glasscutter.yellow_stained_glass_slab": "黄色染色玻璃台阶",
"block.glasscutter.light_blue_stained_glass_slab": "淡蓝色染色玻璃台阶",
"block.glasscutter.magenta_stained_glass_slab": "品红色染色玻璃台阶",
"block.glasscutter.orange_stained_glass_slab": "橙色染色玻璃台阶",
"block.glasscutter.white_stained_glass_slab": "白色染色玻璃台阶",
"gui.jei.category.glassCutter": "玻璃切割"
}
4 changes: 0 additions & 4 deletions projects/1.18/assets/glass-cutter/glasscutter/lang/en_us.json

This file was deleted.

This file was deleted.