Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_zh_CN.properties

@@ -486,107 +486,107 @@ unit.titan.name=泰坦
 unit.titan.description=高级的有武装地面单位,使用电石作为弹药.攻击地面单位和空中单位.
 unit.monsoon.name=狂风
 unit.monsoon.description=重型地毯式轰炸机,使用爆炸混合物或硫作为弹药。
-text.mission.complete=Mission complete!
+text.mission.complete=任务完成！
-text.mission.complete.body=Sector {0},{1} has been conquered.
+text.mission.complete.body=区域 {0}，攻占了 {1} 个
-block.drone-pad.name=Drone Pad
+block.drone-pad.name=无人机垫
-block.fabricator-pad.name=Fabricator Pad
+block.fabricator-pad.name=装配工垫
-block.interceptor-pad.name=Interceptor Pad
+block.interceptor-pad.name=拦截机垫
 block.monsoon-pad.name=Monsoon Pad
-unit.interceptor.name=Interceptor
+unit.interceptor.name=拦截机
-unit.interceptor.description=A fast, hit-and-run strike unit. Uses lead as ammo.
+unit.interceptor.description=快速的，一击即退的攻击型单位。用铅作为弹药。
-mode.sandbox.warning=Note that blocks cannot be used in sandbox mode until they are unlocked in other modes.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear.
+mode.sandbox.warning=只有在其他模式中解锁过的方块才可以在沙盒模式中使用。\n\n[LIGHT_GRAY]如果你没有解锁过任何方块，那么就什么都没有。
-block.thermal-pump.name=Thermal Pump
+block.thermal-pump.name=热能泵
-block.dagger-pad.name=Dagger Pad
+block.dagger-pad.name=尖刀垫
-block.titan-pad.name=Titan Pad
+block.titan-pad.name=泰坦垫
-block.thermal-generator.name=Thermal Generator
+block.thermal-generator.name=热能发电机
-text.coreattack=< Core is under attack! >
+text.coreattack=< 核心正在受到攻击！ >
-text.continue=Continue
+text.continue=继续
-text.nextmission=Next Mission
+text.nextmission=下一个任务
-text.server.kicked.serverClose=Server closed.
+text.server.kicked.serverClose=服务器已关闭
-text.server.kicked.sectorComplete=Sector completed.
+text.server.kicked.sectorComplete=区域已完成
-text.server.kicked.sectorComplete.text=Your mission is complete.\nThe server will now continue at the next sector.
+text.server.kicked.sectorComplete.text=任务已完成。\n服务器将在下一个区域继续。
-text.map.invalid=Error loading map: corrupted or invalid map file.
+text.map.invalid=地图载入错误：地图文件可能已经损坏。
-block.deepwater.name=deepwater
+block.deepwater.name=深水
-block.water.name=water
+block.water.name=水
-block.lava.name=lava
+block.lava.name=岩浆
-block.oil.name=oil
+block.oil.name=石油
-block.blackstone.name=blackstone
+block.blackstone.name=黑石
-block.stone.name=stone
+block.stone.name=石头
-block.dirt.name=dirt
+block.dirt.name=泥土
-block.sand.name=sand
+block.sand.name=沙子
-block.ice.name=ice
+block.ice.name=冰
-block.snow.name=snow
+block.snow.name=雪
-block.grass.name=grass
+block.grass.name=草
-block.shrub.name=shrub
+block.shrub.name=灌木
-block.rock.name=rock
+block.rock.name=岩石
-block.blackrock.name=blackrock
+block.blackrock.name=黑岩
-block.icerock.name=icerock
+block.icerock.name=冰岩
-unit.dagger.name=Dagger
+unit.dagger.name=尖刀
-unit.dagger.description=A basic ground unit. Useful in swarms.
+unit.dagger.description=基础的地面单位，在蜂群中很有用。
-category.general.name=General
+category.general.name=普通
-category.view.name=View
+category.view.name=查看
-category.multiplayer.name=Multiplayer
+category.multiplayer.name=多人
-keybind.toggle_menus.name=Toggle menus
+keybind.toggle_menus.name=切换菜单
-keybind.chat_history_prev.name=Chat history prev
+keybind.chat_history_prev.name=前面的聊天记录
-keybind.chat_history_next.name=Chat history next
+keybind.chat_history_next.name=后面的聊天记录
-keybind.chat_scroll.name=Chat scroll
+keybind.chat_scroll.name=聊天记录滚动
-keybind.drop_unit.name=drop unit
+keybind.drop_unit.name=掉落单位
-keybind.zoom_minimap.name=Zoom minimap
+keybind.zoom_minimap.name=小地图缩放
-content.mech.name=Mechs
+content.mech.name=机甲
-item.copper.name=Copper
+item.copper.name=铜
-item.copper.description=A useful structure material. Used extensively in all types of blocks.
+item.copper.description=有用的结构材料。在各种类型的方块中广泛使用。
-item.dense-alloy.name=Dense Alloy
+item.dense-alloy.name=致密合金
-item.dense-alloy.description=A tough alloy made with lead and copper. Used in advanced transportation blocks and high-tier drills.
+item.dense-alloy.description=由铅和铜制成的坚韧合金。 用于高级的运输方块和深层钻头。
 mech.alpha-mech.name=Alpha
