Merge branch 'refs/heads/main' into dev

# Conflicts:
#	gradle.properties
This commit is contained in:
FlorianMichael 2024-05-26 21:27:58 +02:00
commit c455ccbc98
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
8 changed files with 11 additions and 11 deletions

View File

@ -3,7 +3,7 @@ on: [ pull_request, push ]
jobs: jobs:
build: build:
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4

View File

@ -4,7 +4,7 @@ on: [workflow_dispatch] # Manual trigger
jobs: jobs:
publish: publish:
if: github.repository_owner == 'ViaVersion' if: github.repository_owner == 'ViaVersion'
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4

View File

@ -10,7 +10,7 @@ plugins {
id "java" id "java"
id "maven-publish" id "maven-publish"
id "org.ajoberstar.grgit" version "5.2.2" id "org.ajoberstar.grgit" version "5.2.2"
id "com.matthewprenger.cursegradle" version "1.4.0" id "com.matthewprenger.cursegradle" version "1.4.0" // This repository is archived on GH
id "com.modrinth.minotaur" version "2.8.7" id "com.modrinth.minotaur" version "2.8.7"
id "fabric-loom" version "1.6-SNAPSHOT" apply false id "fabric-loom" version "1.6-SNAPSHOT" apply false
id "com.github.ben-manes.versions" version "0.51.0" id "com.github.ben-manes.versions" version "0.51.0"

View File

@ -3,5 +3,5 @@
before_install: before_install:
- curl -s "https://get.sdkman.io" | bash - curl -s "https://get.sdkman.io" | bash
- source ~/.sdkman/bin/sdkman-init.sh - source ~/.sdkman/bin/sdkman-init.sh
- sdk install java 21.0.2-tem - sdk install java 21.0.3-tem
- sdk use java 21.0.2-tem - sdk use java 21.0.3-tem

View File

@ -2,7 +2,7 @@ dependencies {
minecraft("com.mojang:minecraft:1.12.2") minecraft("com.mojang:minecraft:1.12.2")
mappings("net.legacyfabric:yarn:1.12.2+build.541:v2") mappings("net.legacyfabric:yarn:1.12.2+build.541:v2")
modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.3+1.12.2") modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.4+1.12.2")
// fix newer java // fix newer java
@Suppress("GradlePackageUpdate", "RedundantSuppression") @Suppress("GradlePackageUpdate", "RedundantSuppression")

View File

@ -1,9 +1,9 @@
dependencies { dependencies {
minecraft("com.mojang:minecraft:1.20.1") minecraft("com.mojang:minecraft:1.20.1")
mappings("net.fabricmc:yarn:1.20.1+build.2:v2") mappings("net.fabricmc:yarn:1.20.1+build.10:v2")
modImplementation("net.fabricmc.fabric-api:fabric-api:0.83.1+1.20.1") modImplementation("net.fabricmc.fabric-api:fabric-api:0.92.1+1.20.1")
modImplementation("com.terraformersmc:modmenu:7.1.0") modImplementation("com.terraformersmc:modmenu:7.2.2")
} }
tasks.compileJava { tasks.compileJava {

View File

@ -2,7 +2,7 @@ dependencies {
minecraft("com.mojang:minecraft:1.20.6") minecraft("com.mojang:minecraft:1.20.6")
mappings("net.fabricmc:yarn:1.20.6+build.1:v2") mappings("net.fabricmc:yarn:1.20.6+build.1:v2")
modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.8+1.20.6") modImplementation("net.fabricmc.fabric-api:fabric-api:0.98.0+1.20.6")
modImplementation("com.terraformersmc:modmenu:10.0.0-beta.1") modImplementation("com.terraformersmc:modmenu:10.0.0-beta.1")
} }

View File

@ -2,7 +2,7 @@ dependencies {
minecraft("com.mojang:minecraft:1.8.9") minecraft("com.mojang:minecraft:1.8.9")
mappings("net.legacyfabric:yarn:1.8.9+build.541:v2") mappings("net.legacyfabric:yarn:1.8.9+build.541:v2")
modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.3+1.8.9") modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.4+1.8.9")
modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") { modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {
isTransitive = false isTransitive = false
} }