Merge branch 'master' into schematic

core/assets/bundles/bundle.properties

@@ -20,6 +20,8 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
 copied = Copied.
+indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+indev.notready = This part of the game isn't ready yet
 
 load.sound = Sounds
 load.map = Maps
@@ -114,6 +116,7 @@ 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.outdated = [scarlet]Not compatible with V6 (no minGameVersion: 105)
 mod.missingdependencies = [scarlet]Missing dependencies: {0}
 mod.erroredcontent = [scarlet]Content Errors
 mod.errors = Errors have occurred loading content.
@@ -508,6 +511,18 @@ error.io = Network I/O error.
 error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
+weather.rain.name = Rain
+weather.snow.name = Snow
+weather.sandstorm.name = Sandstorm
+weather.sporestorm.name = Sporestorm
+
+sectors.unexplored = [lightgray]Unexplored
+sectors.resources = Resources:
+sectors.production = Production:
+sectors.stored = Stored:
+sectors.resume = Resume
+sectors.launch = Launch
+
 #NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
 sector.groundZero.name = Ground Zero
 sector.craters.name = The Craters
@@ -576,6 +591,7 @@ blocks.itemsmoved = Move Speed
 blocks.launchtime = Time Between Launches
 blocks.shootrange = Range
 blocks.size = Size
+blocks.displaysize = Display Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
 blocks.linkrange = Link Range
@@ -601,6 +617,8 @@ blocks.inaccuracy = Inaccuracy
 blocks.shots = Shots
 blocks.reload = Shots/Second
 blocks.ammo = Ammo
+blocks.shieldhealth = Shield Health
+blocks.cooldowntime = Cooldown Time
 
 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
@@ -643,9 +661,12 @@ unit.liquidunits = liquid units
 unit.powerunits = power units
 unit.degrees = degrees
 unit.seconds = seconds
+unit.minutes = mins
 unit.persecond = /sec
+unit.perminute = /min
 unit.timesspeed = x speed
 unit.percent = %
+unit.shieldhealth = shield health
 unit.items = items
 unit.thousands = k
 unit.millions = mil
@@ -773,6 +794,9 @@ keybind.diagonal_placement.name = Diagonal Placement
 keybind.pick.name = Pick Block
 keybind.break_block.name = Break Block
 keybind.deselect.name = Deselect
+keybind.pickupCargo.name = Pickup Cargo
+keybind.dropCargo.name = Drop Cargo
+keybind.command.name = Command
 keybind.shoot.name = Shoot
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -808,6 +832,7 @@ rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
+rules.buildai = AI Building
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
@@ -829,8 +854,12 @@ rules.title.unit = Units
 rules.title.experimental = Experimental
 rules.title.environment = Environment
 rules.lighting = Lighting
+rules.fire = Fire
+rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
-rules.solarpowermultiplier = Solar Power Multiplier
+rules.weather = Weather
+rules.weather.frequency = Frequency:
+rules.weather.duration = Duration:
 
 content.item.name = Items
 content.liquid.name = Liquids
@@ -856,9 +885,11 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
+
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
+
 unit.health = [lightgray]Health: {0}
 unit.speed = [lightgray]Speed: {0}
 unit.weapon = [lightgray]Weapon: {0}
@@ -882,6 +913,7 @@ unit.crawler.name = Crawler
 unit.atrax.name = Atrax
 unit.spiroct.name = Spiroct
 unit.arkyid.name = Arkyid
+unit.toxopid.name = Toxopid
 unit.flare.name = Flare
 unit.horizon.name = Horizon
 unit.zenith.name = Zenith
@@ -890,34 +922,43 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
+unit.quad.name = Quad
+unit.oct.name = Oct
 unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
+unit.sei.name = Sei
+unit.omura.name = Omura
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
+unit.scepter.name = Scepter
+unit.reign.name = Reign
+unit.vela.name = Vela
+unit.corvus.name = Corvus
 
+block.resupply-point.name = Resupply Point
 block.parallax.name = Parallax
 block.cliff.name = Cliff
 block.sand-boulder.name = Sand Boulder
 block.grass.name = Grass
 block.slag.name = Slag
 block.salt.name = Salt
-block.saltrocks.name = Salt Rocks
+block.salt-wall.name = Salt Wall
 block.pebbles.name = Pebbles
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sand-wall.name = Sand Wall
 block.spore-pine.name = Spore Pine
-block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
-block.snowrock.name = Snow Rock
+block.spore-wall.name = Spore Wall
+block.boulder.name = Boulder
+block.snow-boulder.name = Snow Boulder
 block.snow-pine.name = Snow Pine
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
 block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
-block.shalerocks.name = Shale Rocks
+block.shale-wall.name = Shale Wall
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -945,13 +986,17 @@ block.craters.name = Craters
 block.sand-water.name = Sand water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
-block.holostone.name = Holo stone
+block.dacite.name = Dacite
+block.dacite-wall.name = Dacite Wall
 block.ice-snow.name = Ice Snow
-block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
-block.snowrocks.name = Snow Rocks
-block.dunerocks.name = Dune Rocks
+block.stone-wall.name = Stone Wall
+block.ice-wall.name = Ice Wall
+block.snow-wall.name = Snow Wall
+block.dune-wall.name = Dune Wall
 block.pine.name = Pine
+block.dirt.name = Dirt
+block.dirt-wall.name = Dirt Wall
+block.mud.name = Mud
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
@@ -967,10 +1012,9 @@ block.dark-panel-4.name = Dark Panel 4
 block.dark-panel-5.name = Dark Panel 5
 block.dark-panel-6.name = Dark Panel 6
 block.dark-metal.name = Dark Metal
-block.ignarock.name = Igna Rock
+block.basalt.name = Basalt
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
 block.titanium-wall.name = Titanium Wall
@@ -1019,7 +1063,7 @@ block.diode.name = Battery Diode
 block.battery.name = Battery
 block.battery-large.name = Large Battery
 block.combustion-generator.name = Combustion Generator
-block.turbine-generator.name = Steam Generator
+block.steam-generator.name = Steam Generator
 block.differential-generator.name = Differential Generator
 block.impact-reactor.name = Impact Reactor
 block.mechanical-drill.name = Mechanical Drill
@@ -1100,6 +1144,7 @@ block.micro-processor.name = Micro Processor
 block.logic-processor.name = Logic Processor
 block.hyper-processor.name = Hyper Processor
 block.logic-display.name = Logic Display
+block.large-logic-display.name = Large Logic Display
 block.memory-cell.name = Memory Cell
 
 team.blue.name = blue
@@ -1227,7 +1272,7 @@ block.battery.description = Stores power as a buffer in times of surplus energy.
 block.battery-large.description = Stores much more power than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.turbine-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
 block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.