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

Merge remote-tracking branch 'upstream/master' into unit-stats

Browse Source
This commit is contained in:
Leonwang4234
2020-11-09 21:52:42 -08:00
parent e9c00d8a9f ebdced5c6c
commit 3a27e6e94e
244 changed files with 467 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/assets/bundles/bundle.properties
View File

@@ -189,6 +189,10 @@ servers.local = Local Servers
servers.remote = Remote Servers
servers.global = Community Servers
servers.showhidden = Show Hidden Servers
server.shown = Shown
server.hidden = Hidden
trace = Trace Player
trace.playername = Player name: [accent]{0}
trace.ip = IP: [accent]{0}
@@ -503,7 +507,7 @@ zone.objective = [lightgray]Objective: [accent]{0}
zone.objective.survival = Survive
zone.objective.attack = Destroy Enemy Core
add = Add...
boss.health = Boss Health
boss.health = Guardian Health
connectfail = [scarlet]Connection error:\n\n[accent]{0}
error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -667,6 +671,7 @@ ability.repairfield = Repair Field
ability.statusfield = Status Field
ability.unitspawn = {0} Factory
ability.shieldregenfield = Shield Regen Field
ability.movelightning = Movement Lightning
bar.drilltierreq = Better Drill Required
bar.noresources = Missing Resources
@@ -1306,8 +1311,8 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se
block.router.description = Distributes input items to 3 output directions equally.
block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
block.distributor.description = Distributes input items to 7 output directions equally.
block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates.
block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates.
block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
block.rotary-pump.description = Pumps and outputs liquids. Requires power.