Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2

 Conflicts:

	core/src/mindustry/content/Blocks.java

core/assets/bundles/bundle.properties

@@ -1673,6 +1673,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_be.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Пераключальнік
 block.micro-processor.name = Мікропрацэсар

core/assets/bundles/bundle_bg.properties

@@ -1657,6 +1657,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Превключвател
 block.micro-processor.name = Микропроцесор

core/assets/bundles/bundle_ca.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = Mòdul de muntatge bàsic
 block.smite.name = Smite
 block.malign.name = Maligne
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Interruptor
 block.micro-processor.name = Microprocessador

core/assets/bundles/bundle_cs.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Přepínač
 block.micro-processor.name = Mikroprocesor

core/assets/bundles/bundle_da.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Kontakt
 block.micro-processor.name = Datamat

core/assets/bundles/bundle_de.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = Einfaches Verbesserermodul
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 block.switch.name = Schalter
 block.micro-processor.name = Mikroprozessor
 block.logic-processor.name = Logikprozessor

core/assets/bundles/bundle_es.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = Módulo ensamblador básico
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Interruptor
 block.micro-processor.name = Microprocesador

core/assets/bundles/bundle_et.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_eu.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_fi.properties

@@ -1650,6 +1650,7 @@ block.basic-assembler-module.name = Yksinkertainen kokoajamoduuli
 block.smite.name = Isku
 block.malign.name = Pahantahto
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Kytkin
 block.micro-processor.name = Mikroprosessori

core/assets/bundles/bundle_fil.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_fr.properties

@@ -1671,6 +1671,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Interrupteur
 block.micro-processor.name = Micro Processeur

core/assets/bundles/bundle_hu.properties

@@ -1656,6 +1656,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_id_ID.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = Modul Perakitan Dasar
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Saklar
 block.micro-processor.name = Prosesor Mikro

core/assets/bundles/bundle_it.properties

@@ -1654,6 +1654,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Interruttore
 block.micro-processor.name = Micro Processore

core/assets/bundles/bundle_ja.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = スイッチ
 block.micro-processor.name = マイクロプロセッサー

core/assets/bundles/bundle_ko.properties

@@ -311,11 +311,11 @@ open = 열기
 customize = 사용자 정의 규칙
 cancel = 취소
 command = 명령
-command.mine = Mine
-command.repair = Repair
-command.rebuild = Rebuild
-command.assist = Assist Player
-command.move = Move
+command.mine = 채굴
+command.repair = 수리
+command.rebuild = 재건
+command.assist = 플레이어 지원
+command.move = 이동
 openlink = 링크 열기
 copylink = 링크 복사
 back = 뒤로가기
@@ -1221,7 +1221,7 @@ liquid.water.name = 물
 liquid.slag.name = 광재
 liquid.oil.name = 석유
 liquid.cryofluid.name = 냉각수
-liquid.neoplasm.name = 종양
+liquid.neoplasm.name = 신생물
 liquid.arkycite.name = 아르키사이트
 liquid.gallium.name = 갈륨
 liquid.ozone.name = 오존
@@ -1661,7 +1661,8 @@ block.diffuse.name = 디퓨즈
 block.basic-assembler-module.name = 기본 조립 모듈
 block.smite.name = 스마이트
 block.malign.name = 멀라인
-block.flux-reactor.name = Flux Reactor
+block.flux-reactor.name = 융제 원자로
+block.neoplasia-reactor.name = 신생물 원자로
 
 block.switch.name = 스위치
 block.micro-processor.name = 마이크로 프로세서

core/assets/bundles/bundle_lt.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_nl.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_nl_BE.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_pl.properties

@@ -1669,6 +1669,7 @@ block.basic-assembler-module.name = Podstawowy Moduł Montażowy
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Przełącznik
 block.micro-processor.name = Mikroprocesor

core/assets/bundles/bundle_pt_BR.properties

@@ -1654,6 +1654,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Alavanca
 block.micro-processor.name = Micro Processador

core/assets/bundles/bundle_pt_PT.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_ro.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Întrerupător
 block.micro-processor.name = Microprocesor

core/assets/bundles/bundle_ru.properties

@@ -1660,6 +1660,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Переключатель
 block.micro-processor.name = Микропроцессор

core/assets/bundles/bundle_sr.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = Prosti Proizvodni Modul
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Prekidač
 block.micro-processor.name = Mikro Procesor

core/assets/bundles/bundle_sv.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_th.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = หน่วยประกอบการ
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = สวิตช์
 block.micro-processor.name = ตัวประมวลผลขนาดเล็ก

core/assets/bundles/bundle_tk.properties

@@ -1647,6 +1647,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor

core/assets/bundles/bundle_tr.properties

@@ -1662,6 +1662,7 @@ block.basic-assembler-module.name = Basit İnşa Modülü
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 #ama tüp ne aga -Anti Dragon
 block.switch.name = Düğme

core/assets/bundles/bundle_uk_UA.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = Базовий збиральний моду
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Перемикач
 block.micro-processor.name = Мікропроцесор

core/assets/bundles/bundle_vi.properties

@@ -1661,6 +1661,7 @@ block.basic-assembler-module.name = Basic Assembler Module
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = Công tắc
 block.micro-processor.name = Bộ xử lí nhỏ

