Merge branch '6.0' into crater
# Conflicts: # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java
This commit is contained in:
Patrick 'Quezler' Mounier
@@ -105,11 +105,13 @@ mods = Mods
|
||||
mods.none = [LIGHT_GRAY]No mods found!
|
||||
mods.guide = Modding Guide
|
||||
mods.report = Report Bug
|
||||
mods.openfolder = Open Mod Folder
|
||||
mods.openfolder = Open Folder
|
||||
mods.reload = Reload
|
||||
mod.display = [gray]Mod:[orange] {0}
|
||||
mod.enabled = [lightgray]Enabled
|
||||
mod.disabled = [scarlet]Disabled
|
||||
mod.disable = Disable
|
||||
mod.content = Content:
|
||||
mod.delete.error = Unable to delete mod. File may be in use.
|
||||
mod.requiresversion = [scarlet]Requires min game version: [accent]{0}
|
||||
mod.missingdependencies = [scarlet]Missing dependencies: {0}
|
||||
@@ -121,14 +123,15 @@ mod.enable = Enable
|
||||
mod.requiresrestart = The game will now close to apply the mod changes.
|
||||
mod.reloadrequired = [scarlet]Reload Required
|
||||
mod.import = Import Mod
|
||||
mod.import.github = Import GitHub Mod
|
||||
mod.import.file = Import File
|
||||
mod.import.github = Import From GitHub
|
||||
mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
|
||||
mod.remove.confirm = This mod will be deleted.
|
||||
mod.author = [LIGHT_GRAY]Author:[] {0}
|
||||
mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
|
||||
mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again.
|
||||
mod.folder.missing = Only mods in folder form can be published on the workshop.\nTo convert any mod into a folder, simply unzip its file into a folder and delete the old zip, then restart your game or reload your mods.
|
||||
mod.scripts.unsupported = Your device does not support mod scripts. Some mods will not function correctly.
|
||||
mod.scripts.disable = Your device does not support mods with scripts. You must disable these mods to play the game.
|
||||
|
||||
about.button = About
|
||||
name = Name:
|
||||
@@ -265,8 +268,6 @@ data.openfolder = Open Data Folder
|
||||
data.exported = Data exported.
|
||||
data.invalid = This isn't valid game data.
|
||||
data.import.confirm = Importing external data will overwrite[scarlet] all[] your current game data.\n[accent]This cannot be undone![]\n\nOnce the data is imported, your game will exit immediately.
|
||||
classic.export = Export Classic Data
|
||||
classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic (v3.5 build 40) save or map data has been detected. Would you like to export these saves to your phone's home folder, for use in the Mindustry Classic app?
|
||||
quit.confirm = Are you sure you want to quit?
|
||||
quit.confirm.tutorial = Are you sure you know what you're doing?\nThe tutorial can be re-taken in[accent] Settings->Game->Re-Take Tutorial.[]
|
||||
loading = [accent]Loading...
|
||||
@@ -367,13 +368,13 @@ editor.importmap = Import Map
|
||||
editor.importmap.description = Import an already existing map
|
||||
editor.importfile = Import File
|
||||
editor.importfile.description = Import an external map file
|
||||
editor.importimage = Import Legacy Map
|
||||
editor.importimage = Import Image File
|
||||
editor.importimage.description = Import an external map image file
|
||||
editor.export = Export...
|
||||
editor.exportfile = Export File
|
||||
editor.exportfile.description = Export a map file
|
||||
editor.exportimage = Export Terrain Image
|
||||
editor.exportimage.description = Export a map image file
|
||||
editor.exportimage.description = Export an image file containing only basic terrain
|
||||
editor.loadimage = Import Terrain
|
||||
editor.saveimage = Export Terrain
|
||||
editor.unsaved = [scarlet]You have unsaved changes![]\nAre you sure you want to exit?
|
||||
@@ -402,6 +403,8 @@ 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
|
||||
filter.corespawn = Core Select
|
||||
filter.median = Median
|
||||
filter.oremedian = Ore Median
|
||||
filter.blend = Blend
|
||||
@@ -421,6 +424,7 @@ filter.option.circle-scale = Circle Scale
|
||||
filter.option.octaves = Octaves
|
||||
filter.option.falloff = Falloff
|
||||
filter.option.angle = Angle
|
||||
filter.option.amount = Amount
|
||||
filter.option.block = Block
|
||||
filter.option.floor = Floor
|
||||
filter.option.flooronto = Target Floor
|
||||
@@ -539,6 +543,7 @@ no = No
|
||||
info.title = Info
|
||||
error.title = [crimson]An error has occured
|
||||
error.crashtitle = An error has occured
|
||||
unit.nobuild = [scarlet]Unit can't build
|
||||
blocks.input = Input
|
||||
blocks.output = Output
|
||||
blocks.booster = Booster
|
||||
@@ -633,6 +638,7 @@ setting.shadows.name = Shadows
|
||||
setting.blockreplace.name = Automatic Block Suggestions
|
||||
setting.linear.name = Linear Filtering
|
||||
setting.hints.name = Hints
|
||||
setting.flow.name = Display Resource Flow Rate[scarlet] (experimental)
|
||||
setting.buildautopause.name = Auto-Pause Building
|
||||
setting.animatedwater.name = Animated Water
|
||||
setting.animatedshields.name = Animated Shields
|
||||
@@ -655,6 +661,7 @@ setting.difficulty.name = Difficulty:
|
||||
setting.screenshake.name = Screen Shake
|
||||
setting.effects.name = Display Effects
|
||||
setting.destroyedblocks.name = Display Destroyed Blocks
|
||||
setting.blockstatus.name = Display Block Status
|
||||
setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
|
||||
setting.coreselect.name = Allow Schematic Cores
|
||||
setting.sensitivity.name = Controller Sensitivity
|
||||
@@ -702,6 +709,7 @@ keybind.press = Press a key...
|
||||
keybind.press.axis = Press an axis or key...
|
||||
keybind.screenshot.name = Map Screenshot
|
||||
keybind.toggle_power_lines.name = Toggle Power Lasers
|
||||
keybind.toggle_block_status.name = Toggle Block Statuses
|
||||
keybind.move_x.name = Move X
|
||||
keybind.move_y.name = Move Y
|
||||
keybind.mouse_move.name = Follow Mouse
|
||||
@@ -860,6 +868,7 @@ liquid.temperature = [lightgray]Temperature: {0}
|
||||
|
||||
block.sand-boulder.name = Sand Boulder
|
||||
block.grass.name = Grass
|
||||
block.slag.name = Slag
|
||||
block.salt.name = Salt
|
||||
block.saltrocks.name = Salt Rocks
|
||||
block.pebbles.name = Pebbles
|
||||
@@ -985,7 +994,8 @@ block.pneumatic-drill.name = Pneumatic Drill
|
||||
block.laser-drill.name = Laser Drill
|
||||
block.water-extractor.name = Water Extractor
|
||||
block.cultivator.name = Cultivator
|
||||
block.dart-mech-pad.name = Alpha Mech Pad
|
||||
block.dart-ship-pad.name = Dart Ship Pad
|
||||
block.alpha-mech-pad.name = Alpha Mech Pad
|
||||
block.delta-mech-pad.name = Delta Mech Pad
|
||||
block.javelin-ship-pad.name = Javelin Ship Pad
|
||||
block.trident-ship-pad.name = Trident Ship Pad
|
||||
@@ -1183,7 +1193,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
|
||||
block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
|
||||
block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
|
||||
block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
|
||||
block.plastanium-conveyor.description = The \uf822 moves items in batches.\nOnly accepts items at the back.\nLoads & unloads on all 3 sides.
|
||||
block.plastanium-conveyor.description = The \uf81c moves items in batches.\nOnly accepts items at the back.\nLoads & unloads on all 3 sides.
|
||||
block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
|
||||
block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
|
||||
block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
|
||||
@@ -1261,7 +1271,6 @@ block.crawler-factory.description = Produces fast self-destructing swarm units.
|
||||
block.titan-factory.description = Produces advanced, armored ground units.
|
||||
block.fortress-factory.description = Produces heavy artillery ground units.
|
||||
block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
|
||||
block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it.
|
||||
block.delta-mech-pad.description = Provides transformation into a lightly armored hit-and-run attack mech.\nUse by tapping while standing on it.
|
||||
block.tau-mech-pad.description = Provides transformation into an advanced support mech.\nUse by tapping while standing on it.
|
||||
block.omega-mech-pad.description = Provides transformation into a heavily-armored missile mech.\nUse by tapping while standing on it.
|
||||
|
||||
Reference in New Issue
Block a user