0b0b0410faf9c94a383f59b6f51a360b5ec095fb
3
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 NoahLacks63
|
5d44ebfb64 | changed to 2025 TBA data | ||
|
NoahLacks63
|
a6b7559f12 | some back buttons are broke. and there's no time submitted | ||
|
NoahLacks63
|
f6605cf0f8 |
Merge branch 'refs/heads/main' into MatchDataImplementation
# Conflicts: # ScoutingApp/.gradle/8.7/executionHistory/executionHistory.bin # ScoutingApp/.gradle/8.7/executionHistory/executionHistory.lock # ScoutingApp/.gradle/8.7/fileHashes/fileHashes.bin # ScoutingApp/.gradle/8.7/fileHashes/fileHashes.lock # ScoutingApp/.gradle/8.7/fileHashes/resourceHashesCache.bin # ScoutingApp/.gradle/buildOutputCleanup/buildOutputCleanup.lock # ScoutingApp/app/build/intermediates/apk/debug/app-debug.apk # ScoutingApp/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar # ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex # ScoutingApp/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex # ScoutingApp/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out # ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # ScoutingApp/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # ScoutingApp/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml # ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # ScoutingApp/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/AutoActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/EndActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$3.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$4.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$5.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$6.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$7.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity$8.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/MainActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/Submit.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/TeleActivity.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$2.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$3.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$4.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$5.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity$6.class # ScoutingApp/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/scoutingapp/startingActivity.class # ScoutingApp/app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_ # ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/multi-v2/mergeDebugResources.json # ScoutingApp/app/build/intermediates/merged_res_blame_folder/debug/mergeDebugResources/out/single/mergeDebugResources.json # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/AutoActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/EndActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$3.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$4.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$5.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$6.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$7.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity$8.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/MainActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/Submit.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/TeleActivity.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$2.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$3.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$4.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$5.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity$6.dex # ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/scoutingapp/startingActivity.dex # ScoutingApp/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt # ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # ScoutingApp/app/src/main/java/com/example/scoutingapp/MainActivity.java # ScoutingApp/app/src/main/java/com/example/scoutingapp/TeleActivity.java |