Merge branch 'master' into balancing_burst-drill-optional-multiplier

core/assets/bundles/bundle.properties

@@ -144,6 +144,7 @@ mod.enabled = [lightgray]Enabled
 mod.disabled = [red]Disabled
 mod.multiplayer.compatible = [gray]Multiplayer Compatible
 mod.disable = Disable
+mod.version = Version:
 mod.content = Content:
 mod.delete.error = Unable to delete mod. File may be in use.
 
@@ -197,7 +198,8 @@ campaign.select = Select Starting Campaign
 campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
 campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nMore difficult. Higher quality maps and overall experience.
 campaign.serpulo = Older content; the classic experience. More open-ended, more content.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
-completed = [accent]Completed
+campaign.difficulty = Difficulty
+completed = [accent]Researched
 techtree = Tech Tree
 techtree.select = Tech Tree Selection
 techtree.serpulo = Serpulo
@@ -299,13 +301,14 @@ disconnect.error = Connection error.
 disconnect.closed = Connection closed.
 disconnect.timeout = Timed out.
 disconnect.data = Failed to load world data!
+disconnect.snapshottimeout = Timed out while receiving UDP snapshots.\nThis may be caused by an unstable network or connection.
 cantconnect = Unable to join game ([accent]{0}[]).
 connecting = [accent]Connecting...
 reconnecting = [accent]Reconnecting...
 connecting.data = [accent]Loading world data...
 server.port = Port:
-server.addressinuse = Address already in use!
 server.invalidport = Invalid port number!
+server.error.addressinuse = [scarlet]Failed to open server on port 6567.[]\n\nMake sure no other Mindustry servers are running on your device or network!
 server.error = [scarlet]Error hosting server.
 save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
@@ -358,6 +361,7 @@ command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
 stance.stop = Cancel Orders
 stance.shoot = Stance: Shoot
 stance.holdfire = Stance: Hold Fire
@@ -502,6 +506,7 @@ wavemode.counts = counts
 wavemode.totals = totals
 wavemode.health = health
 
+all = All
 editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit
@@ -673,7 +678,6 @@ requirement.capture = Capture {0}
 requirement.onplanet = Control Sector On {0}
 requirement.onsector = Land On Sector: {0}
 launch.text = Launch
-research.multiplayer = Only the host can research items.
 map.multiplayer = Only the host can view sectors.
 uncover = Uncover
 configure = Configure Loadout
@@ -717,9 +721,9 @@ objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0
 objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
 objective.destroycore = [accent]Destroy Enemy Core
 objective.command = [accent]Command Units
-objective.nuclearlaunch = [accent]\u26A0 Nuclear launch detected: [lightgray]{0}
+objective.nuclearlaunch = [accent]\u26A0 Missile launch detected: [lightgray]{0}
 
-announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
+announce.nuclearstrike = [red]\u26A0 MISSILE STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
 
 loadout = Loadout
 resources = Resources
@@ -747,6 +751,7 @@ error.mapnotfound = Map file not found!
 error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
+error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThis will not be fixed. There is no known workaround for this issue.
 
 weather.rain.name = Rain
 weather.snowing.name = Snow
@@ -799,6 +804,12 @@ threat.high = High
 threat.extreme = Extreme
 threat.eradication = Eradication
 
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
 planets = Planets
 
 planet.serpulo.name = Serpulo
@@ -820,9 +831,19 @@ sector.fungalPass.name = Fungal Pass
 sector.biomassFacility.name = Biomass Synthesis Facility
 sector.windsweptIslands.name = Windswept Islands
 sector.extractionOutpost.name = Extraction Outpost
+sector.facility32m.name = Facility 32 M
+sector.taintedWoods.name = Tainted Woods
+sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetary Launch Terminal
 sector.coastline.name = Coastline
 sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
+sector.testingGrounds.name = Testing Grounds
+sector.seaPort.name = Sea Port
+sector.weatheredChannels.name = Weathered Channels
+sector.mycelialBastion.name = Mycelial Bastion
+sector.frontier.name = Frontier
 
 sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
 sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
@@ -842,6 +863,20 @@ sector.impact0078.description = Here lie remnants of the interstellar transport
 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.
 sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
 sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
