Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2

Browse Source

...

This commit is contained in:

Electroblob77

2020-04-13 18:35:40 +01:00

parent 91c9a5392b 7237840a2a

commit 817fd26dcf

2 changed files with 699 additions and 679 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/ebwizardry/lang/zh_cn.lang

+576 -557

File diff suppressed because it is too large Load Diff