Merge branch 'master' into static_puffer

Author: maddie480

Ahorn/lang/en_gb.lang

@@ -309,5 +309,9 @@ placements.triggers.SpringCollab2020/SpeedBasedMusicParamTrigger.tooltips.minSpe
 placements.triggers.SpringCollab2020/SpeedBasedMusicParamTrigger.tooltips.maxSpeed=The maximum value the music parameter can take.
 placements.triggers.SpringCollab2020/SpeedBasedMusicParamTrigger.tooltips.activate=If ticked, the trigger will start adjusting the music parameter to match the player's speed.\nIf unticked, the trigger will stop adjusting that music parameter, and set it to minSpeed.
 
+# Foreground Reflection Tentacles
+placements.entities.SpringCollab2020/ForegroundReflectionTentacles.tooltips.slide_until=Changes how far tentacles fall back when Madeline comes into fear distance.
+placements.entities.SpringCollab2020/ForegroundReflectionTentacles.tooltips.fear_distance=Determines the distance Madeline has to be at for the tentacles to fall back.
+
 # Static Puffer
 placements.entities.SpringCollab2020/StaticPuffer.tooltips.right=The initial direction of the puffer.