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

 Conflicts:

	core/src/mindustry/content/Blocks.java

core/assets/bundles/bundle.properties

@@ -484,6 +484,7 @@ filter.option.circle-scale = Circle Scale
 filter.option.octaves = Octaves
 filter.option.falloff = Falloff
 filter.option.angle = Angle
+filter.option.rotate = Rotate
 filter.option.amount = Amount
 filter.option.block = Block
 filter.option.floor = Floor
@@ -1080,6 +1081,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1291,6 +1297,12 @@ block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
 block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.payload-propulsion-tower.name = Payload Propulsion Tower
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
@@ -1627,9 +1639,15 @@ lenum.min = Minimum of two numbers.
 lenum.max = Maximum of two numbers.
 lenum.angle = Angle of vector in degrees.
 lenum.len = Length of vector.
+
 lenum.sin = Sine, in degrees.
 lenum.cos = Cosine, in degrees.
 lenum.tan = Tangent, in degrees.
+
+lenum.asin = Arc sine, in degrees.
+lenum.acos = Arc cosine, in degrees.
+lenum.atan = Arc tangent, in degrees.
+
 #not a typo, look up 'range notation'
 lenum.rand = Random decimal in range [0, value).
 lenum.log = Natural logarithm (ln).