+sector.cruxscape.name = Cruxscape
+sector.geothermalStronghold.name = Geothermal Stronghold
+
+#do not translate
+sector.facility32m.description = WIP, map submission by Stormride_R
+sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
+sector.frontier.description = WIP, map submission by Stormride_R
+sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
+sector.testingGrounds.description = WIP, map submission by dnx2019
+sector.seaPort.description = WIP, map submission by inkognito626
+sector.weatheredChannels.description = WIP, map submission by Skeledragon
+sector.mycelialBastion.description = WIP, map submission by Skeledragon
 
 sector.onset.name = The Onset
 sector.aegis.name = Aegis
@@ -1041,7 +1076,8 @@ ability.liquidexplode.description = Spills liquid on death
 
 ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
 ability.stat.regen = [stat]{0}[lightgray] health/sec
-ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.pulseregen = [stat]{0}[lightgray] health/pulse
+ability.stat.shield = [stat]{0}[lightgray] max shield
 ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
 ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
 ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
@@ -1104,6 +1140,8 @@ bullet.healamount = [stat]{0}[lightgray] direct repair
 bullet.multiplier = [stat]{0}[lightgray] ammo/item
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
+bullet.notargetsmissiles = [stat] ignores missiles
+bullet.notargetsbuildings = [stat] ignores buildings
 
 unit.blocks = blocks
 unit.blockssquared = blocks\u00B2
@@ -1164,12 +1202,6 @@ setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Scaling
 setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Always Diagonal Placement
-setting.difficulty.training = Training
-setting.difficulty.easy = Easy
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Hard
-setting.difficulty.insane = Insane
-setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
 setting.bloomintensity.name = Bloom Intensity
 setting.bloomblur.name = Bloom Blur
@@ -1261,6 +1293,7 @@ keybind.unit_command_load_units.name = Unit Command: Load Units
 keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
 keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
 keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
 
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
@@ -1339,12 +1372,16 @@ rules.wavetimer = Wave Timer
 rules.wavesending = Wave Sending
 rules.allowedit = Allow Editing Rules
 rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
+rules.alloweditworldprocessors = Allow Editing World Processors
+rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
-rules.airUseSpawns = Air units use spawn points
+rules.airUseSpawns = Air Units Use Spawn Points
 rules.attack = Attack Mode
 rules.buildai = Base Builder AI
 rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI [red](WIP)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
 rules.rtsminattackweight = Min Attack Weight
@@ -1387,6 +1424,9 @@ rules.title.teams = Teams
 rules.title.planet = Planet
 rules.lighting = Lighting
 rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
 rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
@@ -1396,6 +1436,7 @@ rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
 
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
 rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
 rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
@@ -1540,6 +1581,8 @@ block.graphite-press.name = Graphite Press
 block.multi-press.name = Multi-Press
 block.constructing = {0} [lightgray](Constructing)
 block.spawn.name = Enemy Spawn
+block.remove-wall.name = Remove Wall
+block.remove-ore.name = Remove Ore
 block.core-shard.name = Core: Shard
 block.core-foundation.name = Core: Foundation
 block.core-nucleus.name = Core: Nucleus
@@ -1799,6 +1842,7 @@ block.electric-heater.name = Electric Heater
 block.slag-heater.name = Slag Heater
 block.phase-heater.name = Phase Heater
 block.heat-redirector.name = Heat Redirector
+block.small-heat-redirector.name = Small Heat Redirector
 block.heat-router.name = Heat Router
 block.slag-incinerator.name = Slag Incinerator
 block.carbide-crucible.name = Carbide Crucible
@@ -1846,8 +1890,9 @@ block.chemical-combustion-chamber.name = Chemical Combustion Chamber
 block.pyrolysis-generator.name = Pyrolysis Generator
 block.vent-condenser.name = Vent Condenser
 block.cliff-crusher.name = Cliff Crusher
+block.large-cliff-crusher.name = Advanced Cliff Crusher
 block.plasma-bore.name = Plasma Bore
-block.large-plasma-bore.name = Large Plasma Bore
+block.large-plasma-bore.name = Advanced Plasma Bore
 block.impact-drill.name = Impact Drill
 block.eruption-drill.name = Eruption Drill
 block.core-bastion.name = Core: Bastion
@@ -1999,7 +2044,7 @@ split.container = Similar to the container, units can also be transported using
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Used in liquid transportation and electrical structures.
-item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms; not that there are many left here.
 item.metaglass.description = Used in liquid distribution/storage structures.
 item.graphite.description = Used in electrical components and turret ammunition.
 item.sand.description = Used for production of other refined materials.
