Skip to content

Commit

Permalink
1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Treetrain1 committed Jun 13, 2024
1 parent 3a56a83 commit 1e5a385
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 24 deletions.
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ Make sure to clear after release
Put changelog here:

-----------------
- Updated Kotlin to 1.9.24
- Updated Mapping IO to 0.6.1
- Updated Tiny Remapper to 0.10.3
- Updated minimum FLK to 1.10.20+kotlin.1.9.24
- Updated Kotlin to 2.0.0
- Updated minimum FLK to 1.11.0+kotlin.2.0.0
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ buildscript {
}

plugins {
id("fabric-loom") version("1.4.6")
id("fabric-loom") version("1.6.+")
id("org.ajoberstar.grgit") version("+")
id("com.modrinth.minotaur") version("+")
`maven-publish`
eclipse
idea
`java-library`
java
kotlin("jvm") version("1.9.24")
kotlin("jvm") version("2.0.0")
}

val minecraftVersion: String by project
Expand All @@ -52,6 +52,7 @@ version = getVersion()
group = mavenGroup

val supportedMcVersions: List<String> = listOf(
"1.21",
"1.20.6", "1.20.5", "1.20.4", "1.20.2", "1.20.1", "1.20",
"1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19",
"1.18.2", "1.18.1", "1.18",
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ org.gradle.caching=true

# Fabric Properties
# Get new versions at https://fabricmc.net/develop and https://lambdaurora.dev/tools/import_quilt.html
minecraftVersion=1.20.6
quiltMappings=1.20.5+build.1
minecraftVersion=1.21
quiltMappings=1.21-pre4+build.1
parchmentMappings=1.20.6:2024.05.01
loaderVersion=0.15.11

# Mod Properties
modId = fabric_kotlin_extensions
modVersion = 1.0.9
modVersion = 1.1
modLoader = Fabric
mavenGroup = net.frozenblock
baseName = FabricKotlinExtensions

# Dependencies
fabricKotlinVersion=1.10.20+kotlin.1.9.24
fabricKotlinVersion=1.11.0+kotlin.2.0.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Empty file modified gradlew
100644 → 100755
Empty file.
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
`java-library`
java
id("com.github.johnrengelman.shadow") version("+")
kotlin("jvm") version("1.9.24")
kotlin("jvm") version("2.0.0")
}

val modId: String by project
Expand Down
4 changes: 2 additions & 2 deletions library/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ org.gradle.caching=true

# Project Properties
modId = kotlin_library_extensions
projectVersion = 1.0.9
projectVersion = 1.1
mavenGroup = net.frozenblock
baseName = KotlinLibraryExtensions

# Dependencies
fabricKotlinVersion=1.10.20+kotlin.1.9.24
fabricKotlinVersion=1.11.0+kotlin.2.0.0

0 comments on commit 1e5a385

Please sign in to comment.