Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Conflicts: core/assets/bundles/bundle_ko.properties core/assets/bundles/bundle_zh_CN.properties core/assets/bundles/bundle_zh_TW.properties
2021-11-22 12:11:31 -05:00
parent 65f36faf71 cec39f8a70
commit a48911b983
37 changed files with 1707 additions and 1913 deletions
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -40,7 +40,6 @@ be.updating = Updating...
 be.ignore = Ignore
 be.noupdates = No updates found.
 be.check = Check for updates
-
 mods.browser = Mod Browser
 mods.browser.selected = Selected mod
 mods.browser.add = Install
@@ -75,8 +74,8 @@ schematic.icontag = Icon Tag
 schematic.renametag = Rename Tag
 schematic.tagdelconfirm = Delete this tag completely?
 schematic.tagexists = That tag already exists.
-
 stats = Stats
+
 stat.wave = Waves Defeated:[accent] {0}
 stat.unitsCreated = Units Created:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@@ -121,7 +120,6 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-
 mods.initfailed = [red]⚠[] The previous Mindustry instance failed to initialize. This was likely caused by misbehaving mods.\n\nTo prevent a crash loop, [red]all mods have been disabled.[]
 mods = Mods
 mods.none = [lightgray]No mods found!
@@ -219,7 +217,6 @@ servers.local = Local Servers
 servers.local.steam = Open Games & Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
-
 servers.disclaimer = Community servers are [accent]not[] owned or controlled by the developer.\n\nServers may contain user-generated content that is not appropriate for all ages.
 servers.showhidden = Show Hidden Servers
 server.shown = Shown
@@ -363,8 +360,8 @@ publishing = [accent]Publishing...
 publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your items will not show up!
 publish.error = Error publishing item: {0}
 steam.error = Failed to initialize Steam services.\nError: {0}
-
 editor.cliffs = Walls To Cliffs
+
 editor.brush = Firca
 editor.openin = Editorde ac
 editor.oregen = Maden Yaratilma hizi
@@ -480,7 +477,6 @@ toolmode.drawteams = Draw Teams
 toolmode.drawteams.description = Draw teams instead of blocks.

 filters.empty = [lightgray]No filters! Add one with the button below.
-
 filter.distort = Distort
 filter.noise = Noise
 filter.enemyspawn = Enemy Spawn Select
@@ -497,7 +493,6 @@ filter.clear = Clear
 filter.option.ignore = Ignore
 filter.scatter = Scatter
 filter.terrain = Terrain
-
 filter.option.scale = Scale
 filter.option.chance = Chance
 filter.option.mag = Magnitude
@@ -553,7 +548,6 @@ research.multiplayer = Only the host can research items.
 map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
-
 loadout = Loadout
 resources = Resources 
 bannedblocks = Banned Blocks
@@ -564,6 +558,7 @@ launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
 guardian = Guardian
+
 connectfail = [crimson]Su Oyuna baglanilamadi: [accent]{0}
 error.unreachable = Server unreachable.
 error.invalidaddress = Invalid address.
@@ -580,9 +575,9 @@ weather.snow.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
-
 sectorlist = Sectors
 sectorlist.attacked = {0} under attack
+
 sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
@@ -609,19 +604,17 @@ sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.captured = Sector [accent]{0}[white]captured!
 sector.changeicon = Change Icon
-
 threat.low = Low
 threat.medium = Medium
 threat.high = High
 threat.extreme = Extreme
 threat.eradication = Eradication
-
 planets = Planets

 planet.serpulo.name = Serpulo
 planet.sun.name = Sun
-
 sector.impact0078.name = Impact 0078
+
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
 sector.frozenForest.name = Frozen Forest
@@ -656,7 +649,6 @@ sector.windsweptIslands.description = Further past the shoreline is this remote
 sector.extractionOutpost.description = A remote outpost, constructed by the enemy for the purpose of launching resources to other sectors.\n\nCross-sector transport technology is essential for further conquest. Destroy the base. Research their Launch Pads.
 sector.impact0078.description = Here lie remnants of the interstellar transport vessel that first entered this system.\n\nSalvage as much as possible from the wreckage. Research any intact technology.
 sector.planetaryTerminal.description = The final target.\n\nThis coastal base contains a structure capable of launching Cores to local planets. It is extremely well guarded.\n\nProduce naval units. Eliminate the enemy as quickly as possible. Research the launch structure.
