Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java

core/assets/bundles/bundle.properties

@@ -630,6 +630,7 @@ bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}
 bar.poweroutput = Power Output: {0}
+bar.powerlines = Connections: {0}/{1}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}