Merge branch 'main' into Twinbot_official

author Wesley28w <wesleycwong@gmail.com>

Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)

committer Wesley28w <wesleycwong@gmail.com>

Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)
author Wesley28w <wesleycwong@gmail.com>
Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)
committer Wesley28w <wesleycwong@gmail.com>
Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)
diff --cc src/main/java/frc/robot/RobotContainer.java
Simple merge
diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
Simple merge
author	Wesley28w <wesleycwong@gmail.com>
	Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)
committer	Wesley28w <wesleycwong@gmail.com>
	Fri, 27 Mar 2026 15:11:44 +0000 (08:11 -0700)
		1	2
src/main/java/frc/robot/RobotContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/frc/robot/subsystems/shooter/Shooter.java	patch \|	diff1 \|	diff2 \|	blob \| history