aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2023-12-11 11:36:35 +0100
committerMartin Robertz <dream-master@gmx.net>2023-12-11 11:36:35 +0100
commitd7a1a4b22867b6ff868e8875358c1de0c8ecf728 (patch)
tree5eb3cba313d681a40ff70c128760d5d236cb78d7
parent0c13f3d3ee454841b057ed029247c3c08da6c449 (diff)
downloadGT5-Unofficial-d7a1a4b22867b6ff868e8875358c1de0c8ecf728.tar.gz
GT5-Unofficial-d7a1a4b22867b6ff868e8875358c1de0c8ecf728.tar.bz2
GT5-Unofficial-d7a1a4b22867b6ff868e8875358c1de0c8ecf728.zip
update bs+sa+deps
-rw-r--r--build.gradle8
-rw-r--r--dependencies.gradle8
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java7
3 files changed, 10 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle
index 8507c7dfbd..50c3291c86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1701530445
+//version: 1702141377
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -54,7 +54,7 @@ plugins {
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
- id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
+ id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
}
print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -613,7 +613,7 @@ repositories {
}
maven {
name = "ic2"
- url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/")
+ url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
content {
includeGroup "net.industrial-craft"
}
@@ -672,6 +672,8 @@ configurations.all {
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
+
+ substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index e9692b4dcd..93178a86c1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,14 +2,14 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
- api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.98:dev')
+ api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.106:dev')
api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev')
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false}
compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:dev') {transitive=false}
- compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.38:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.45:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Avaritia:1.46:dev') {transitive=false}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
@@ -18,8 +18,8 @@ dependencies {
// for testing EOH recipes
//runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf")
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev')
- //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.44:dev')
- //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.7.10:dev') {
+ //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.50:dev')
+ //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.7.14:dev') {
// exclude group: "com.github.GTNewHorizons", module: "TecTech"
//}
//runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive=false}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index 9788e9e398..b4c15603a7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -68,7 +68,6 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa
import com.gtnewhorizon.structurelib.structure.IItemSource;
import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import appeng.util.ReadableNumberConverter;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.Materials;
@@ -1501,11 +1500,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
if (abs(euPerTick.longValue()) < LongMath.pow(10, 12)) {
str.add("Estimated EU/t: " + RED + formatNumbers(euPerTick) + RESET + " EU/t");
} else {
- str.add(
- "Estimated EU/t: " + RED
- + toStandardForm(euPerTick.longValue())
- + RESET
- + " EU/t");
+ str.add("Estimated EU/t: " + RED + toStandardForm(euPerTick.longValue()) + RESET + " EU/t");
}
str.add(GOLD + "-----------------------------------------------------");
}