Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Khaoz-Topsy authored Sep 19, 2023
2 parents 1af6deb + 82f99d7 commit ced869f
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 35 deletions.
40 changes: 28 additions & 12 deletions .github/ISSUE_TEMPLATE/---bug-report.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: "\U0001F41B Bug report"
title: '[Bug]: '
name: '🐛 Bug Report'
description: |
Thank you for reporting issues!
Please make sure that you have looked at and read the "I found a Bug and I want to report it" section of the Contributing guide!
title: '🐛 Bug Report: '
labels: bug
body:
- type: textarea
id: description
validations:
required: true
attributes:
label: Describe the bug
label: 📜 Describe the bug
description: |
A clear and concise description of what the bug is. If you for example disagree with what the name of an game item is please point out what you believe it should say.
placeholder: 🐛🐜🪲
Expand All @@ -19,7 +19,7 @@ body:
validations:
required: true
attributes:
label: To Reproduce
label: 👟 To Reproduce
description: |
Steps to reproduce the behavior:
value: |
Expand All @@ -32,15 +32,15 @@ body:
validations:
required: true
attributes:
label: Expected behavior
label: 👍 Expected behavior
description: |
A clear and concise description of what you expected to happen.
- type: dropdown
id: device
validations:
required: true
attributes:
label: Where did you find this problem?
label: 📱 Where did you find this problem?
multiple: true
options:
- Android
Expand All @@ -50,12 +50,28 @@ body:
- type: textarea
id: logs
attributes:
label: Logs
label: 🪵 Logs
description: |
Please recreate the issue and attach/paste the logs from the app onto this issue. You can find the logs on the settings page, there is a "Logs" option.
- type: textarea
id: additional
- type: checkboxes
id: no-duplicate-issues
attributes:
label: Additional context
description: |
Add any other context or screenshots about the feature request here.
label: '👀 Have you checked if this bug report has been created already?'
options:
- label: "I checked and couldn't find similar issue"
required: true
- type: checkboxes
id: read-code-of-conduct
attributes:
label: '🏢 Have you read the Code of Conduct?'
options:
- label: 'I have read the [Code of Conduct](https://github.com/AssistantNMS/App/blob/main/.github/CODE_OF_CONDUCT.md)'
required: true
- type: dropdown
attributes:
label: Are you willing to submit PR?
description: This is absolutely not required, but we are happy to guide you in the contribution process.
options:
- Yes I am willing to submit a PR!
- No, but I'm happy to collaborate on a PR with someone else
- No, I don't have time to work on this right now
42 changes: 25 additions & 17 deletions .github/ISSUE_TEMPLATE/---feature-request.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "\U0001F680 Feature request"
title: '[Feature]: '
name: "🚀 Feature request"
description: Suggest an idea for this project
title: '🚀 Feature request: '
labels: idea
body:
- type: markdown
Expand All @@ -12,26 +12,34 @@ body:
validations:
required: true
attributes:
label: Is your feature request related to a problem? Please describe.
description: |
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
- type: textarea
id: solutions
validations:
required: true
attributes:
label: Describe the solution you'd like
label: 🔖 Describe the solution you'd like
description: |
A clear and concise description of what you want to happen.
- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
label: 🩹 Describe alternatives you've considered
description: |
A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: additional
- type: checkboxes
id: no-duplicate-issues
attributes:
label: Additional context
description: |
Add any other context or screenshots about the feature request here.
label: '👀 Have you checked if this bug report has been created already?'
options:
- label: "I checked and couldn't find similar issue"
required: true
- type: checkboxes
id: read-code-of-conduct
attributes:
label: '🏢 Have you read the Code of Conduct?'
options:
- label: 'I have read the [Code of Conduct](https://github.com/AssistantNMS/App/blob/main/.github/CODE_OF_CONDUCT.md)'
required: true
- type: dropdown
attributes:
label: Are you willing to submit PR?
description: This is absolutely not required, but we are happy to guide you in the contribution process.
options:
- Yes I am willing to submit a PR!
- No, but I'm happy to collaborate on a PR with someone else
- No, I don't have time to work on this right now
7 changes: 7 additions & 0 deletions .github/holopin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
organization: assistantnms # org name on holopin
defaultSticker: clcuvyw02200208mgbwr3c6hj
stickers:
- id: clcuvyw02200208mgbwr3c6hj
alias: documentation-guru
- id: clcuvrj0v029508mgjzgyr9y0
alias: bug-finder
2 changes: 2 additions & 0 deletions .github/workflows/githubActions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v1
with:
channel: 'master' # or: 'beta', 'dev' or 'master'

- name: Write env file
env:
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
![gitmoji](https://github.com/AssistantNMS/.github/blob/main/badge/gitmoji.svg?raw=true)<br />
[![Supported by the No Man's Sky Community Developers & Designers](https://raw.githubusercontent.com/NMSCD/About/master/badge/purple-ftb.svg)][nmscd]
![Profile views](https://komarev.com/ghpvc/?username=AssistantNMS&color=green&style=for-the-badge)

[![Follow on Twitter](https://img.shields.io/badge/follow-%40AssistantNMS-1d9bf0?logo=twitter&style=for-the-badge)][assistantnmsTwitter]
[![Discord](https://img.shields.io/discord/625007826913198080?style=for-the-badge)][discord]

[![Latest version](https://api.assistantapps.com/badge/version/589405b4-e40f-4cd9-b793-6bf37944ee09.svg?platforms=0&platforms=1)](#)<br />
[![Mastodon](https://img.shields.io/mastodon/follow/109315859662532146?color=%2300ff00&domain=https%3A%2F%2Fnomanssky.social&style=for-the-badge&logo=mastodon)][mastodon]
[![Discord](https://img.shields.io/discord/625007826913198080?style=for-the-badge&label=Chat%20on%20Discord&logo=discord)][discord]<br />
[![Follow on Twitter](https://img.shields.io/badge/follow-%40AssistantNMS-1d9bf0?logo=twitter&style=for-the-badge)][assistantnmsTwitter]<br />

[![Android review](https://api.assistantapps.com/badge/review/1/1.svg)][googlePlayStore]<br />
[![iOS review](https://api.assistantapps.com/badge/review/1/2.svg)][appleAppStore]
[![iOS review](https://api.assistantapps.com/badge/review/1/2.svg)][appleAppStore]<br />
[![Latest version](https://api.assistantapps.com/badge/version/589405b4-e40f-4cd9-b793-6bf37944ee09.svg?platforms=0&platforms=1)](*)

<br />
</div>
Expand Down Expand Up @@ -118,6 +119,7 @@ __The iOS build on [CodeMagic][codeMagic] generally reports that it has failed e
[windowsStore]: https://apps.microsoft.com/store/detail/assistant-for-no-mans-sky/9NQLF7XD0LF3?ref=AssistantNMSGithub
[discord]: https://assistantapps.com/discord?ref=AssistantNMSGithub
[nmscd]: https://github.com/NMSCD?ref=AssistantNMSGithub
[mastodon]: https://nomanssky.social/@assistantnms?ref=AssistantNMSGithub

<!-- Other -->
[mbincompiler]: https://github.com/monkeyman192/MBINCompiler
Expand Down

0 comments on commit ced869f

Please sign in to comment.