Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Add Fat Man and Detonator
Browse files Browse the repository at this point in the history
Fat Man now added after sleep depriving model shading issues, which
turned out to be the fault of Forge's older shading pipeline. Enable
the experimental one in the forge-client config.
Detonator added for... detonating. Returns unique messages for
different errors.
Fat Man Kit added for quickly getting all components necessary for
detonation. Colors actually get generated and the implementation is not
going to become a huge ugly file when the project grows.
Gradle updated: 7.1 -> 7.2
Kotlin updated: 1.5.21 -> 1.5.30
Slightly improved Java interoperability, in case anyone will ever use
the API.
  • Loading branch information
MartinTheDragon committed Sep 5, 2021
1 parent a6b2e87 commit b07f0ec
Show file tree
Hide file tree
Showing 75 changed files with 1,908 additions and 248 deletions.
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
mavenCentral()
maven { url = 'https://files.minecraftforge.net/maven' } // using it after central because they messed up their repo
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
Expand Down Expand Up @@ -208,15 +208,17 @@ repositories {
mavenCentral()
}

def kotlinCompilerArgs = ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
freeCompilerArgs += kotlinCompilerArgs
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
freeCompilerArgs += kotlinCompilerArgs
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ org.gradle.daemon=false

#versions
mod_version=0.0.9.0
kotlin_version=1.5.21
kotlin_version=1.5.30
jei_version=7.7.0.106
mekanism_version=1.16.5-10.0.21.448
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ case "`uname`" in
Darwin* )
darwin=true
;;
MINGW* )
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )
Expand Down
16 changes: 13 additions & 3 deletions src/generated/resources/.cache/cache

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 25 additions & 1 deletion src/generated/resources/assets/nucleartech/lang/de_de.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b07f0ec

Please sign in to comment.