Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry

# Conflicts:
#	core/assets/bundles/bundle.properties

core/assets/bundles/bundle.properties

@@ -21,7 +21,7 @@ text.level.delete.title=Confirm Delete
 text.map.delete=Are you sure you want to delete the map "[orange]{0}[]"?
 text.level.select=Level Select
 text.level.mode=Gamemode:
-text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
+text.construction.desktop=To deselect a block or stop building, [accent]use space[].
 text.construction.title=Block Construction Guide
 text.construction=\
 You've just selected [accent]block construction mode[].\n\n\
@@ -58,11 +58,20 @@ text.sector.resume=Resume
 text.sector.locked=[scarlet][[Incomplete]
 text.sector.unexplored=[accent][[Unexplored]
 text.mission=Mission:[LIGHT_GRAY] {0}
+text.mission.info=Mission Info
 text.mission.complete=Mission complete!
 text.mission.complete.body=Sector {0},{1} has been conquered.
-text.mission.wave=Survive [accent]{0}[] waves.
-text.mission.battle=Destroy the enemy base.
-text.mission.resource=Obtain {0} x{1}
+text.mission.wave=Survive[accent] {0}/{1} []waves\nWave in {2}
+text.mission.wave.enemies=Survive[accent] {0}/{1} []waves\n{2} Enemies
+text.mission.wave.enemy=Survive[accent] {0}/{1} []waves\n{2} Enemy
+text.mission.wave.menu=Survive[accent] {0} []waves
+text.mission.battle=Destroy the enemy core
+text.mission.resource.menu=Obtain {0} x{1}
+text.mission.resource=Obtain {0}:\n[accent]{1}/{2}[]
+text.mission.block=Create {0}
+text.mission.unit=Create {0} Unit
+text.mission.linknode=Link Power Node
+text.mission.display=[accent]Mission:\n[LIGHT_GRAY]{0}
 text.none=<none>
 text.close=Close
 text.quit=Quit
@@ -276,7 +285,7 @@ text.settings.clearall=Clear All
 text.paused=Paused
 text.yes=Yes
 text.no=No
-text.info.title=[accent]Info
+text.info.title=Info
 text.error.title=[crimson]An error has occured
 text.error.crashtitle=An error has occured
 text.blocks.blockinfo=Block Info
@@ -596,9 +605,9 @@ block.spirit-factory.name=Spirit Drone Factory
 block.phantom-factory.name=Phantom Drone Factory
 block.wraith-factory.name=Wraith Fighter Factory
 block.ghoul-factory.name=Ghoul Bomber Factory
-block.dagger-factory.name=Dagger Factory
-block.titan-factory.name=Titan Factory
-block.revenant-factory.name=Revenant Factory
+block.dagger-factory.name=Dagger Mech Factory
+block.titan-factory.name=Titan Mech Factory
+block.revenant-factory.name=Revenant Fighter Factory
 block.repair-point.name=Repair Point
 block.resupply-point.name=Resupply Point
 block.pulse-conduit.name=Pulse Conduit
@@ -611,7 +620,7 @@ block.rotary-pump.name=Rotary Pump
 block.thorium-reactor.name=Thorium Reactor
 block.command-center.name=Command Center
 block.mass-driver.name=Mass Driver
-block.blast-drill.name=Blast Drill
+block.blast-drill.name=Airblast Drill
 block.thermal-pump.name=Thermal Pump
 block.thermal-generator.name=Thermal Generator
 block.alloy-smelter.name=Alloy Smelter
@@ -645,3 +654,25 @@ unit.fortress.name=Fortress
 unit.fortress.description=A heavy artillery ground unit.
 unit.revenant.name=Revenant
 unit.revenant.description=A heavy laser platform.
+
+tutorial.begin=Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
+tutorial.drill=Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
+tutorial.conveyor=[accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
+tutorial.morecopper=More copper is required.\n\nEither mine it manually, or place more drills.
+tutorial.turret=Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
+tutorial.drillturret=Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
+tutorial.waves=The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
+tutorial.lead=More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
+tutorial.smelter=Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
+tutorial.densealloy=The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
+tutorial.siliconsmelter=The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
+tutorial.silicondrill=Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
+tutorial.generator=This technology requires power.\nCreate a[accent] combustion generator[] for it.
+tutorial.generatordrill=Combustion generators need fuel.\nFuel it with coal from a drill.
+tutorial.node=Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
+tutorial.nodelink=Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
+tutorial.silicon=Silicon is being produced. Get some.\n\nImproving the production system is advised.
+tutorial.daggerfactory=Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
+tutorial.router=Factories need resources to function.\nCreate a router to split conveyor resources.
+tutorial.dagger=Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
+tutorial.battle=The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.