@@ -2080,6 +2125,10 @@ block.phase-wall.description = Protects structures from enemy projectiles, refle
 block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
 block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
 block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.scrap-wall.description = Protects structures from enemy projectiles.
+block.scrap-wall-large.description = Protects structures from enemy projectiles.
+block.scrap-wall-huge.description = Protects structures from enemy projectiles.
+block.scrap-wall-gigantic.description = Protects structures from enemy projectiles.
 block.door.description = A wall that can be opened and closed.
 block.door-large.description = A wall that can be opened and closed.
 block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency.
@@ -2193,7 +2242,7 @@ block.repair-turret.description = Continuously repairs the closest damaged unit
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
-block.breach.description = Fires piercing beryllium or tungsten ammunition at enemy targets.
+block.breach.description = Fires piercing bullets at enemy targets.
 block.diffuse.description = Fires a burst of bullets in a wide cone. Pushes enemy targets back.
 block.sublimate.description = Fires a continuous jet of flame at enemy targets. Pierces armor.
 block.titan.description = Fires a massive explosive artillery shell at ground targets. Requires hydrogen.
@@ -2209,6 +2258,7 @@ block.electric-heater.description = Applies heat to structures. Requires large a
 block.slag-heater.description = Applies heat to structures. Requires slag.
 block.phase-heater.description = Applies heat to structures. Requires phase fabric.
 block.heat-redirector.description = Redirects accumulated heat to other blocks.
+block.small-heat-redirector.description = Redirects accumulated heat to other blocks.
 block.heat-router.description = Spreads accumulated heat in three output directions.
 block.electrolyzer.description = Converts water into hydrogen and ozone gas. Outputs resulting gases in two opposite directions, marked by corresponding colors.
 block.atmospheric-concentrator.description = Concentrates nitrogen from the atmosphere. Requires heat.
@@ -2221,6 +2271,7 @@ block.vent-condenser.description = Condenses vent gases into water. Consumes pow
 block.plasma-bore.description = When placed facing an ore wall, outputs items indefinitely. Requires small amounts of power.\nOptionally uses hydrogen to boost efficiency.
 block.large-plasma-bore.description = A larger plasma bore. Capable of mining tungsten and thorium. Requires hydrogen and power.\nOptionally uses nitrogen to boost efficiency.
 block.cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power. Efficiency varies based on type of wall.
+block.large-cliff-crusher.description = Crushes walls, outputting sand indefinitely. Requires power and ozone. Efficiency varies based on type of wall. Optionally consumes tungsten to increase efficiency.
 block.impact-drill.description = When placed on ore, outputs items in bursts indefinitely. Requires power and water.\nOptionally uses ozone to boost efficiency.
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.\nOptionally uses cyanogen to boost efficiency.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
@@ -2376,13 +2427,14 @@ lst.setrate = Set processor execution speed in instructions/tick.
 lst.fetch = Lookup units, cores, players or buildings by index.\nIndices start at 0 and end at their returned count.
 lst.packcolor = Pack [0, 1] RGBA components into a single number for drawing or rule-setting.
 lst.setrule = Set a game rule.
-lst.flushmessage = Display a message on the screen from the text buffer.\nWill wait until the previous message finishes.
+lst.flushmessage = Display a message on the screen from the text buffer.\nIf the success result variable is [accent]@wait[],\nwill wait until the previous message finishes.\nOtherwise, outputs whether displaying the message succeeded.
 lst.cutscene = Manipulate the player camera.
 lst.setflag = Set a global flag that can be read by all processors.
 lst.getflag = Check if a global flag is set.
 lst.setprop = Sets a property of a unit or building.
 lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
+lst.playsound = Plays a sound.\nVolume and pan can be a global value, or calculated based on position.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
@@ -2562,6 +2614,8 @@ unitlocate.outx = Output X coordinate.
 unitlocate.outy = Output Y coordinate.
 unitlocate.group = Building group to look for.
 
+playsound.limit = If true, prevents this sound from playing\nif it has already been played in the same frame.
+
 lenum.idle = Don't move, but keep building/mining.\nThe default state.
 lenum.stop = Stop moving/mining/building.
 lenum.unbind = Completely disable logic control.\nResume standard AI.