diff --git a/build.gradle b/build.gradle index cb4dac2..f4683fa 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,21 @@ buildscript { name = "github" url = "https://github.com/juanmuscaria/maven/raw/master" } + maven { + name 'forge' + url 'https://maven.minecraftforge.net' + } + maven { + name 'sonatype' + url 'https://oss.sonatype.org/content/repositories/snapshots/' + } maven { name = "jitpack" url = "https://jitpack.io" } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5' + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' } } @@ -57,7 +65,7 @@ dependencies { compile 'codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev' compile 'codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev' - shade "com.github.towdium:pinin:${verpinin}" + shade files("libs/PinIn-1.5.0-all.jar") } @@ -97,8 +105,8 @@ artifacts { jar { configurations.shade.each { dep -> - from(project.zipTree(dep)){ - exclude 'META-INF', 'META-INF/**' + from(project.zipTree(dep)) { + include 'me/towdium/pinin/**' } } diff --git a/gradle.properties b/gradle.properties index 6e2c2af..4f9ec6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false # General Specifications mc_version=1.7.10 -mod_version=1.4.6 +mod_version=1.4.7 forge_version=10.13.4.1614 mod_group=com.github.vfyjxf.nechar mod_id=nechar diff --git a/libs/PinIn-1.5.0-all.jar b/libs/PinIn-1.5.0-all.jar new file mode 100644 index 0000000..638f554 Binary files /dev/null and b/libs/PinIn-1.5.0-all.jar differ diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java index 3e63ee3..635e20c 100644 --- a/src/main/java/net/vfyjxf/nechar/NechConfig.java +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -26,6 +26,7 @@ public class NechConfig { "extracells.gui.GuiFluidTerminal:updateFluids",//Extra Cells FluidTerminal search "extracells.gui.GuiFluidStorage:updateFluids", //Extra Cells wireless terminal search "witchinggadgets.client.ThaumonomiconIndexSearcher:buildEntryList", //Witching Gadgets Thaumonomicon search + "net.glease.tc4tweak.modules.researchBrowser.ThaumonomiconIndexSearcher:buildEntryList", // TC4 Tweaks Thaumonomicon search "appeng.client.gui.implementations.GuiInterfaceTerminal:refreshList", //Applied-Energistics-2 InterfaceTerminal "appeng.client.gui.implementations.GuiInterfaceTerminal:itemStackMatchesSearchTerm", //Applied-Energistics-2 InterfaceTerminal "vswe.stevesfactory.components.ComponentMenuLiquid:updateSearch", // Steve's Factory Manager liquid search