Merge branch 'master' into schematic

core/assets/bundles/bundle.properties

@@ -138,6 +138,8 @@ mod.scripts.disable = Your device does not support mods with scripts. You must d
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.
+planetmap = Planet Map
+launchcore = Launch Core
 filename = File Name:
 unlocked = New content unlocked!
 completed = [accent]Completed
@@ -172,7 +174,7 @@ host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \n
 join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] or [accent]global[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]If you want to connect to someone by IP, you would need to ask the host for their IP, which can be found by googling "my ip" from their device.
 hostserver = Host Multiplayer Game
 invitefriends = Invite Friends
-hostserver.mobile = Host\nGame
+hostserver.mobile = Host Game
 host = Host
 hosting = [accent]Opening server...
 hosts.refresh = Refresh
@@ -577,6 +579,8 @@ blocks.shootrange = Range
 blocks.size = Size
 blocks.liquidcapacity = Liquid Capacity
 blocks.powerrange = Power Range
+blocks.linkrange = Link Range
+blocks.instructions = Instructions
 blocks.powerconnections = Max Connections
 blocks.poweruse = Power Use
 blocks.powerdamage = Power/Damage
@@ -729,6 +733,7 @@ category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
+command.idle = Idle
 placement.blockselectkeys = \n[lightgray]Key: [{0},
 keybind.respawn.name = Respawn
 keybind.control.name = Control Unit
@@ -741,6 +746,7 @@ 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
+keybind.pan.name = Pan View
 keybind.boost.name = Boost
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
@@ -1076,6 +1082,7 @@ block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
 block.segment.name = Segment
+block.command-center.name = Command Center
 block.ground-factory.name = Ground Factory
 block.air-factory.name = Air Factory
 block.naval-factory.name = Naval Factory
@@ -1083,7 +1090,7 @@ block.additive-reconstructor.name = Additive Reconstructor
 block.multiplicative-reconstructor.name = Multiplicative Reconstructor
 block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
-block.mass-conveyor.name = Mass Conveyor
+block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
@@ -1092,6 +1099,7 @@ block.overdrive-dome.name = Overdrive Dome
 block.switch.name = Switch
 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.memory-cell.name = Memory Cell