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

core/assets/bundles/bundle.properties

@@ -395,6 +395,11 @@ waves.load = Load from Clipboard
 waves.invalid = Invalid waves in clipboard.
 waves.copied = Waves copied.
 waves.none = No enemies defined.\nNote that empty wave layouts will automatically be replaced with the default layout.
+waves.sort = Sort By
+waves.sort.reverse = Reverse Sort
+waves.sort.begin = Begin
+waves.sort.health = Health
+waves.sort.type = Type
 
 #these are intentionally in lower case
 wavemode.counts = counts
@@ -650,6 +655,7 @@ status.sapped.name = Sapped
 status.electrified.name = Electrified
 status.spore-slowed.name = Spore Slowed
 status.tarred.name = Tarred
+status.overdrive.name = Overdrive
 status.overclock.name = Overclock
 status.shocked.name = Shocked
 status.blasted.name = Blasted

core/assets/contributors

@@ -127,3 +127,4 @@ WilloIzCitron
 SAMBUYYA
 genNAowl
 TranquillyUnpleasant
+Darkness6030