Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ buildscript {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}

apply plugin: 'net.minecraftforge.gradle.forge'
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.


version = "1.3.0"
version = "1.4.0"
group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "tinkersaether"

repositories {
maven {
url 'http://dvs1.progwml6.com/files/maven'
url = "https://dvs1.progwml6.com/files/maven"
}
maven {
url = "http://maven.covers1624.net"
url = "https://maven.covers1624.net"
}
}

Expand All @@ -30,9 +30,9 @@ compileJava {
}

minecraft {
version = "1.12.2-14.23.5.2768"
version = "1.12.2-14.23.5.2847"
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
Expand All @@ -44,8 +44,7 @@ minecraft {

dependencies {
deobfCompile "slimeknights.mantle:Mantle:1.12-+"
deobfCompile "slimeknights:TConstruct:1.12.2-2.12.0.+"

deobfCompile "slimeknights:TConstruct:1.12.2-2.13.0.188"
}

processResources {
Expand All @@ -56,11 +55,11 @@ processResources {
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else except the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
117 changes: 69 additions & 48 deletions gradlew

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

53 changes: 26 additions & 27 deletions gradlew.bat

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

Binary file not shown.
4 changes: 2 additions & 2 deletions src/main/java/shnupbups/tinkersaether/TinkersAether.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import slimeknights.tconstruct.library.materials.BowMaterialStats;
import slimeknights.tconstruct.tools.TinkerMaterials;

@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.4.4,);")
@Mod(modid = TinkersAether.modid, name = TinkersAether.name, version = TinkersAether.version, acceptedMinecraftVersions = "[1.12.2]", dependencies = "required-after:mantle;required-after:tconstruct;required-after:aether_legacy@[1.5.0,);")
public class TinkersAether {
public static final String modid = "tinkersaether";
public static final String name = "Tinkers Aether";
public static final String version = "1.3.0";
public static final String version = "1.4.0";

@Mod.Instance(modid)
public static TinkersAether instance;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/shnupbups/tinkersaether/blocks/TABlock.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package shnupbups.tinkersaether.blocks;

import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
import com.gildedgames.the_aether.registry.creative_tabs.AetherCreativeTabs;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.math.BlockPos;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/shnupbups/tinkersaether/items/TAItem.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package shnupbups.tinkersaether.items;

import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
import com.gildedgames.the_aether.registry.creative_tabs.AetherCreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import shnupbups.tinkersaether.TinkersAether;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/shnupbups/tinkersaether/misc/OreDict.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package shnupbups.tinkersaether.misc;

import com.legacy.aether.blocks.BlocksAether;
import com.legacy.aether.items.ItemsAether;
import com.gildedgames.the_aether.blocks.BlocksAether;
import com.gildedgames.the_aether.items.ItemsAether;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package shnupbups.tinkersaether.modules;

import com.legacy.aether.api.enchantments.AetherEnchantment;
import com.legacy.aether.items.ItemsAether;
import com.gildedgames.the_aether.api.enchantments.AetherEnchantment;
import com.gildedgames.the_aether.items.ItemsAether;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
Expand Down
Loading