Merge branch 'master' into crater

This commit is contained in:
Patrick 'Quezler' Mounier
2020-04-02 12:05:04 +02:00
72 changed files with 2348 additions and 642 deletions
+4 -2
View File
@@ -142,6 +142,8 @@ research = Research
researched = [lightgray]{0} researched.
players = {0} players
players.single = {0} player
players.search = search
players.notfound = [gray]no players found
server.closing = [accent]Closing server...
server.kicked.kick = You have been kicked from the server!
server.kicked.whitelist = You are not whitelisted here.
@@ -176,7 +178,7 @@ host.invalid = [scarlet]Can't connect to host.
servers.local = Local Servers
servers.remote = Remote Servers
servers.global = Global Servers
servers.global = Community Servers
trace = Trace Player
trace.playername = Player name: [accent]{0}
@@ -1234,7 +1236,7 @@ block.unloader.description = Unloads items from any nearby non-transportation bl
block.launch-pad.description = Launches batches of items without any need for a core launch.
block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
block.duo.description = A small, cheap turret. Useful against ground units.
block.scatter.description = An essential anti-air turret. Sprays clumps of lead or scrap flak at enemy units.
block.scatter.description = An essential anti-air turret. Sprays clumps of lead, scrap or metaglass flak at enemy units.
block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
block.hail.description = A small, long-range artillery turret.
block.wave.description = A medium-sized turret. Shoots streams of liquid at enemies. Automatically extinguishes fires when supplied with water.