Merge branch 'main' into main

Arcticons-Team · Jan 12, 2024 · 4a9b693 · 4a9b693
2 parents d392949 + e6dcad7
commit 4a9b693
Show file tree

Hide file tree

Showing 21 changed files with 112 additions and 11 deletions.
diff --git a/...src/black/res/drawable-nodpi/onstream.png → ...black/res/drawable-nodpi/onstream_alt.png b/...src/black/res/drawable-nodpi/onstream.png → ...black/res/drawable-nodpi/onstream_alt.png
diff --git a/app/src/main/res/xml/contributors.xml b/app/src/main/res/xml/contributors.xml
@@ -621,6 +621,11 @@
         contribution="Icon Creator."
         image="https://avatars.githubusercontent.com/u/63516327?v=4"
         link="https://github.com/alchemiker" />
+    <contributor
+        name="Limfjorden"
+        contribution="Icon Creator."
+        image="https://avatars.githubusercontent.com/u/66277585?v=4"
+        link="https://github.com/Limfjorden" />
     <contributor
         name="LukeVader"
         contribution="Icon Creator."
@@ -631,6 +636,11 @@
         contribution="Icon Creator"
         image="https://avatars.githubusercontent.com/u/98485800?v=4"
         link="https://github.com/DeltriDev" />
+    <contributor
+        name="Sande Santhosh"
+        contribution="Icon Creator"
+        image=""
+        link="https://github.com/SandeSanthosh" />
     <contributor
         name="knsrinath"
         contribution="Icon Creator."
@@ -646,4 +656,14 @@
         contribution="Icon Creator."
         image="https://avatars.githubusercontent.com/u/39307324?v=4"
         link="https://github.com/AxFo" />
-</resources>
+    <contributor
+        name="Andrew A"
+        contribution="Icon Creator."
+        image="https://avatars.githubusercontent.com/u/61951628?v=4"
+        link="https://github.com/andrew-aiken" />
+    <contributor
+        name="ThatBlueEnder"
+        contribution="Icon Creator."
+        image="https://avatars.githubusercontent.com/ThatBlueEnder"
+        link="https://namemc.com/profile/ThatBlueEnder" />
+</resources>
diff --git a/...rc/normal/res/drawable-nodpi/onstream.png → ...ormal/res/drawable-nodpi/onstream_alt.png b/...rc/normal/res/drawable-nodpi/onstream.png → ...ormal/res/drawable-nodpi/onstream_alt.png
diff --git a/guides/Vector_Asset_Creator.md b/guides/Vector_Asset_Creator.md
@@ -50,7 +50,7 @@ You'll notice that the fill color is white and stroke colour is black.
 
 - Select your masterpiece(s) and Commit changes (optional commit message)
 
-There will be a dialog "... is 1 commit ahead of Donno:Arcticons"
+There will be a dialog "... is 1 commit ahead of Arcticons-Team/Arcticons:main"
 
 - Click "Contribute" > "Open pull request"
 

diff --git a/icons/black/onstream.svg → icons/black/onstream_alt.svg b/icons/black/onstream.svg → icons/black/onstream_alt.svg
diff --git a/icons/white/onstream.svg → icons/white/onstream_alt.svg b/icons/white/onstream.svg → icons/white/onstream_alt.svg
diff --git a/other/appfilter.xml b/other/appfilter.xml
diff --git a/other/chesscraft.svg b/other/chesscraft.svg
diff --git a/other/content_shell.svg b/other/content_shell.svg
diff --git a/other/deliveroo_rider.svg b/other/deliveroo_rider.svg
diff --git a/other/dr_nyheder.svg b/other/dr_nyheder.svg
diff --git a/other/homebase.svg b/other/homebase.svg
diff --git a/other/iob_mobile.svg b/other/iob_mobile.svg
diff --git a/other/mango_languages.svg b/other/mango_languages.svg
diff --git a/other/noti.svg b/other/noti.svg
diff --git a/other/onstream.svg b/other/onstream.svg
diff --git a/other/pagerduty.svg b/other/pagerduty.svg
diff --git a/other/pant.svg b/other/pant.svg
diff --git a/other/planday.svg b/other/planday.svg
diff --git a/other/umassfive.svg b/other/umassfive.svg
diff --git a/other/wgu.svg b/other/wgu.svg