-
 status.burning.name = Burning
 status.freezing.name = Freezing
 status.wet.name = Wet
@@ -703,9 +695,9 @@ error.crashtitle = Bir hata olustu
 unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
 block.unknown = [lightgray]???
-
 stat.showinmap = <load map to show>
 stat.description = Purpose
+
 stat.input = Input
 stat.output = Output
 stat.booster = Booster
@@ -1085,7 +1077,6 @@ item.blast-compound.name = patlama birlesimi
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
-
 liquid.water.name = Su
 liquid.slag.name = Slag
 liquid.oil.name = Benzin
@@ -1129,7 +1120,6 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
-
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
@@ -1371,34 +1361,33 @@ team.sharded.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-
 hint.skip = Skip
 hint.desktopMove = Use [accent][[WASD][] to move.
 hint.zoom = [accent]Scroll[] to zoom in or out.
-hint.mine = Move near the  copper ore and [accent]tap[] it to mine manually.
+hint.mine = Move near the \uf8c4 copper ore and [accent]tap[] it to mine manually.
 hint.desktopShoot = [accent][[Left-click][] to shoot.
 hint.depositItems = To transfer items, drag from your ship to the core.
 hint.respawn = To respawn as a ship, press [accent][[V][].
 hint.respawn.mobile = You have switched control to a unit/structure. To respawn as a ship, [accent]tap the avatar in the top left.[]
 hint.desktopPause = Press [accent][[Space][] to pause and unpause the game.
-hint.placeDrill = Select the  [accent]Drill[] tab in the menu at the bottom right, then select a  [accent]Drill[] and click on a copper patch to place it.
-hint.placeDrill.mobile = Select the  [accent]Drill[] tab in the menu at the bottom right, then select a  [accent]Drill[] and tap on a copper patch to place it.\n\nPress the  [accent]checkmark[] at the bottom right to confirm.
-hint.placeConveyor = Conveyors move items from drills into other blocks. Select a  [accent]Conveyor[] from the  [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a  [accent]Conveyor[] from the  [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
-hint.placeTurret = Place  [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, copper.\nUse conveyors and drills to supply them.
+hint.placeDrill = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and click on a copper patch to place it.
+hint.placeDrill.mobile = Select the \ue85e [accent]Drill[] tab in the menu at the bottom right, then select a \uf870 [accent]Drill[] and tap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
+hint.placeConveyor = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
+hint.placeConveyor.mobile = Conveyors move items from drills into other blocks. Select a \uf896 [accent]Conveyor[] from the \ue814 [accent]Distribution[] tab.\n\nHold down your finger for a second and drag to place multiple conveyors.
+hint.placeTurret = Place \uf861 [accent]Turrets[] to defend your base from enemies.\n\nTurrets require ammo - in this case, \uf838copper.\nUse conveyors and drills to supply them.
 hint.breaking = [accent]Right-click[] and drag to break blocks.
-hint.breaking.mobile = Activate the  [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
+hint.breaking.mobile = Activate the \ue817 [accent]hammer[] in the bottom right and tap to break blocks.\n\nHold down your finger for a second and drag to break in a selection.
 hint.blockInfo = View information of a block by selecting it in the [accent]build menu[], then selecting the [accent][[?][] button at the right.
 hint.derelict = [accent]Derelict[] structures are broken remnants of old bases that no longer function.\n\nThese structures can be [accent]deconstructed[] for resources.
-hint.research = Use the  [accent]Research[] button to research new technology.
-hint.research.mobile = Use the  [accent]Research[] button in the  [accent]Menu[] to research new technology.
+hint.research = Use the \ue875 [accent]Research[] button to research new technology.
+hint.research.mobile = Use the \ue875 [accent]Research[] button in the \ue88c [accent]Menu[] to research new technology.
 hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to control friendly units or turrets.
 hint.unitControl.mobile = [accent][[Double-tap][] to control friendly units or turrets.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the  [accent]Map[] in the bottom right.
-hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the  [accent]Map[] in the  [accent]Menu[].
+hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the bottom right.
+hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \ue827 [accent]Map[] in the \ue88c [accent]Menu[].
 hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
 hint.conveyorPathfind = Hold [accent][[L-Ctrl][] while dragging conveyors to automatically generate a path.
-hint.conveyorPathfind.mobile = Enable  [accent]diagonal mode[] and drag conveyors to automatically generate a path.
+hint.conveyorPathfind.mobile = Enable \ue844 [accent]diagonal mode[] and drag conveyors to automatically generate a path.
 hint.boost = Hold [accent][[L-Shift][] to fly over obstacles with your current unit.\n\nOnly a few ground units have boosters.
 hint.command = Press [accent][[G][] to command nearby units of [accent]similar type[] into formation.\n\nTo command ground units, you must first control another ground unit.
 hint.command.mobile = [accent][[Double-tap][] your unit to command nearby units into formation.
@@ -1407,9 +1396,9 @@ hint.payloadPickup.mobile = [accent]Tap and hold[] a small block or unit to pick
 hint.payloadDrop = Press [accent]][] to drop a payload.
 hint.payloadDrop.mobile = [accent]Tap and hold[] an empty location to drop a payload there.
 hint.waveFire = [accent]Wave[] turrets with water as ammunition will automatically put out nearby fires.
-hint.generator =  [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with  [accent]Power Nodes[].
-hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or  [accent]Graphite[] Duo/Salvo ammunition to take Guardians down.
-hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a  [accent]Foundation[] core over the  [accent]Shard[] core. Make sure it is free from nearby obstructions.
+hint.generator = \uf879 [accent]Combustion Generators[] burn coal and transmit power to adjacent blocks.\n\nPower transmission range can be extended with \uf87f [accent]Power Nodes[].
+hint.guardian = [accent]Guardian[] units are armored. Weak ammo such as [accent]Copper[] and [accent]Lead[] is [scarlet]not effective[].\n\nUse higher tier turrets or \uf835 [accent]Graphite[] \uf861Duo/\uf859Salvo ammunition to take Guardians down.
+hint.coreUpgrade = Cores can be upgraded by [accent]placing higher-tier cores over them[].\n\nPlace a \uf868 [accent]Foundation[] core over the \uf869 [accent]Shard[] core. Make sure it is free from nearby obstructions.
 hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen Forest[], can be launched to from anywhere. They do not require capture of nearby territory.\n\n[accent]Numbered sectors[], such as this one, are [accent]optional[].
 hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
 hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
@@ -1436,15 +1425,14 @@ item.spore-pod.description = Used for conversion into oil, explosives and fuel.
 item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
 item.blast-compound.description = Bombalar ve patlayicilarda kullanilabilir. Yakit olarak kullanilmasi tavsiye edilmez.
 item.pyratite.description = Yakici silahlar icin yakici bir madde.
-
 liquid.water.description = Commonly used for cooling machines and waste processing.
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = Can be burnt, exploded or used as a coolant.
 liquid.cryofluid.description = The most efficient liquid for cooling things down.
-
-block.derelict =  [lightgray]Derelict
+block.derelict = \uf77e [lightgray]Derelict
 block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors.
 block.illuminator.description = A small, compact, configurable light source. Requires power to function.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
@@ -1591,7 +1579,6 @@ block.large-logic-display.description = Displays arbitrary graphics from a logic
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
 block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
-
 unit.dagger.description = Fires standard bullets at all nearby enemies.
 unit.mace.description = Fires streams of flame at all nearby enemies.
 unit.fortress.description = Fires long-range artillery at ground targets.
@@ -1630,7 +1617,6 @@ unit.oxynoe.description = Fires structure-repairing streams of flame at nearby e
 unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
 unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
 unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
-
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
@@ -1651,22 +1637,18 @@ lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
 lst.unitcontrol = Control the currently bound unit.
 lst.unitradar = Locate units around the currently bound unit.
 lst.unitlocate = Locate a specific type of position/building anywhere on the map.\nRequires a bound unit.
-
 logic.nounitbuild = [red]Unit building logic is not allowed here.
-
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
 lenum.shootp = Shoot at a unit/building with velocity prediction.
 lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
-
 laccess.color = Illuminator color.
 laccess.controller = Unit controller. If processor controlled, returns processor.\nIf in a formation, returns leader.\nOtherwise, returns the unit itself.
 laccess.dead = Whether a unit/building is dead or no longer valid.
 laccess.controlled = Returns:\n[accent]@ctrlProcessor[] if unit controller is processor\n[accent]@ctrlPlayer[] if unit/building controller is player\n[accent]@ctrlFormation[] if unit is in formation\nOtherwise, 0.
 laccess.commanded = [red]Deprecated. Will be removed![]\nUse [accent]controlled[] instead.
 laccess.progress = Action progress, 0 to 1.\nReturns production, turret reload or construction progress.
-
 graphicstype.clear = Fill the display with a color.
 graphicstype.color = Set color for next drawing operations.
 graphicstype.stroke = Set line width.
@@ -1677,7 +1659,6 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
-
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
@@ -1692,27 +1673,22 @@ lenum.land = Logical AND.
 lenum.and = Bitwise AND.
 lenum.not = Bitwise flip.
 lenum.xor = Bitwise XOR.
-
 lenum.min = Minimum of two numbers.
 lenum.max = Maximum of two numbers.
 lenum.angle = Angle of vector in degrees.
 lenum.len = Length of vector.
-
 lenum.sin = Sine, in degrees.
 lenum.cos = Cosine, in degrees.
 lenum.tan = Tangent, in degrees.
-
 lenum.asin = Arc sine, in degrees.
 lenum.acos = Arc cosine, in degrees.
 lenum.atan = Arc tangent, in degrees.
-
 lenum.rand = Random decimal in range [0, value).
 lenum.log = Natural logarithm (ln).
 lenum.log10 = Base 10 logarithm.
 lenum.noise = 2D simplex noise.
 lenum.abs = Absolute value.
 lenum.sqrt = Square root.
-
 lenum.any = Any unit.
 lenum.ally = Ally unit.
 lenum.attacker = Unit with a weapon.
@@ -1721,12 +1697,10 @@ lenum.boss = Guardian unit.
 lenum.flying = Flying unit.
 lenum.ground = Ground unit.
 lenum.player = Unit controlled by a player.
-
 lenum.ore = Ore deposit.
 lenum.damaged = Damaged ally building.
 lenum.spawn = Enemy spawn point.\nMay be a core or a position.
 lenum.building = Building in a specific group.
-
 lenum.core = Any core.
 lenum.storage = Storage building, e.g. Vault.
 lenum.generator = Buildings that generate power.
@@ -1737,33 +1711,27 @@ lenum.battery = Any battery.
 lenum.resupply = Resupply points.\nOnly relevant when [accent]"Unit Ammo"[] is enabled.
 lenum.reactor = Impact/Thorium reactor.
 lenum.turret = Any turret.
-
 sensor.in = The building/unit to sense.
-
 radar.from = Building to sense from.\nSensor range is limited by building range.
 radar.target = Filter for units to sense.
 radar.and = Additional filters.
 radar.order = Sorting order. 0 to reverse.
 radar.sort = Metric to sort results by.
 radar.output = Variable to write output unit to.
-
 unitradar.target = Filter for units to sense.
 unitradar.and = Additional filters.
 unitradar.order = Sorting order. 0 to reverse.
 unitradar.sort = Metric to sort results by.
 unitradar.output = Variable to write output unit to.
-
 control.of = Building to control.
 control.unit = Unit/building to aim at.
 control.shoot = Whether to shoot.
-
 unitlocate.enemy = Whether to locate enemy buildings.
 unitlocate.found = Whether the object was found.
 unitlocate.building = Output variable for located building.
 unitlocate.outx = Output X coordinate.
 unitlocate.outy = Output Y coordinate.
 unitlocate.group = Building group to look for.
-
 lenum.idle = Don't move, but keep building/mining.\nThe default state.
 lenum.stop = Stop moving/mining/building.
 lenum.move = Move to exact position.