From 7373d45b97016cb1cc53308690255113dc00087d Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Sat, 9 May 2020 01:03:56 -0400
Subject: [PATCH 1/8] Switched to military time

---
 scripts/dracula.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index a5e6f79..af7c40e 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -44,7 +44,7 @@ main()
   tmux set-option -g status-interval 5
 
   # set clock
-  tmux set-option -g clock-mode-style 12
+  tmux set-option -g clock-mode-style 24
 
   # set length 
   tmux set-option -g status-left-length 100

From fcac1f89022b2a1978f5bdb498b8774392f52bec Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Tue, 19 May 2020 15:47:51 -0400
Subject: [PATCH 2/8] testing

---
 scripts/dracula.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index af7c40e..07e2569 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -21,6 +21,7 @@ main()
   show_network=$(get_tmux_option "@dracula-show-network" true)
   show_weather=$(get_tmux_option "@dracula-show-weather" true)
   show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
+  show_military=$(get_tmux_option "@dracula-military-time" true)
 
   # Dracula Color Pallette
   white='#f8f8f2'
@@ -44,7 +45,10 @@ main()
   tmux set-option -g status-interval 5
 
   # set clock
-  tmux set-option -g clock-mode-style 24
+  # tmux set-option -g clock-mode-style 12
+  if $show_military; then
+    tmux set-option -g clock-mode-style 24 &
+  fi
 
   # set length 
   tmux set-option -g status-left-length 100

From 82ad5a74058e44058e0221e1cd60cf94c3b72b67 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Tue, 19 May 2020 15:50:34 -0400
Subject: [PATCH 3/8] MOre testing

---
 scripts/dracula.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 07e2569..8d1de20 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -21,7 +21,7 @@ main()
   show_network=$(get_tmux_option "@dracula-show-network" true)
   show_weather=$(get_tmux_option "@dracula-show-weather" true)
   show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
-  show_military=$(get_tmux_option "@dracula-military-time" true)
+  show_military=$(get_tmux_option "@dracula-military-time" false)
 
   # Dracula Color Pallette
   white='#f8f8f2'

From fadbdc62673d3bd2e32dc48d935dcc2d5941c6a3 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Tue, 19 May 2020 15:55:13 -0400
Subject: [PATCH 4/8] Added else statement

---
 scripts/dracula.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 8d1de20..054fcd7 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -48,6 +48,8 @@ main()
   # tmux set-option -g clock-mode-style 12
   if $show_military; then
     tmux set-option -g clock-mode-style 24 &
+else
+    tmux set-option -g clock-mode-style 12 &
   fi
 
   # set length 

From 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d Mon Sep 17 00:00:00 2001
From: Dane Williams <dwilli36@nd.edu>
Date: Tue, 19 May 2020 19:03:31 -0700
Subject: [PATCH 5/8] Create pull_request_template.md

---
 .../PULL_REQUEST_TEMPLATE/pull_request_template.md   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
new file mode 100644
index 0000000..ccd83bd
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -0,0 +1,12 @@
+## Issue
+
+Please reference the issue that this PR is solving
+Closes #[issue id goes here]
+
+## Description of Changes
+
+Please briefly describe the changes being made
+
+## Testing
+
+Please explain how you tested these changes and how a maintainer should reproduce the test

From cbb299eb5ca01b50bf9b9fd96e3e868a873218d7 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Tue, 19 May 2020 23:38:39 -0400
Subject: [PATCH 6/8] Nope fixed this time

---
 scripts/dracula.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 987450a..11d16be 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -20,10 +20,7 @@ main()
   show_network=$(get_tmux_option "@dracula-show-network" true)
   show_weather=$(get_tmux_option "@dracula-show-weather" true)
   show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
-<<<<<<< HEAD
-=======
   show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
->>>>>>> 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d
   show_military=$(get_tmux_option "@dracula-military-time" false)
 
   # Dracula Color Pallette

From b92fc323e6a17c6019cb5f0fe35a480b93171ae6 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Wed, 20 May 2020 13:28:35 -0400
Subject: [PATCH 7/8] Tested, working on both powerline mode, and normal mode

---
 INSTALL.md         |  1 +
 scripts/dracula.sh | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 9ccb56b..59f7394 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -20,3 +20,4 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi
 * Disable weather functionality: `set -g @dracula-show-weather false`
 * Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false`
 * Enable powerline symbols: `set -g @dracula-show-powerline true`
+* Enable military time: `set -g @dracula-military-time true`
diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 11d16be..2430d02 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -49,12 +49,7 @@ main()
   tmux set-option -g status-interval 5
 
   # set clock
-  # tmux set-option -g clock-mode-style 12
-  if $show_military; then
-    tmux set-option -g clock-mode-style 24 &
-else
-    tmux set-option -g clock-mode-style 12 &
-  fi
+  tmux set-option -g clock-mode-style 12
 
   # set length 
   tmux set-option -g status-left-length 100
@@ -91,7 +86,12 @@ else
         powerbg=${orange}
       fi
 
-      tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
+      if $show_military; then
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R %p #(date +%Z) "
+      else
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
+      fi
+
       # window tabs 
       tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[fg=${dark_purple},bg=${gray}]${left_sep}"
   else
@@ -111,8 +111,12 @@ else
           tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " 
       fi
 
-      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
-  
+      if $show_military; then
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R %p #(date +%Z) "
+      else
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
+      fi
+
       # window tabs 
       tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "
 

From b1757f3ff83d9af123278db1ec109c3153d16064 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Wed, 20 May 2020 13:31:39 -0400
Subject: [PATCH 8/8] Fixed everything, working on both powerline and normal
 mode

---
 scripts/dracula.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 2430d02..6cfeca5 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -87,7 +87,7 @@ main()
       fi
 
       if $show_military; then
-	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R %p #(date +%Z) "
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R #(date +%Z) "
       else
 	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
       fi
@@ -112,7 +112,7 @@ main()
       fi
 
       if $show_military; then
-	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R %p #(date +%Z) "
+	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R #(date +%Z) "
       else
 	tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
       fi