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

Browse Source

...

This commit is contained in:

Electroblob77

2020-10-28 23:20:13 +00:00

parent d00b7279ee 23621b8045

commit 15a153fe11

2 changed files with 595 additions and 172 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

+450 -118

File diff suppressed because it is too large Load Diff