Merge branch 'Twintake' into ValenceV2

diff --cc src/main/java/frc/robot/RobotContainer.java
Simple merge

diff --cc src/main/java/frc/robot/subsystems/Intake/Intake.java
Simple merge

diff --cc src/main/java/frc/robot/subsystems/turret/Turret.java
Simple merge

diff --cc src/main/java/frc/robot/util/HubActive.java
index d0c5b3ee264965fd2a3b03adc06d34815da77354,1d6296a58ced8767cef31e8272d6dd61d42de2b5..e6d7ade23f1fe9a51d14b47af01d28d2dd71d7b6
--- 1/src/main/java/frc/robot/util/HubActive.java
--- 2/src/main/java/frc/robot/util/HubActive.java
+++ b/src/main/java/frc/robot/util/HubActive.java
@@@ -1,17 -1,13 +1,13 @@@
  package frc.robot.util;
  
 +
  import java.util.Optional;
  
- 
  import edu.wpi.first.wpilibj.DriverStation;
  import edu.wpi.first.wpilibj.DriverStation.Alliance;
  import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
  
- 
  public class HubActive {
- 
--
    static public boolean isHubActive() {
      Optional<Alliance> alliance = DriverStation.getAlliance();
      // If we have no alliance, we cannot be enabled, therefore no hub.
@@@ -164,10 -149,8 +160,8 @@@
      }
    }
  
- 
 -  static public Optional<Double> timeToUnactive() {
 +  static public Optional<Double> timeToInactive() {
  
- 
      Alliance alliance = DriverStation.getAlliance().orElse(Alliance.Blue);
      if (alliance == Alliance.Blue) {
        alliance = Alliance.Red;
@@@ -204,9 -185,7 +196,6 @@@
        }
      }
  
- 
- 
--
      // Shift was is active for blue if red won auto, or red if blue won auto.
      boolean shift1Active = switch (alliance) {
        case Red -> !redInactiveFirst;