Skip to content

Commit

Permalink
Merge pull request #153 from VazkiiMods/1.21-dev
Browse files Browse the repository at this point in the history
1.21 dev
  • Loading branch information
Uraneptus authored Aug 16, 2024
2 parents d49800f + 7796f9d commit e36e5cc
Show file tree
Hide file tree
Showing 20 changed files with 404 additions and 351 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Validate gradlew integrity
uses: gradle/wrapper-validation-action@v1
- name: Cache
Expand Down
6 changes: 3 additions & 3 deletions Fabric/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.13.9'
id 'fabric-loom' version '1.7.2'
}

version = "${mc_version}-${build_number}-FABRIC"
Expand Down Expand Up @@ -31,8 +31,8 @@ dependencies {
minecraft "com.mojang:minecraft:${mc_version}"
mappings loom.officialMojangMappings()

modImplementation "net.fabricmc:fabric-loader:0.14.21"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.83.0+1.20"
modImplementation "net.fabricmc:fabric-loader:0.16.0"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.100.8+1.21"

compileOnly project(":Xplat")

Expand Down
9 changes: 5 additions & 4 deletions Fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"authors": [
"Vazkii",
"williewillus",
"Alwinfy"
"Alwinfy",
"Uraneptus"
],
"contact": {
"irc": "ircs://irc.esper.net:6697/vazkii",
Expand All @@ -31,8 +32,8 @@
"accessWidener": "neat.accesswidener",

"depends": {
"fabricloader": ">=0.14.14",
"fabric": ">=0.76",
"minecraft": ">=1.19.4"
"fabricloader": ">=0.15.11",
"fabric": ">=0.100",
"minecraft": ">=1.21"
}
}
86 changes: 0 additions & 86 deletions Forge/build.gradle

This file was deleted.

192 changes: 0 additions & 192 deletions Forge/src/main/java/vazkii/neat/NeatForgeConfig.java

This file was deleted.

26 changes: 0 additions & 26 deletions Forge/src/main/java/vazkii/neat/NeatForgeInitializer.java

This file was deleted.

Loading

0 comments on commit e36e5cc

Please sign in to comment.