Partial 7.0 merge - API preview

core/assets/bundles/bundle.properties

@@ -67,6 +67,14 @@ 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.
+schematic.tags = Tags:
+schematic.edittags = Edit Tags
+schematic.addtag = Add Tag
+schematic.texttag = Text Tag
+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}
@@ -306,7 +314,6 @@ 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.
 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...
 reloading = [accent]Reloading Mods...
 saving = [accent]Saving...
@@ -498,6 +505,7 @@ load = Load
 save = Save
 fps = FPS: {0}
 ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Restart your game for the language settings to take effect.
@@ -530,7 +538,7 @@ launch.from = Launching From: [accent]{0}
 launch.destination = Destination: {0}
 configure.invalid = Amount must be a number between 0 and {0}.
 add = Add...
-boss.health = Guardian Health
+guardian = Guardian
 
 connectfail = [scarlet]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -574,6 +582,7 @@ sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 #note: the missing space in the line below is intentional
 sector.captured = Sector [accent]{0}[white]captured!
+sector.changeicon = Change Icon
 
 threat.low = Low
 threat.medium = Medium
@@ -626,6 +635,7 @@ status.wet.name = Wet
 status.muddy.name = Muddy
 status.melting.name = Melting
 status.sapped.name = Sapped
+status.electrified.name = Electrified
 status.spore-slowed.name = Spore Slowed
 status.tarred.name = Tarred
 status.overclock.name = Overclock
@@ -654,6 +664,7 @@ settings.clearcampaignsaves.confirm = Are you sure you want to clear all of your
 paused = [accent]< Paused >
 clear = Clear
 banned = [scarlet]Banned
+unsupported.environment = [scarlet]Unsupported Environment
 yes = Yes
 no = No
 info.title = Info
@@ -692,6 +703,7 @@ stat.memorycapacity = Memory Capacity
 stat.basepowergeneration = Base Power Generation
 stat.productiontime = Production Time
 stat.repairtime = Block Full Repair Time
+stat.repairspeed = Repair Speed
 stat.weapons = Weapons
 stat.bullet = Bullet
 stat.speedincrease = Speed Increase
@@ -741,10 +753,11 @@ stat.healing = Healing
 
 ability.forcefield = Force Field
 ability.repairfield = Repair Field
-ability.statusfield = Status Field
+ability.statusfield = {0} Status Field
 ability.unitspawn = {0} Factory
 ability.shieldregenfield = Shield Regen Field
 ability.movelightning = Movement Lightning
+ability.energyfield = Energy Field: [accent]{0}[] damage ~ [accent]{1}[] blocks / [accent]{2}[] targets
 
 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
@@ -767,6 +780,7 @@ bar.power = Power
 bar.progress = Build Progress
 bar.input = Input
 bar.output = Output
+bar.strength = [stat]{0}[lightgray]x strength
 
 units.processorcontrol = [lightgray]Processor Controlled
 
@@ -975,6 +989,7 @@ rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.buildai = AI Building
+rules.corecapture = Capture Core On Destruction
 rules.enemyCheat = Infinite AI (Red Team) Resources
 rules.blockhealthmultiplier = Block Health Multiplier
 rules.blockdamagemultiplier = Block Damage Multiplier
@@ -1030,6 +1045,7 @@ item.blast-compound.name = Blast Compound
 item.pyratite.name = Pyratite
 item.metaglass.name = Metaglass
 item.scrap.name = Scrap
+
 liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
@@ -1121,6 +1137,7 @@ block.sand-water.name = Sand Water
 block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.dacite.name = Dacite
+block.rhyolite.name = Rhyolite
 block.dacite-wall.name = Dacite Wall
 block.dacite-boulder.name = Dacite Boulder
 block.ice-snow.name = Ice Snow
@@ -1228,6 +1245,7 @@ block.solar-panel.name = Solar Panel
 block.solar-panel-large.name = Large Solar Panel
 block.oil-extractor.name = Oil Extractor
 block.repair-point.name = Repair Point
+block.repair-turret.name = Repair Turret
 block.pulse-conduit.name = Pulse Conduit
 block.plated-conduit.name = Plated Conduit
 block.phase-conduit.name = Phase Conduit
@@ -1289,9 +1307,8 @@ block.memory-cell.name = Memory Cell
 block.memory-bank.name = Memory Bank
 
 team.blue.name = blue
-team.crux.name = red
-team.sharded.name = orange
-team.orange.name = orange
+team.crux.name = crux
+team.sharded.name = sharded
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
@@ -1312,6 +1329,7 @@ hint.placeConveyor.mobile = Conveyors move items from drills into other blocks.
 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 \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.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.
@@ -1345,7 +1363,7 @@ item.graphite.description = Used in electrical components and turret ammunition.
 item.sand.description = Used for production of other refined materials.
 item.coal.description = Used for fuel and refined material production.
 item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
-item.titanium.description = Used in liquid transportation structures, drills and aircraft.
+item.titanium.description = Used in liquid transportation structures, drills and factories.
 item.thorium.description = Used in durable structures and as nuclear fuel.
 item.scrap.description = Used in Melters and Pulverizers for refining into other materials.
 item.scrap.details = Leftover remnants of old structures and units.
@@ -1566,7 +1584,7 @@ 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.configure = Building configuration, e.g. sorter item.
+lenum.config = Building configuration, e.g. sorter item.
 lenum.enabled = Whether the block is enabled.
 
 laccess.color = Illuminator color.
@@ -1574,6 +1592,7 @@ laccess.controller = Unit controller. If processor controlled, returns processor
 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.