core/assets/bundles/bundle_zh_CN.properties

@@ -311,11 +311,11 @@ open = 打开
 customize = 自定义规则
 cancel = 取消
 command = 指挥
-command.mine = Mine
-command.repair = Repair
-command.rebuild = Rebuild
-command.assist = Assist Player
-command.move = Move
+command.mine = 挖矿
+command.repair = 维修
+command.rebuild = 重建
+command.assist = 协助建造
+command.move = 移动
 openlink = 打开链接
 copylink = 复制链接
 back = 返回
@@ -348,8 +348,8 @@ wave.waveInProgress = [lightgray]波次袭来
 waiting = [lightgray]等待中…
 waiting.players = 等待玩家中…
 wave.enemies = [lightgray]剩余 {0} 个敌人
-wave.enemycores = [accent]{0}[lightgray] 敌人核心
-wave.enemycore = [accent]{0}[lightgray] 敌人核心
+wave.enemycores = [accent]{0}[lightgray] 敌方核心
+wave.enemycore = [accent]{0}[lightgray] 敌方核心
 wave.enemy = [lightgray]剩余 {0} 个敌人
 wave.guardianwarn = Boss 将在[accent]{0}[]波后到来。 
 wave.guardianwarn.one = Boss 将在[accent]{0}[]波后到来。 
@@ -418,7 +418,7 @@ waves.perspawn = 每波
 waves.shields = 护盾/波
 waves.to = 至
 waves.spawn = 出生点:
-waves.spawn.all = <all>
+waves.spawn.all = <全部>
 waves.spawn.select = 出生点选择
 waves.spawn.none = [scarlet]地图上没有出生点
 waves.max = 最大单位数
@@ -909,7 +909,7 @@ bar.capacity = 容量：{0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = 液体
 bar.heat = 热量
-bar.instability = Instability
+bar.instability = 不稳定性
 bar.heatamount = 热量: {0}
 bar.heatpercent = 热量: {0} ({1}%)
 bar.power = 电力
@@ -1650,7 +1650,7 @@ block.reinforced-payload-conveyor.name = 强化载荷传送带
 block.reinforced-payload-router.name = 强化载荷路由器
 block.payload-mass-driver.name = 载荷质量驱动器
 block.small-deconstructor.name = 小型解构器
-block.canvas.name = 画布
+block.canvas.name = 画板
 block.world-processor.name = 世界处理器
 block.world-cell.name = 世界内存元
 block.shield-breaker.name = 破盾机  (临时翻译/贴图)
@@ -1664,7 +1664,8 @@ block.basic-assembler-module.name = 基本装配厂模块
 
 block.smite.name = 天谴
 block.malign.name = 魔灵
-block.flux-reactor.name = Flux Reactor
+block.flux-reactor.name = 通量反应堆
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = 开关
 block.micro-processor.name = 微型处理器
@@ -1850,7 +1851,7 @@ block.cultivator.details = 一种失传已久的技术，用于尽可能高效
 block.oil-extractor.description = 使用沙子、 水和大量电力钻取石油。 
 block.core-shard.description = 基地的核心。 一旦被摧毁，此区块就会丢失。 
 block.core-shard.details = 初代核心，坚固且能够自我维持。 不具备星际旅行的能力。 
-block.core-foundation.description = 基地的核心。 装甲优良。 比初代核心容量更大。 
+block.core-foundation.description = 基地的核心。 装甲优良。 容量比初代核心更大。 
 block.core-foundation.details = 次代核心。 
 block.core-nucleus.description = 基地的核心。 装甲极佳，容量极大。 
 block.core-nucleus.details = 三代也是终代核心。 
@@ -1858,7 +1859,7 @@ block.vault.description = 大量存储各种类型的物品。 可使用装卸
 block.container.description = 少量存储各种类型的物品。 可使用装卸器卸载物品。 
 block.unloader.description = 从周围的建筑卸载指定物品。 
 block.launch-pad.description = 将货物发射至指定区块。 
-block.launch-pad.details = 用于资源点对点运输的亚轨道系统。载荷仓很脆弱，再入大气时无法保留。
+block.launch-pad.details = 用于资源点对点运输的亚轨道系统。 载荷仓很脆弱，再入大气时无法保留。
 block.duo.description = 交替向敌人发射子弹。 
 block.scatter.description = 向敌方战机发射铅、 废料或钢化玻璃高射炮弹。 
 block.scorch.description = 焚烧任何靠近它的地面敌人。 近距离内十分有效。 

core/assets/bundles/bundle_zh_TW.properties

@@ -1668,6 +1668,7 @@ block.basic-assembler-module.name = 支援組裝廠
 block.smite.name = Smite
 block.malign.name = Malign
 block.flux-reactor.name = Flux Reactor
+block.neoplasia-reactor.name = Neoplasia Reactor
 
 block.switch.name = 按鈕
 block.micro-processor.name = 微處理器

core/assets/icons/icons.properties

@@ -578,3 +578,4 @@
 63106=shockwave-tower|block-shockwave-tower-ui
 63105=heat-source|block-heat-source-ui
 63104=flux-reactor|block-flux-reactor-ui
+63103=neoplasia-reactor|block-neoplasia-reactor-ui