diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-09-01 18:36:17 +0100 |
| commit | 13f491acee3dfd675bf77a666722b2518dd54ab2 (patch) | |
| tree | a9a0a8e4bf0fd82af5d9f13db89d9307f1e35f13 /src/.settings/org.eclipse.core.resources.prefs | |
| parent | b1ee29a247058b5686ee13093c46659ac3f01685 (diff) | |
| parent | d0abbc5bda63dc777c660b703ffcfa4a81a41e1a (diff) | |
Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10
Conflicts:
build.gradle
Diffstat (limited to 'src/.settings/org.eclipse.core.resources.prefs')
| -rw-r--r-- | src/.settings/org.eclipse.core.resources.prefs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/.settings/org.eclipse.core.resources.prefs b/src/.settings/org.eclipse.core.resources.prefs index 372d901..cd3347e 100644 --- a/src/.settings/org.eclipse.core.resources.prefs +++ b/src/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1
encoding//main/resources/assets/jewelrycraft2/lang/en_US.lang=UTF-8
+encoding//main/resources/assets/jewelrycraft2/lang/zh_CN.lang=UTF-8
|