Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
This commit is contained in:
modmuss50 2015-11-08 12:34:18 +00:00
commit ef03cf50a9
23 changed files with 888 additions and 654 deletions

View file

@ -66,9 +66,9 @@ configurations {
def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {
version = "0.5.5." + "${System.getenv().BUILD_NUMBER}"
version = "0.5.6." + "${System.getenv().BUILD_NUMBER}"
} else {
version = "0.5.5.BUILD"
version = "0.5.6.BUILD"
}
minecraft {
@ -116,8 +116,8 @@ dependencies {
compile 'Azanor:Thaumcraft:4.2.3.5:deobf@jar'
compile "com.github.azanor:baubles:1.0.1.10:deobf@jar"
compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev"
shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:0.0.0.1:dev'
compile 'RebornCore:RebornCore:1.1.0.19-5:api'
shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api'
compile 'RebornCore:RebornCore:0.0.0.3:dev'
testCompile 'junit:junit:4.12'
}