Merge remote-tracking branch 'origin/dev'

v4u6h4n · May 2, 2024 · 99a47ad · 99a47ad
2 parents a7b7310 + 91bd6c0
commit 99a47ad
Show file tree

Hide file tree

Showing 15 changed files with 377 additions and 299 deletions.
diff --git a/configurator.sh b/configurator.sh
diff --git a/data/activity_tag_health_advice.txt b/data/activity_tag_health_advice.txt
@@ -3,7 +3,7 @@ Exercise
 IRL
 Advice
 Food
-Diet
+Health
 24H
 Education
 Vegan

diff --git a/...tivity_tag_channel_under_construction.txt → data/activity_tag_maintenance.txt b/...tivity_tag_channel_under_construction.txt → data/activity_tag_maintenance.txt
diff --git a/data/activity_tag_q_and_a.txt b/data/activity_tag_q_and_a.txt
@@ -1,10 +1,10 @@
 English
-Trauma
+Variety
 Psychology
 Anxiety
 Politics
 AskAnything
 PTSD
 LGBTQIAPlus
-DissociativeIdentityDisorder
+DissociativeDisorder
 DID
diff --git a/data/activity_title_start_coding.txt b/data/activity_title_start_coding.txt
@@ -1,3 +1,2 @@
 Coding
-Nerdy Linux Stuff
-BASHing my head against a wall
+Programming
diff --git a/data/activity_title_start_cooking_snack.txt b/data/activity_title_start_cooking_snack.txt
@@ -0,0 +1 @@
+Making Snacks
diff --git a/data/activity_title_start_eating_dinner.txt b/data/activity_title_start_eating_dinner.txt
@@ -1,2 +1 @@
 Dinner Time!
-Yummy! Dinner!
diff --git a/data/activity_title_start_eating_snack.txt b/data/activity_title_start_eating_snack.txt
@@ -0,0 +1 @@
+Snacktime!
diff --git a/...itle_start_channel_under_construction.txt → data/activity_title_start_maintenance.txt b/...itle_start_channel_under_construction.txt → data/activity_title_start_maintenance.txt
diff --git a/data/activity_title_start_morning.txt b/data/activity_title_start_morning.txt
@@ -1,3 +1,3 @@
-We're Awake Now!
+We're Awake Now
 Getting Ready for the Day
 Morning Routine
diff --git a/data/activity_title_start_research.txt b/data/activity_title_start_research.txt
@@ -1 +1 @@
-Researching Dark Stuff
+Researching
diff --git a/data/activity_title_start_sewing.txt b/data/activity_title_start_sewing.txt
@@ -1 +1 @@
-Sewing Stuff
+Sewing