Merge remote-tracking branch 'origin/master'

assets/bundles/bundle_zh_CN.properties

@@ -72,7 +72,7 @@ setting.elementdebug.description = 显示所有元素轮廓.
 setting.hiddenElem.name = 显示隐藏的元素
 setting.hiddenElem.description = 显示隐藏的元素轮廓.
 
-setting.shar-title = 单位数据信息Mod设置
+setting.shar-title = 数据信息Mod设置
 setting.shar-ui = 覆盖式信息UI设置
 setting.shar-draw = 绘制设置
 

build.gradle

@@ -33,7 +33,7 @@ dependencies {
 }
 
 task dexify(type: Jar) {
-    archiveName "$pArtifactFilename"
+    archiveName "dexed-$pArtifactFilename"
 
     final File jarArtifact = new File(tasks.jar.archiveFile.get().asFile.parent, pArtifactFilename),
                dexedArtifact = new File(tasks.dexify.getTemporaryDir(), "dexed.jar")
@@ -73,4 +73,4 @@ tasks.withType(JavaCompile){
     ])
     options.compilerArgs.addAll(['--release', '8'])
     compileJava.options.fork = true
-}
+}