Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.20.1/dev' into 1.20.1/computercraft
Browse files Browse the repository at this point in the history
# Conflicts:
#	common/src/main/java/dev/ithundxr/createnumismatics/ModSetup.java
#	common/src/main/java/dev/ithundxr/createnumismatics/content/vendor/VendorBlockEntity.java
  • Loading branch information
IThundxr committed Jun 5, 2024
2 parents 8253dac + 808ea76 commit 9a0fdd1
Show file tree
Hide file tree
Showing 206 changed files with 4,882 additions and 650 deletions.
97 changes: 97 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: Bug Report
description: Create a bug report to help us improve Numismatics
labels: [ "type: bug" ]
body:
- type: textarea
attributes:
label: Describe the Bug
description: A clear and concise description of what the bug is
validations:
required: true
- type: textarea
attributes:
label: Reproduction Steps
description: Tell us about the steps to reproduce the bug.
value: |
1.
2.
3.
...
validations:
required: true
- type: textarea
attributes:
label: Expected Result
description: A clear and concise description of what you expected to happen
validations:
required: true
- type: textarea
attributes:
label: Screenshots and Videos
description: If applicable, add screenshots or videos to help explain your problem.
validations:
required: false
- type: input
attributes:
label: Crash Report or Log
description: If applicable, please add a **link** to the crash report or log that was created when this issue occurred. You can upload the crash report to a site like [mclogs](https://mclo.gs) or [Pastebin](https://pastebin.com). Please **do not** paste the whole crash report in this issue.
validations:
required: false
- type: input
attributes:
label: Operating System
description: The operating system you were using when the bug occurred
placeholder: Windows 11
validations:
required: true
- type: dropdown
attributes:
label: Mod Version
description: The version of the mod you were using when the bug occurred
options:
- "1.0.6"
- "1.0.5"
- "1.0.4"
- "1.0.2"
- "1.0.1"
- "1.0.0"
validations:
required: true
- type: dropdown
attributes:
label: Create Mod Version
description: The version of **Create Mod** you were using when the bug occurred
options:
- "0.5.1f"
validations:
required: true
- type: dropdown
attributes:
label: Minecraft Version
description: The version of Minecraft you were using when the bug occurred
options:
- "1.20.1"
validations:
required: true
- type: input
attributes:
label: ModLoader and Version
description: The **modloader** and **version** of the modloader using when the bug occurred
placeholder: Fabric/Forge x.x.x
validations:
required: true
- type: textarea
attributes:
label: Other Mods
description: Please list any other mods that were running when the crash happened.
validations:
required: false
- type: textarea
attributes:
label: Additional Context
description: Add any extra context about the bug here
validations:
required: false
- type: markdown
attributes:
value: "Thank you for taking the time to make this bug report and helping improve Numismatics!"
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/suggestion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Suggestion
description: Suggest something that would improve Numismatics
labels: [ "type: suggestion" ]
body:
- type: textarea
attributes:
label: Describe the Suggestion
description: What should we add or change to make Numismatics better?
validations:
required: true
- type: textarea
attributes:
label: Screenshots and Videos
description: If applicable, add screenshots or videos to help explain your suggestion.
validations:
required: false
- type: textarea
attributes:
label: Additional Context
description: Add any extra context about the suggestion here.
validations:
required: false
- type: markdown
attributes:
value: "Thank you for taking the time to make this suggestion and helping improve Numismatics!"
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
- name: Validate Gradle Wrapper Integrity
uses: gradle/wrapper-validation-action@v2

- name: Make Gradle wrapper executable
run: chmod +x ./gradlew

- name: Build
run: ./gradlew build
- name: Build & Publish to Maven
env:
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
run: ./gradlew build publish
47 changes: 47 additions & 0 deletions .github/workflows/localization.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

# This workflow will run Crowdin Action that will upload new texts to Crowdin, download the newest translations and create a PR
# For more information see: https://github.com/crowdin/github-action

name: Crowdin Action

# Controls when the action will run.
on:
# Only run when started manually
workflow_dispatch:
inputs:
uploadTranslations:
description: "Set to true to upload (changed) translations to Crowdin"
type: boolean
required: true
default: false
#schedule:
#- cron: '0 */6 * * *' # Every 6 hours - https://crontab.guru/#0_*/6_*_*_*

jobs:
synchronize-with-crowdin:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: crowdin action
uses: crowdin/github-action@v1.19.0
with:
# Upload sources to Crowdin
upload_sources: true
# Upload translations to Crowdin, only use true at initial run
upload_translations: ${{ github.event.inputs.uploadTranslations }}
# Make pull request of Crowdin translations
download_translations: true
# To download translations to the specified version branch
localization_branch_name: 'l10n_translations'
# Create pull request after pushing to branch
create_pull_request: true
pull_request_title: 'New Crowdin translations'
pull_request_body: 'New Crowdin pull request with translations'
pull_request_base_branch_name: '1.20.1/dev'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
6 changes: 2 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
type: choice
description: Platform
options:
- both
- fabric
- forge
- both

jobs:
build:
Expand All @@ -19,6 +19,7 @@ jobs:
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
PLATFORM: ${{ inputs.platform }}

steps:
- name: Checkout Repository
Expand All @@ -37,8 +38,5 @@ jobs:
- name: Make Gradle wrapper executable
run: chmod +x ./gradlew

- name: Set Platform environment variable
run: echo "PLATFORM=${{ inputs.platform }}" >> $GITHUB_ENV

- name: Build & Publish
run: ./gradlew numismaticsPublish
7 changes: 7 additions & 0 deletions .idea/copyright/Numismatics.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9a0fdd1

Please sign in to comment.