-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'relictus' into plus-pr-552
# Conflicts: # src/client/java/minicraft/entity/Arrow.java # src/client/java/minicraft/entity/FireSpark.java # src/client/java/minicraft/entity/Spark.java # src/client/java/minicraft/entity/furniture/Crafter.java # src/client/java/minicraft/entity/mob/AirWizard.java # src/client/java/minicraft/entity/mob/EnemyMob.java # src/client/java/minicraft/entity/mob/Mob.java # src/client/java/minicraft/entity/mob/ObsidianKnight.java # src/client/java/minicraft/entity/mob/PassiveMob.java # src/client/java/minicraft/entity/mob/Player.java # src/client/java/minicraft/entity/particle/Particle.java # src/client/java/minicraft/item/ToolItem.java # src/client/java/minicraft/level/tile/CactusTile.java # src/client/java/minicraft/level/tile/ConnectTile.java # src/client/java/minicraft/level/tile/ExplodedTile.java # src/client/java/minicraft/level/tile/HoleTile.java # src/client/java/minicraft/level/tile/LavaTile.java # src/client/java/minicraft/level/tile/SaplingTile.java # src/client/java/minicraft/level/tile/SignTile.java # src/client/java/minicraft/level/tile/TreeTile.java # src/client/java/minicraft/level/tile/WaterTile.java
- Loading branch information
Showing
133 changed files
with
2,712 additions
and
2,174 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
blank_issues_enabled: false | ||
contact_links: | ||
- name: Question | ||
url: https://github.com/MinicraftPlus/minicraft-plus-revived/discussions | ||
url: https://github.com/AnvilloyDevStudio/TerraModulus/discussions | ||
about: Ask a question |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
name: Feature Request | ||
description: Submit a feature request. | ||
labels: ["triage"] | ||
body: | ||
- type: markdown | ||
attributes: | ||
value: | | ||
Please submit a request of a certain functionality or feature. | ||
- type: textarea | ||
id: background | ||
attributes: | ||
label: Background | ||
description: Introduction or background information to certain feature | ||
placeholder: Background | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: details | ||
attributes: | ||
label: Details | ||
description: Describe your feature request | ||
placeholder: Details | ||
validations: | ||
required: true | ||
- type: textarea | ||
id: suggestion | ||
attributes: | ||
label: Suggestion | ||
description: Describe your additional suggestions to the feature | ||
placeholder: Suggestions | ||
validations: | ||
required: false | ||
# - type: checkboxes | ||
# id: terms | ||
# attributes: | ||
# label: Code of Conduct | ||
# description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com). | ||
# options: | ||
# - label: I agree to follow this project's Code of Conduct | ||
# required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# 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/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file | ||
|
||
version: 2 | ||
updates: | ||
- package-ecosystem: "gradle" # See documentation for possible values | ||
directory: "/" # Location of package manifests | ||
labels: ["type: Dependency Bump"] | ||
open-pull-requests-limit: 8 | ||
schedule: | ||
interval: "daily" | ||
ignore: | ||
- dependency-name: "org.tinylog*" | ||
groups: | ||
badlogicgames: | ||
patterns: | ||
- "com.badlogicgames*" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
name: Dependency Submission | ||
|
||
on: | ||
push: | ||
branches: [ 'main' ] | ||
|
||
permissions: | ||
contents: write | ||
|
||
jobs: | ||
dependency-submission: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout sources | ||
uses: actions/checkout@v4 | ||
- name: Setup Java | ||
uses: actions/setup-java@v4 | ||
with: | ||
distribution: 'temurin' | ||
java-version: 17 | ||
- name: Generate and submit dependency graph | ||
uses: gradle/actions/dependency-submission@v4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Auto Label on Comment | ||
|
||
on: | ||
issue_comment: | ||
types: [created] | ||
|
||
jobs: | ||
auto-label: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v4 | ||
|
||
- name: Add label # Credit: Copilot | ||
run: | | ||
AUTHOR="${{ github.event.comment.user.login }}" | ||
COMMENT_BODY="${{ github.event.comment.body }}" | ||
if [[ "${COMMENT_BODY,,}" =~ ^superseded\ by.* ]] && [[ "$AUTHOR" == "dependabot" || "$(gh api user/$AUTHOR | jq -r '.site_admin')" == "true" ]]; then | ||
gh auth login --with-token $GITHUB_TOKEN | ||
gh issue edit ${{ github.event.issue.id }} --add-label "status: Superseded" | ||
fi | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
Oops, something went wrong.