Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gradle/7.6/checksums/checksums.lock
#	.gradle/7.6/executionHistory/executionHistory.bin
#	.gradle/7.6/executionHistory/executionHistory.lock
#	.gradle/7.6/fileHashes/fileHashes.bin
#	.gradle/7.6/fileHashes/fileHashes.lock
#	.gradle/7.6/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/file-system.probe
#	.idea/misc.xml
#	.idea/modules/unordinary-basics.main.iml
#	.idea/modules/unordinary-basics.test.iml
#	.idea/workspace.xml
  • Loading branch information
Nieadni committed Aug 19, 2023
2 parents 15c46cd + 6e6957e commit f251c36
Show file tree
Hide file tree
Showing 58 changed files with 220 additions and 483,747 deletions.
2 changes: 1 addition & 1 deletion gitattributes → .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
src/generated/**/*.json text eol=lf
101 changes: 101 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
name: Bug Report
description: >-
Please use this template when you have encountered a bug in Unordinary Basics
If the issue seems to affect only one mod, please report to them first instead of here.
title: '[Bug]: '
labels:
- "Bug"
- "Triage"
body:
- type: dropdown
id: mc-version
attributes:
label: Minecraft Version
description: What version of Minecraft are you running?
options:
- 1.18.2
validations:
required: true
- type: input
id: manascore-version
attributes:
label: ManasCore Version
description: What version of ManasCore are you running?
placeholder: ex. 0.0.0.14
validations:
required: true
- type: input
id: unordinarybasics-version
attributes:
label: Unordinary Basics Version
description: What version of Unordinary Basics are you running?
placeholder: ex. 1.0.0.0
validations:
required: true
- type: textarea
id: repro_steps
validations:
required: true
attributes:
label: Steps to Reproduce the Bug
description: Please explain what we need to do to cause the bug.
placeholder: >-
Example:
1. Install Mod X
2. Start Game
3. Place Block X
- type: textarea
id: expected_behavior
attributes:
label: Expected Behavior
description: >-
Please explain what should happen when you follow the steps, if the bug
were fixed.
validations:
required: true
- type: textarea
id: actual_behavior
attributes:
label: Actual Behavior
description: >-
Please briefly explain what actually happens when you follow the steps,
because of the bug.
validations:
required: true
- type: textarea
id: notes
attributes:
label: Extra Notes (Optional)
description: >-
Optionally, please include anything else you'd like to say about the bug.
validations:
required: false
- type: markdown
attributes:
value: >-
## Sharing your `latest.log`
In order to diagnose a bug, we will need to see your `latest.log`.
To share your `latest.log` here, please follow these steps:
1. If you don't have it already, find your `latest.log` file.
a. [Find your minecraft
folder](https://stickypiston.co/account/knowledgebase/130/How-do-I-find-my-Minecraft-Folder.html)
b. In the minecraft folder, go into the `logs` folder and find the
`latest.log` file.
1. Create a Gist from the `latest.log`, and copy the url.
[Click here for instructions on creating a
Gist](https://gist.github.com/mezz/c3f0931344d81afd366e0d85a8ed1031)
- type: input
id: crashlog
attributes:
label: latest.log
description: Please paste the url to the gist containing your `latest.log` file.
placeholder: https://gist.github.com/<your_user_name>/<gist_id>
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Feature Request
description: >-
Please use this template when you want to suggest a feature for Unordinary Basics.
title: '[Feature Request]: '
labels:
- "Feature Request"
body:
- type: textarea
id: suggestion
attributes:
label: Suggestion
placeholder: >-
Please describe your feature as clear as possible.
validations:
required: true
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Description

List of changes:

- example

## Type of Change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Code Refactoring (non-breaking change which improved the Code Quality)
- [ ] Breaking Code Refactoring (breaking change which improved the Code Quality)
- [ ] Documentation update (JavaDoc or Markdown change)
26 changes: 26 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"
time: "02:00"
timezone: "Europe/Berlin"
assignees:
- "Charismara"
commit-message:
prefix: "[Update]"
target-branch: "master"
registries:
- manas-maven
registries:
manas-maven:
type: maven-repository
url: https://manasmods.bytesafe.dev/maven/manasmods
username: ${{secrets.MANAS_MAVEN_USER}}
password: ${{secrets.MANAS_MAVEN_PASSWORD}}
62 changes: 62 additions & 0 deletions .github/workflows/gradle_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
env:
MANAS_REPO_USER: ${{ secrets.MANAS_REPO_USER }}
MANAS_REPO_USER_PASSWORD: ${{ secrets.MANAS_REPO_USER_PASSWORD }}

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: gradle
- name: Set Gradle Permissions
run: chmod +x gradlew
- name: Build with Gradle
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
with:
arguments: build

gameTest:
needs: [ build ]
runs-on: ${{ matrix.os}}
env:
MANAS_REPO_USER: ${{ secrets.MANAS_REPO_USER }}
MANAS_REPO_USER_PASSWORD: ${{ secrets.MANAS_REPO_USER_PASSWORD }}
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: gradle
- name: Set Gradle Permissions
run: chmod +x gradlew
- name: Run Game Test
run: ./gradlew runGameTestServer
2 changes: 1 addition & 1 deletion gitignore → .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ bin/
/run/
/build/
/.idea/
/.gradle/
/.gradle/
Binary file removed .gradle/7.6/checksums/checksums.lock
Binary file not shown.
Binary file removed .gradle/7.6/checksums/md5-checksums.bin
Binary file not shown.
Binary file removed .gradle/7.6/checksums/sha1-checksums.bin
Binary file not shown.
Binary file not shown.
Empty file.
Binary file removed .gradle/7.6/executionHistory/executionHistory.bin
Binary file not shown.
Binary file removed .gradle/7.6/executionHistory/executionHistory.lock
Binary file not shown.
Binary file removed .gradle/7.6/fileChanges/last-build.bin
Binary file not shown.
Binary file removed .gradle/7.6/fileHashes/fileHashes.bin
Binary file not shown.
Binary file removed .gradle/7.6/fileHashes/fileHashes.lock
Binary file not shown.
Binary file removed .gradle/7.6/fileHashes/resourceHashesCache.bin
Binary file not shown.
Empty file removed .gradle/7.6/gc.properties
Empty file.
Binary file removed .gradle/8.1/checksums/checksums.lock
Binary file not shown.
Binary file removed .gradle/8.1/checksums/md5-checksums.bin
Binary file not shown.
Binary file removed .gradle/8.1/checksums/sha1-checksums.bin
Binary file not shown.
Binary file not shown.
Empty file.
Binary file removed .gradle/8.1/executionHistory/executionHistory.bin
Binary file not shown.
Binary file removed .gradle/8.1/executionHistory/executionHistory.lock
Binary file not shown.
Binary file removed .gradle/8.1/fileChanges/last-build.bin
Binary file not shown.
Binary file removed .gradle/8.1/fileHashes/fileHashes.bin
Binary file not shown.
Binary file removed .gradle/8.1/fileHashes/fileHashes.lock
Binary file not shown.
Empty file removed .gradle/8.1/gc.properties
Empty file.
Binary file removed .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 0 additions & 2 deletions .gradle/buildOutputCleanup/cache.properties

This file was deleted.

Binary file removed .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file removed .gradle/file-system.probe
Binary file not shown.
Empty file removed .gradle/vcs-1/gc.properties
Empty file.
16 changes: 0 additions & 16 deletions .idea/compiler.xml

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

75 changes: 0 additions & 75 deletions .idea/jarRepositories.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/modules/unordinary-basics.main.iml

This file was deleted.

Loading

0 comments on commit f251c36

Please sign in to comment.