Skip to content

Commit 5d8a4a6

Browse files
committed
Merge branch 'fabric-1.21' into fabric-1.21.7
2 parents 0c3a188 + 349ffa8 commit 5d8a4a6

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
distribution: 'temurin'
2626

2727
- name: Gradle Setup
28-
uses: gradle/actions/setup-gradle@v3
28+
uses: gradle/actions/setup-gradle@v4
2929
with:
3030
validate-wrappers: true
3131

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
distribution: 'temurin'
2525

2626
- name: Gradle Setup
27-
uses: gradle/actions/setup-gradle@v3
27+
uses: gradle/actions/setup-gradle@v4
2828
with:
2929
validate-wrappers: true
3030

build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ java {
5353
targetCompatibility = JavaVersion.VERSION_21
5454
}
5555

56-
jar {
57-
from("LICENSE") {
58-
rename { "${it}_${archivesBaseName}" }
59-
}
60-
}
6156

6257
publishing {
6358
repositories {

gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Gradle
2-
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
2+
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
33
org.gradle.caching=true
4-
org.gradle.parallel=true
5-
org.gradle.caching.debug=false
64
org.gradle.configureondemand=true
5+
org.gradle.configuration-cache=true
76
# Loom
87
fabric.loom.multiProjectOptimisation=true
98
# Mod Metadata

src/main/java/io/github/username/mod_id/ModId.java renamed to src/main/java/io/github/username/modid/ModId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.username.mod_id;
1+
package io.github.username.modid;
22

33
import net.fabricmc.api.ModInitializer;
44
import org.slf4j.Logger;

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"entrypoints": {
3131
"main": [
32-
"io.github.username.mod_id.ModId"
32+
"io.github.username.modid.ModId"
3333
],
3434
"client": [
3535
]

src/main/resources/mod_id.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"required": true,
33
"minVersion": "0.8",
4-
"package": "io.github.username.mod_id.mixin",
4+
"package": "io.github.username.modid.mixin",
55
"compatibilityLevel": "JAVA_21",
66
"mixins": [
77
],

0 commit comments

Comments
 (0)