potatOS/potatofission
1
0
Fork 0
mirror of https://github.com/turbodiesel4598/NuclearCraft synced 2025-11-09 18:24:40 +01:00
Code Issues Releases Wiki Activity

Compare commits

base: potatOS:f5f308d394602086049377e40f8a28b94a9750ff
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10
..
compare: potatOS:a66e6e73844bce4a8d4de5b5311afeda43e25269
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10

No commits in common. "f5f308d394602086049377e40f8a28b94a9750ff" and "a66e6e73844bce4a8d4de5b5311afeda43e25269" have entirely different histories.
f5f308d394 ... a66e6e7384

2 changed files with 711 additions and 640 deletions
Show Stats Expand all files Collapse all files

1347
src/main/resources/assets/nuclearcraft/lang/zh_cn.lang
View File

File diff suppressed because it is too large Load Diff

4
src/main/resources/assets/nuclearcraft/patchouli_books/guide/zh_cn/entries/materials/alloys.json
View File

@ -115,7 +115,7 @@
"item1": "nuclearcraft:ingot:10#7,nuclearcraft:dust:10#7",
"item2": "nuclearcraft:ingot:1,nuclearcraft:dust:1",
"result": "nuclearcraft:alloy:12#8",
"text": "7 锆 + 1 锡 = 8 锆锡合金"
"text": "7 锆 + 1 锡 = 8 锆合金"
},
{
"anchor": "SiC_alloy",
@ -143,4 +143,4 @@
"text": "15 铁 + 1 碳-锰混合物 = 16 高强度低合金钢"
}
]
}
}