Merge branch 'main' into main

Arcticons-Team · Jan 13, 2024 · 13897d9 · 13897d9
2 parents 8dc0527 + 69e5f17
commit 13897d9
Show file tree

Hide file tree

Showing 70 changed files with 481 additions and 10 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
@@ -626,4 +626,49 @@
         contribution="Icon Creator"
         image="https://avatars.githubusercontent.com/u/121057279?v=4"
         link="https://github.com/je223xa" />
-</resources>
+    <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."
+        image="https://avatars.githubusercontent.com/u/15455108?v=4"
+        link="https://github.com/LukeVader-IV" />
+    <contributor
+        name="DeltriDev"
+        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."
+        image=""
+        link="https://github.com/knsrinath" />
+    <contributor
+        name="SagXD"
+        contribution="Icon Creator."
+        image="https://avatars.githubusercontent.com/u/95903022?v=4"
+        link="https://github.com/SagXD" />
+    <contributor
+        name="AxFo"
+        contribution="Icon Creator."
+        image="https://avatars.githubusercontent.com/u/39307324?v=4"
+        link="https://github.com/AxFo" />
+    <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/_5k.svg b/other/_5k.svg
diff --git a/other/affluences.svg b/other/affluences.svg
diff --git a/other/android_stk.svg b/other/android_stk.svg
diff --git a/other/aoe2companion.svg b/other/aoe2companion.svg
diff --git a/other/aoe2companion_v1.svg b/other/aoe2companion_v1.svg