Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/src/mindustry/content/UnitTypes.java

core/assets/bundles/bundle.properties

@@ -93,6 +93,7 @@ level.mode = Gamemode:
 coreattack = < Core is under attack! >
 nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
 database = Core Database
+database.button = Database
 savegame = Save Game
 loadgame = Load Game
 joingame = Join Game
@@ -168,6 +169,7 @@ launchcore = Launch Core
 filename = File Name:
 unlocked = New content unlocked!
 available = New research available!
+unlock.incampaign = < Unlock in campaign for details >
 completed = [accent]Completed
 techtree = Tech Tree
 research.legacy = [accent]5.0[] research data found.\nDo you want to [accent]load this data[], or [accent]discard it[] and restart research in the new campaign (recommended)?
@@ -777,7 +779,7 @@ bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
-bar.boost = Boost: {0}%
+bar.boost = Boost: +{0}%
 bar.powerbalance = Power: {0}/s
 bar.powerstored = Stored: {0}/{1}
 bar.poweramount = Power: {0}