From a68f740660b9df5854637c4789bc3b564ff1a287 Mon Sep 17 00:00:00 2001 From: zsim314 Date: Fri, 2 Nov 2018 15:38:26 -0500 Subject: [PATCH 1/3] yeet --- .idea/compiler.xml | 2 + .idea/gradle.xml | 5 +- ...edu_wpi_first_cscore_cscore_java_1_1_0.xml | 2 + ...edu_wpi_first_ntcore_ntcore_java_4_0_0.xml | 2 + ...pi_first_wpilibj_wpilibj_java_2018_1_1.xml | 2 + ...u_wpi_first_wpiutil_wpiutil_java_3_0_0.xml | 2 + ...r_third_ctre_CTRE_phoenix_java_5_1_2_1.xml | 2 + ...rror_third_kauailabs_navx_java_3_0_342.xml | 2 + ...__openrio_powerup_MatchData_2018_01_07.xml | 2 + .../Gradle__org_opencv_opencv_java_3_2_0.xml | 2 + .idea/modules.xml | 6 +- .idea/modules/-838270129/RobotCode_2018.iml | 13 + .../-838270129/RobotCode_2018_main.iml | 20 + .../-838270129/RobotCode_2018_test.iml | 20 + .idea/vcs.xml | 1 + .idea/workspace.xml | 1089 ++++++++--------- 16 files changed, 570 insertions(+), 602 deletions(-) create mode 100644 .idea/modules/-838270129/RobotCode_2018.iml create mode 100644 .idea/modules/-838270129/RobotCode_2018_main.iml create mode 100644 .idea/modules/-838270129/RobotCode_2018_test.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 02c9a25..87ad982 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -4,6 +4,8 @@ + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 77e9972..617e861 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,12 +5,13 @@ + diff --git a/.idea/libraries/Gradle__edu_wpi_first_cscore_cscore_java_1_1_0.xml b/.idea/libraries/Gradle__edu_wpi_first_cscore_cscore_java_1_1_0.xml index df46b41..b5c3385 100644 --- a/.idea/libraries/Gradle__edu_wpi_first_cscore_cscore_java_1_1_0.xml +++ b/.idea/libraries/Gradle__edu_wpi_first_cscore_cscore_java_1_1_0.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__edu_wpi_first_ntcore_ntcore_java_4_0_0.xml b/.idea/libraries/Gradle__edu_wpi_first_ntcore_ntcore_java_4_0_0.xml index dbd3739..954c84c 100644 --- a/.idea/libraries/Gradle__edu_wpi_first_ntcore_ntcore_java_4_0_0.xml +++ b/.idea/libraries/Gradle__edu_wpi_first_ntcore_ntcore_java_4_0_0.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__edu_wpi_first_wpilibj_wpilibj_java_2018_1_1.xml b/.idea/libraries/Gradle__edu_wpi_first_wpilibj_wpilibj_java_2018_1_1.xml index b03b5df..47b43f4 100644 --- a/.idea/libraries/Gradle__edu_wpi_first_wpilibj_wpilibj_java_2018_1_1.xml +++ b/.idea/libraries/Gradle__edu_wpi_first_wpilibj_wpilibj_java_2018_1_1.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__edu_wpi_first_wpiutil_wpiutil_java_3_0_0.xml b/.idea/libraries/Gradle__edu_wpi_first_wpiutil_wpiutil_java_3_0_0.xml index b8f1e30..1c49d54 100644 --- a/.idea/libraries/Gradle__edu_wpi_first_wpiutil_wpiutil_java_3_0_0.xml +++ b/.idea/libraries/Gradle__edu_wpi_first_wpiutil_wpiutil_java_3_0_0.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__openrio_mirror_third_ctre_CTRE_phoenix_java_5_1_2_1.xml b/.idea/libraries/Gradle__openrio_mirror_third_ctre_CTRE_phoenix_java_5_1_2_1.xml index ae7d24f..b13c7a8 100644 --- a/.idea/libraries/Gradle__openrio_mirror_third_ctre_CTRE_phoenix_java_5_1_2_1.xml +++ b/.idea/libraries/Gradle__openrio_mirror_third_ctre_CTRE_phoenix_java_5_1_2_1.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__openrio_mirror_third_kauailabs_navx_java_3_0_342.xml b/.idea/libraries/Gradle__openrio_mirror_third_kauailabs_navx_java_3_0_342.xml index 6193fae..4471007 100644 --- a/.idea/libraries/Gradle__openrio_mirror_third_kauailabs_navx_java_3_0_342.xml +++ b/.idea/libraries/Gradle__openrio_mirror_third_kauailabs_navx_java_3_0_342.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__openrio_powerup_MatchData_2018_01_07.xml b/.idea/libraries/Gradle__openrio_powerup_MatchData_2018_01_07.xml index da7eacf..12c667a 100644 --- a/.idea/libraries/Gradle__openrio_powerup_MatchData_2018_01_07.xml +++ b/.idea/libraries/Gradle__openrio_powerup_MatchData_2018_01_07.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_opencv_opencv_java_3_2_0.xml b/.idea/libraries/Gradle__org_opencv_opencv_java_3_2_0.xml index cdf1694..4bfe5b1 100644 --- a/.idea/libraries/Gradle__org_opencv_opencv_java_3_2_0.xml +++ b/.idea/libraries/Gradle__org_opencv_opencv_java_3_2_0.xml @@ -2,10 +2,12 @@ + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 9b11cf9..dffc1ad 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/.idea/modules/-838270129/RobotCode_2018.iml b/.idea/modules/-838270129/RobotCode_2018.iml new file mode 100644 index 0000000..afce1f5 --- /dev/null +++ b/.idea/modules/-838270129/RobotCode_2018.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/-838270129/RobotCode_2018_main.iml b/.idea/modules/-838270129/RobotCode_2018_main.iml new file mode 100644 index 0000000..a421678 --- /dev/null +++ b/.idea/modules/-838270129/RobotCode_2018_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/-838270129/RobotCode_2018_test.iml b/.idea/modules/-838270129/RobotCode_2018_test.iml new file mode 100644 index 0000000..b4a8945 --- /dev/null +++ b/.idea/modules/-838270129/RobotCode_2018_test.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..9f7d9ba 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d338f2..f7751d1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + - + - - - + + - + - - - + + - + - - - + + @@ -83,18 +149,19 @@ - - - -