Skip to content

Commit fcfb23d

Browse files
committed
Fix build
1 parent a3d1af4 commit fcfb23d

File tree

8 files changed

+22
-26
lines changed

8 files changed

+22
-26
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- name: Validate Gradle wrapper
11-
uses: gradle/wrapper-validation-action@v2
1210
- name: Set up JDK 17
1311
uses: actions/setup-java@v4
1412
with:
1513
distribution: temurin
1614
java-version: 17
1715
check-latest: true
16+
- name: Setup Gradle
17+
uses: gradle/actions/setup-gradle@v5
1818
- name: Build artifacts
1919
run: ./gradlew build --stacktrace
2020
- name: Upload artifacts

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ repositories {
2727
name 'Modrinth'
2828
url 'https://api.modrinth.com/maven'
2929
}
30-
maven {
31-
name 'VRAM'
32-
url 'https://maven.vram.io'
33-
}
3430
maven {
3531
name 'Shedaniel'
3632
url 'https://maven.shedaniel.me'
@@ -50,7 +46,7 @@ dependencies {
5046
exclude group: 'net.fabricmc.fabric-api'
5147
}
5248

53-
modCompileOnly "io.vram:canvas-fabric:${canvas_version}"
49+
modCompileOnly "maven.modrinth:canvas:fabric-${canvas_version}"
5450
}
5551

5652
processResources {

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ org.gradle.jvmargs = -Xmx1G
33
org.gradle.parallel = true
44

55
# Fabric Properties
6-
loom_version = 1.10.5
6+
loom_version = 1.12.7
77
minecraft_version = 1.20.1
88
yarn_mappings = 1.20.1+build.10
9-
loader_version = 0.16.14
9+
loader_version = 0.17.3
1010

1111
# Mod Properties
1212
mod_version = 3.0.1
@@ -17,4 +17,4 @@ archives_base_name = continuity
1717
# Dependencies
1818
fabric_version = 0.89.0+1.20.1
1919
modmenu_version = 7.2.2
20-
canvas_version = 20.1.2632
20+
canvas_version = 20.0.2625

gradle/wrapper/gradle-wrapper.jar

59 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"options.continuity.title": "Continuity Configuratie",
3-
"options.continuity.connected_textures": "Verbonden Texturen",
4-
"options.continuity.connected_textures.tooltip": "Verbonden texturen voor blokken in- of uitschakelen.",
5-
"options.continuity.emissive_textures": "Emissieve texturen",
6-
"options.continuity.emissive_textures.tooltip": "Emissieve texturen voor blok- en itemmodellen in- of uitschakelen.",
7-
"options.continuity.custom_block_layers": "Aangepaste Bloklagen",
8-
"options.continuity.custom_block_layers.tooltip": "Aangepaste bloklagen in- of uitschakelen.",
9-
"resourcePack.continuity.default.name": "Standaard Verbonden Texturen",
10-
"resourcePack.continuity.default.description": "Glas, zandsteen, boekenkasten",
11-
"resourcePack.continuity.glass_pane_culling_fix.name": "Reparatie voor het verwijderen van glasplaten",
12-
"resourcePack.continuity.glass_pane_culling_fix.description": "Vlakken tussen glasplaten verwijderen"
2+
"options.continuity.title": "Continuity Configuratie",
3+
"options.continuity.connected_textures": "Verbonden Texturen",
4+
"options.continuity.connected_textures.tooltip": "Verbonden texturen voor blokken in- of uitschakelen.",
5+
"options.continuity.emissive_textures": "Emissieve texturen",
6+
"options.continuity.emissive_textures.tooltip": "Emissieve texturen voor blok- en itemmodellen in- of uitschakelen.",
7+
"options.continuity.custom_block_layers": "Aangepaste Bloklagen",
8+
"options.continuity.custom_block_layers.tooltip": "Aangepaste bloklagen in- of uitschakelen.",
9+
"resourcePack.continuity.default.name": "Standaard Verbonden Texturen",
10+
"resourcePack.continuity.default.description": "Glas, zandsteen, boekenkasten",
11+
"resourcePack.continuity.glass_pane_culling_fix.name": "Reparatie voor het verwijderen van glasplaten",
12+
"resourcePack.continuity.glass_pane_culling_fix.description": "Vlakken tussen glasplaten verwijderen"
1313
}

0 commit comments

Comments
 (0)