Merge remote-tracking branch 'upstream/main'

thamara · Oct 24, 2022 · 008611b · 008611b
2 parents 6ccca02 + b4e1519
commit 008611b
Show file tree

Hide file tree

Showing 57 changed files with 756 additions and 299 deletions.
diff --git a/.github/workflows/.debian.json b/.github/workflows/.debian.json
@@ -1,6 +1,6 @@
 {
   "dest": "release-builds/",
-  "icon": "assets/timer.png",
+  "icon": "assets/ttl.png",
   "categories": [
     "Utility"
   ],

diff --git a/.github/workflows/localization-report.yml b/.github/workflows/localization-report.yml
@@ -47,7 +47,7 @@ jobs:
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
+          comment-author: 'time-to-leave'
           body-includes: Localization report
       - name: Create or update comment
         uses: peter-evans/create-or-update-comment@v2

diff --git a/README.md b/README.md
@@ -75,6 +75,4 @@ Join our [Discord server](https://discord.gg/P3KkEF5) to discuss upcoming featur
 
 Icons made by [freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](https://www.flaticon.com).
 
-Original Timer icon by [lucy-g](https://icon-icons.com/icon/timer/121243), colored variations and formats modified from it.
-
 View Switch icon made by [Pixel perfect](https://www.flaticon.com/authors/pixel-perfect) from [www.flaticon.com](https://www.flaticon.com).
diff --git a/Resources/SampleAppx.44x44.png b/Resources/SampleAppx.44x44.png
diff --git a/Resources/SampleAppx.50x50.png b/Resources/SampleAppx.50x50.png
diff --git a/Resources/Square150x150Logo.png b/Resources/Square150x150Logo.png
diff --git a/Resources/Wide310x150Logo.png b/Resources/Wide310x150Logo.png
diff --git a/Resources/icon.icns b/Resources/icon.icns
diff --git a/Resources/icon.png b/Resources/icon.png
diff --git a/assets/timer-grey.svg b/assets/timer-grey.svg
diff --git a/assets/timer-purple.ico b/assets/timer-purple.ico
diff --git a/assets/timer-purple.png b/assets/timer-purple.png
diff --git a/assets/timer.png b/assets/timer.png
diff --git a/assets/timer.svg b/assets/timer.svg
diff --git a/assets/timetoleave.png b/assets/timetoleave.png
diff --git a/assets/ttl.ico b/assets/ttl.ico
diff --git a/assets/ttl.png b/assets/ttl.png