-mech.alpha-mech.weapon=Heavy Repeater
+mech.alpha-mech.weapon=重型机枪
-mech.alpha-mech.ability=Drone Swarm
+mech.alpha-mech.ability=无人机群
-mech.alpha-mech.description=The standard mech. Has decent speed and damage output; can create up to 3 drones for increased offensive capability.
+mech.alpha-mech.description=标准的机甲。具有不错的速度和伤害输出;，可以制造多达 3 架无人机以提高进攻能力。
 mech.delta-mech.name=Delta
-mech.delta-mech.weapon=Arc Generator
+mech.delta-mech.weapon=电弧发电机
-mech.delta-mech.ability=Discharge
+mech.delta-mech.ability=放电
-mech.delta-mech.description=A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
+mech.delta-mech.description=一种快速，轻便的机甲，一击即退。对结构造成的伤害很小，但可以用弧形闪电武器很快杀死大量敌方单位。
 mech.tau-mech.name=Tau
-mech.tau-mech.weapon=Restruct Laser
+mech.tau-mech.weapon=重构激光
-mech.tau-mech.ability=Repair Burst
+mech.tau-mech.ability=修复
-mech.tau-mech.description=The support mech. Heals allied blocks by shooting at them. Can extinguish fires and heal allies in a radius with its repair ability.
+mech.tau-mech.description=后勤机甲。治疗友军。可以熄灭火焰并治疗一定范围内的友军。
 mech.omega-mech.name=Omega
-mech.omega-mech.weapon=Swarm Missiles
+mech.omega-mech.weapon=导弹群
-mech.omega-mech.ability=Armored Configuration
+mech.omega-mech.ability=配置装甲
-mech.omega-mech.description=A bulky and well-armored mech, made for front-line assaults. Its armor ability can block up to 90% of incoming damage.
+mech.omega-mech.description=一种装甲厚重的机甲，用于在前线攻击。它的护甲可以阻挡高达 90% 的伤害。
 mech.dart-ship.name=Dart
-mech.dart-ship.weapon=Repeater
+mech.dart-ship.weapon=机枪
-mech.dart-ship.description=The standard ship. Reasonably fast and light, but has little offensive capability and low mining speed.
+mech.dart-ship.description=标准飞船。快速轻便，但攻击能力低，采矿速度快。
 mech.javelin-ship.name=Javelin
-mech.javelin-ship.description=A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning ability and missiles.
+mech.javelin-ship.description=一艘一击即退的攻击船。虽然最初很慢，但它可以加速到很快的速度，并飞过敌人的前哨，利用其闪电能力和导弹造成大量伤害。
-mech.javelin-ship.weapon=Burst Missiles
+mech.javelin-ship.weapon=爆裂导弹
-mech.javelin-ship.ability=Discharge Booster
+mech.javelin-ship.ability=放电助推器
 mech.trident-ship.name=Trident
-mech.trident-ship.description=A heavy bomber. Reasonably well armored.
+mech.trident-ship.description=一个重型轰炸机。有厚装甲。
-mech.trident-ship.weapon=Bomb Bay
+mech.trident-ship.weapon=炸弹
 mech.glaive-ship.name=Glaive
