Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
This commit is contained in:
Anuken
2020-04-11 10:37:52 -04:00
parent 3bb2b646db 9c1730685c
commit b1f32d241b
55 changed files with 2898 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+5 -3
View File
@@ -145,6 +145,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.
@@ -179,7 +181,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}
@@ -1137,7 +1139,7 @@ mech.trident-ship.description = A heavy bomber, built for construction and destr
mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Highly maneuverable.
unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction.
unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction. Rebuilds destroyed blocks.
unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
@@ -1242,7 +1244,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.