Merge branch 'master' into port-field

core/assets/bundles/bundle.properties

@@ -20,7 +20,8 @@ gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
 copied = Copied.
-indevpopup = [accent]v6[] is currently in [accent]pre-alpha[].\n[lightgray]This means:[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work\n- Many units are unfinished\n- The campaign is completely unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[].
+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
@@ -54,6 +55,7 @@ schematic.saved = Schematic saved.
 schematic.delete.confirm = This schematic will be utterly eradicated.
 schematic.rename = Rename Schematic
 schematic.info = {0}x{1}, {2} blocks
+schematic.disabled = [scarlet]Schematics disabled[]\nYou are not allowed to use schematics on this [accent]map[] or [accent]server.
 
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@@ -488,6 +490,7 @@ loadout = Loadout
 resources = Resources
 bannedblocks = Banned Blocks
 addall = Add All
+launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
@@ -509,12 +512,19 @@ 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
+sectors.select = Select
+sectors.nonelaunch = [lightgray]none (sun)
 
 #NOTE TO TRANSLATORS: don't bother editing these, they'll be removed and/or rewritten anyway
 sector.groundZero.name = Ground Zero
@@ -584,6 +594,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
@@ -592,6 +603,7 @@ blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
 blocks.itemcapacity = Item Capacity
+blocks.memorycapacity = Memory Capacity
 blocks.basepowergeneration = Base Power Generation
 blocks.productiontime = Production Time
 blocks.repairtime = Block Full Repair Time
@@ -609,6 +621,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
@@ -651,10 +665,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
@@ -782,6 +798,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
@@ -813,9 +832,11 @@ mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources
 rules.reactorexplosions = Reactor Explosions
+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
@@ -840,7 +861,9 @@ 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
@@ -866,9 +889,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}
@@ -901,15 +926,22 @@ 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
@@ -968,6 +1000,7 @@ 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
@@ -986,7 +1019,6 @@ block.dark-metal.name = Dark Metal
 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
@@ -1116,7 +1148,9 @@ 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
+block.memory-bank.name = Memory Bank
 
 team.blue.name = blue
 team.crux.name = red