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:a66e6e73844bce4a8d4de5b5311afeda43e25269
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10
..
compare: potatOS:f5f308d394602086049377e40f8a28b94a9750ff
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10

6 Commits
a66e6e7384 ... f5f308d394

Author SHA1 Message Date
Tom Dodd
f5f308d394
Merge pull request #672 from WuzgXY-GitHub/master 
CHS Translation of 2o.4.0
 2020-07-20 15:09:08 +01:00
WuzgXY
92c4d30ae0
v2o.4.0 2020-07-20 18:10:58 +08:00
WuzgXY
b2b7815543
v2o.4.0 2020-07-20 18:04:22 +08:00
WuzgXY
2ac3c3dfb9
v2o.4.0 2020-07-20 18:03:45 +08:00
WuzgXY
477906baaa
v2o.4.0 2020-07-20 18:00:53 +08:00
WuzgXY
578a54cef8
v2o.4.0 2020-07-19 22:49:14 +08:00
2 changed files with 640 additions and 711 deletions
Show Stats Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2
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", "item1": "nuclearcraft:ingot:10#7,nuclearcraft:dust:10#7",
"item2": "nuclearcraft:ingot:1,nuclearcraft:dust:1", "item2": "nuclearcraft:ingot:1,nuclearcraft:dust:1",
"result": "nuclearcraft:alloy:12#8", "result": "nuclearcraft:alloy:12#8",
"text": "7 锆 + 1 锡 = 8 锆合金" "text": "7 锆 + 1 锡 = 8 锆锡合金"
}, },
{ {
"anchor": "SiC_alloy", "anchor": "SiC_alloy",