-mech.glaive-ship.description=A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed.
+mech.glaive-ship.description=一个大型，装甲厚重的武装直升机。配备燃烧机枪。有优秀的加速能力和最快的速度。
-mech.glaive-ship.weapon=Flame Repeater
+mech.glaive-ship.weapon=火焰机枪
-text.mech.weapon=[LIGHT_GRAY]Weapon: {0}
+text.mech.weapon=[LIGHT_GRAY]武器: {0}
-text.mech.armor=[LIGHT_GRAY]Armor: {0}
+text.mech.armor=[LIGHT_GRAY]装甲: {0}
-text.mech.itemcapacity=[LIGHT_GRAY]Item Capacity: {0}
+text.mech.itemcapacity=[LIGHT_GRAY]物品容量: {0}
-text.mech.minespeed=[LIGHT_GRAY]Mining Speed: {0}
+text.mech.minespeed=[LIGHT_GRAY]采矿速度: {0}
-text.mech.minepower=[LIGHT_GRAY]Mining Power: {0}
+text.mech.minepower=[LIGHT_GRAY]采矿能量: {0}
-text.mech.ability=[LIGHT_GRAY]Ability: {0}
+text.mech.ability=[LIGHT_GRAY]能力: {0}
-block.core.name=Core
+block.core.name=核心
-block.metalfloor.name=Metal Floor
+block.metalfloor.name=金属地板
-block.copper-wall.name=Copper Wall
+block.copper-wall.name=铜墙
-block.copper-wall-large.name=Large Copper Wall
+block.copper-wall-large.name=大型铜墙
-block.composite-wall.name=Composite Wall
+block.composite-wall.name=复合墙
-block.composite-wall-large.name=Large Composite Wall
+block.composite-wall-large.name=大型复合墙
-block.phase-wall.name=Phase Wall
+block.phase-wall.name=相位墙
-block.phase-wall-large.name=Large Phase Wall
+block.phase-wall-large.name=大型相位墙
-block.mechanical-drill.name=Mechanical Drill
+block.mechanical-drill.name=机械钻头
-block.pneumatic-drill.name=Pneumatic Drill
+block.pneumatic-drill.name=气动钻头
-block.trident-ship-factory.name=Trident Ship Reconstructor
+block.trident-ship-factory.name=Trident 重建器
-block.glaive-ship-factory.name=Glaive Ship Reconstructor
+block.glaive-ship-factory.name=Glaive 重建器
-block.omega-mech-factory.name=Omega Mech Reconstructor
+block.omega-mech-factory.name=Omega 机甲重建器
-block.tau-mech-factory.name=Tau Mech Reconstructor
+block.tau-mech-factory.name=Tau 机甲
-block.thorium-reactor.name=Thorium Reactor
+block.thorium-reactor.name=钍反应堆
-block.alloy-smelter.name=Alloy Smtler
+block.alloy-smelter.name=合金冶炼厂
-block.mend-projector.name=Mend Projector
+block.mend-projector.name=修理投影机
-unit.alpha-drone.name=Alpha Drone
+unit.alpha-drone.name=Alpha 无人机

core/assets/ui/uiskin.json

@@ -20,6 +20,11 @@ Font: {
 		markupEnabled: true,
 		scale: 0.5
 	},
+	simp-chinese: {
+		file: simp_chinese.fnt,
+		markupEnabled: true,
+		scale: 0.5
+	},
 	title: {
 		file: title.fnt,
 		markupEnabled: true,

core/src/io/anuke/mindustry/core/UI.java

@@ -118,7 +118,7 @@ public class UI extends SceneModule{
             font.getData().setScale(Vars.fontScale);
             font.getData().down += Unit.dp.scl(4f);
             font.getData().lineHeight -= Unit.dp.scl(2f);
-        }, skin.font(), skin.getFont("default-font-chat"), skin.getFont("korean"), skin.getFont("trad-chinese"));
+        }, skin.font(), skin.getFont("default-font-chat"), skin.getFont("korean"), skin.getFont("trad-chinese"), skin.getFont("simp-chinese"));
     }
 
     @Override