Merge branch 'main' into drivetrain

author Timofei <108955303+iefomit@users.noreply.github.com>

Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)

committer GitHub <noreply@github.com>

Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)
author Timofei <108955303+iefomit@users.noreply.github.com>
Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)
committer GitHub <noreply@github.com>
Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)
diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
Simple merge
author	Timofei <108955303+iefomit@users.noreply.github.com>
	Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)
committer	GitHub <noreply@github.com>
	Fri, 27 Mar 2026 21:43:59 +0000 (14:43 -0700)