Skip to content

Commit

Permalink
Merge branch 'Arcticons-Team:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
alchemiker authored Jan 12, 2024
2 parents 29da399 + d1d8d5b commit 6f41b97
Show file tree
Hide file tree
Showing 50 changed files with 233 additions and 9 deletions.
25 changes: 25 additions & 0 deletions app/src/main/res/xml/contributors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -621,4 +621,29 @@
contribution="Icon Creator."
image="https://avatars.githubusercontent.com/u/63516327?v=4"
link="https://github.com/alchemiker" />
<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="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="ThatBlueEnder"
contribution="Icon Creator."
image="https://avatars.githubusercontent.com/ThatBlueEnder"
link="https://namemc.com/profile/ThatBlueEnder" />
</resources>
2 changes: 1 addition & 1 deletion guides/Vector_Asset_Creator.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
File renamed without changes
File renamed without changes
1 change: 1 addition & 0 deletions other/affluences.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/android_stk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
172 changes: 164 additions & 8 deletions other/appfilter.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions other/battery_widget.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/bilnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/cfl_mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/cherrygram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/chesscraft.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/cityapp_vdl.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/content_shell.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/deliveroo_rider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/eboo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/eortologio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions other/flex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6f41b97

Please sign in to comment.