Merge branch 'master' into ThePythonGuy3-patch-1

core/assets/bundles/bundle.properties

@@ -705,6 +705,7 @@ stat.commandlimit = Command Limit
 stat.abilities = Abilities
 stat.canboost = Can Boost
 stat.flying = Flying
+stat.ammouse = Ammo Use
 
 ability.forcefield = Force Field
 ability.repairfield = Repair Field
@@ -727,7 +728,6 @@ bar.powerlines = Connections: {0}/{1}
 bar.items = Items: {0}
 bar.capacity = Capacity: {0}
 bar.unitcap = {0} {1}/{2}
-bar.limitreached = [scarlet] {0} / {1}[white] {2}\n[lightgray][[unit disabled]
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
@@ -744,6 +744,7 @@ bullet.sapping = [stat]sapping
 bullet.homing = [stat]homing
 bullet.shock = [stat]shock
 bullet.frag = [stat]frag
+bullet.buildingdamage = [stat]{0}%[lightgray] building damage
 bullet.knockback = [stat]{0}[lightgray] knockback
 bullet.pierce = [stat]{0}[lightgray]x pierce
 bullet.infinitepierce = [stat]pierce
@@ -772,6 +773,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+unit.pershot = /shot
 category.purpose = Purpose
 category.general = General
 category.power = Power
@@ -841,6 +843,7 @@ setting.bridgeopacity.name = Bridge Opacity
 setting.playerchat.name = Display Player Bubble Chat
 setting.showweather.name = Show Weather Graphics
 public.confirm = Do you want to make your game public?\n[accent]Anyone will be able to join your games.\n[lightgray]This can be changed later in Settings->Game->Public Game Visibility.
+public.confirm.really = If you want to play with friends, use [green]Invite Friend[] instead of a [scarlet]Public server[]!\nAre you sure you want to make your game [scarlet]public[]?
 public.beta = Note that beta versions of the game cannot make public lobbies.
 uiscale.reset = UI scale has been changed.\nPress "OK" to confirm this scale.\n[scarlet]Reverting and exiting in[accent] {0}[] seconds...
 uiscale.cancel = Cancel & Exit
@@ -963,6 +966,7 @@ rules.explosions = Block/Unit Explosion Damage
 rules.ambientlight = Ambient Light
 rules.weather = Weather
 rules.weather.frequency = Frequency:
+rules.weather.always = Always
 rules.weather.duration = Duration:
 
 content.item.name = Items
@@ -1168,7 +1172,7 @@ block.item-void.name = Item Void
 block.liquid-source.name = Liquid Source
 block.liquid-void.name = Liquid Void
 block.power-void.name = Power Void
-block.power-source.name = Power Infinite
+block.power-source.name = Power Source
 block.unloader.name = Unloader
 block.vault.name = Vault
 block.wave.name = Wave