PvP merge

core/assets/bundles/bundle.properties

@@ -11,7 +11,8 @@ text.link.wiki.description=official Mindustry wiki
 text.linkfail=Failed to open link!\nThe URL has been copied to your cliboard.
 text.editor.web=The web version does not support the editor!\nDownload the game to use it.
 text.web.unsupported=The web version does not support this feature! Download the game to use it.
-text.gameover=Your core has been destroyed
+text.gameover=Game Over
+text.gameover.pvp=The[accent] {0}[] team is victorious!
 text.sector.gameover=This sector has been lost. Re-deploy?
 text.sector.retry=Retry
 text.highscore=[accent]New highscore!
@@ -209,6 +210,7 @@ text.saving=[accent]Saving...
 text.wave=[orange]Wave {0}
 text.wave.waiting=[LIGHT_GRAY]Wave in {0}
 text.waiting=[LIGHT_GRAY]Waiting...
+text.waiting.players=Waiting for players...
 text.wave.enemies=[LIGHT_GRAY]{0} Enemies Remaining
 text.wave.enemy=[LIGHT_GRAY]{0} Enemy Remaining
 text.loadimage=Load Image
@@ -218,7 +220,8 @@ text.custom=Custom
 text.builtin=Built-In
 text.map.delete.confirm=Are you sure you want to delete this map? This action cannot be undone!
 text.map.random=[accent]Random Map
-text.map.nospawn=This map does not have any cores for the player to spawn in! Add a [ROYAL]blue[] core to this map in the editor.
+text.map.nospawn=This map does not have any cores for the player to spawn in! Add a[ROYAL] blue[] core to this map in the editor.
+text.map.nospawn.pvp=This map does not have any enemy cores for player to spawn into! Add[SCARLET] red[] cores to this map in the editor.
 text.map.invalid=Error loading map: corrupted or invalid map file.
 text.editor.brush=Brush
 text.editor.slope=\\
@@ -425,6 +428,8 @@ mode.sandbox.description=infinite resources and no timer for waves.
 mode.custom.warning=Note that blocks unlocked in custom games are not carried over to sectors.\n\n[LIGHT_GRAY]In sandbox, only blocks unlocked with sector play can be used.
 mode.freebuild.name=freebuild
 mode.freebuild.description=limited resources and no timer for waves.
+mode.pvp.name=PvP
+mode.pvp.description=fight against other players locally.
 
 content.item.name=Items
 content.liquid.name=Liquids
@@ -651,6 +656,13 @@ block.rtg-generator.name=RTG Generator
 block.spectre.name=Spectre
 block.meltdown.name=Meltdown
 
+team.blue.name=blue
+team.red.name=red
+team.orange.name=orange
+team.none.name=gray
+team.green.name=green
+team.purple.name=purple
+
 unit.alpha-drone.name=Alpha Drone
 unit.spirit.name=Spirit Drone
 unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.