From 5d6ef59f521f51176403d7d91201f95cfe500842 Mon Sep 17 00:00:00 2001 From: John <24556317+Johnnycyan@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:41:00 -0400 Subject: [PATCH 1/3] Fix tooltip for Vis Discount on Nano Wings, which propogates to Quantum Wings as well. --- src/main/java/emt/item/armor/wings/ItemNanoWing.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index e277ff6..9a4dbd7 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -18,6 +18,7 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.util.EMTTextHelper; import emt.util.EMTConfigHandler; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; @@ -140,6 +141,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); + list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%"); } public double getDamageAbsorptionRatio() { From 76e308bd708740c25539f1366a126f8cf300fb01 Mon Sep 17 00:00:00 2001 From: Dream Master Date: Fri, 31 Oct 2025 13:46:28 +0100 Subject: [PATCH 2/3] sa --- src/main/java/emt/item/armor/wings/ItemNanoWing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 9a4dbd7..2e600c6 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -18,8 +18,8 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.util.EMTTextHelper; import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import gregtech.api.hazards.Hazard; import gregtech.api.hazards.IHazardProtector; import ic2.api.item.ElectricItem; From e1fffc8eb62e111cb09a681509cd16c92b5b3816 Mon Sep 17 00:00:00 2001 From: Dream Master Date: Fri, 31 Oct 2025 13:46:57 +0100 Subject: [PATCH 3/3] update --- dependencies.gradle | 2 +- gradle.properties | 6 ++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d591593..ee97dac 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,5 +11,5 @@ dependencies { api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.85:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.87:dev') } diff --git a/gradle.properties b/gradle.properties index 7d3d420..2c81464 100644 --- a/gradle.properties +++ b/gradle.properties @@ -174,6 +174,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. # customArchiveBaseName = +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 05c912e..e883289 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.47' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' }