Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2

This commit is contained in:
modmuss50 2017-04-14 21:28:02 +01:00
commit b62ac30e9b
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
31 changed files with 327 additions and 211 deletions

View file

@ -61,7 +61,8 @@ repositories {
url = "http://maven.ic2.player.to/" url = "http://maven.ic2.player.to/"
} }
maven {// HWYLA maven {
// HWYLA
name "TehNut" name "TehNut"
url "http://tehnut.info/maven/" url "http://tehnut.info/maven/"
} }
@ -77,7 +78,7 @@ configurations {
} }
version = "2.1.11" version = "2.2.0"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
@ -103,7 +104,7 @@ group = 'TechReborn'
dependencies { dependencies {
deobfCompile ('RebornCore:RebornCore-1.11.2:+:universal'){ deobfCompile('RebornCore:RebornCore-1.11.2:+:universal') {
transitive = false transitive = false
} }
deobfCompile "mezz.jei:jei_1.11.2:+" deobfCompile "mezz.jei:jei_1.11.2:+"
@ -115,13 +116,13 @@ dependencies {
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46" deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24" compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24"
compile ("codechicken:CodeChickenLib:1.11.2-+:deobf"){ compile("codechicken:CodeChickenLib:1.11.2-+:deobf") {
transitive = false transitive = false
} }
compile ("codechicken:NotEnoughItems:1.11.2-+:deobf"){ compile("codechicken:NotEnoughItems:1.11.2-+:deobf") {
transitive = false transitive = false
} }
compile ("codechicken:ForgeMultipart:1.11.2-+:deobf"){ compile("codechicken:ForgeMultipart:1.11.2-+:deobf") {
transitive = false transitive = false
} }
compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110' compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110'
@ -139,7 +140,7 @@ processResources
include 'mcmod.info' include 'mcmod.info'
// replace version and mcversion // replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version expand 'version': project.version, 'mcversion': project.minecraft.version
} }
// copy everything else, thats not the mcmod.info // copy everything else, thats not the mcmod.info
@ -159,13 +160,13 @@ task deobfJar(type: Jar) {
jar { jar {
exclude "**/*.psd" exclude "**/*.psd"
classifier = 'universal' classifier = 'universal'
// configurations.shade.each { dep -> // configurations.shade.each { dep ->
// from(project.zipTree(dep)){ // from(project.zipTree(dep)){
// include 'ic2/api/' // include 'ic2/api/'
// include 'forestry/api/fuels/' // include 'forestry/api/fuels/'
// exclude 'META-INF', 'META-INF/**', '**/*.java' // exclude 'META-INF', 'META-INF/**', '**/*.java'
// } // }
// } // }
} }
task apiJar(type: Jar) { task apiJar(type: Jar) {
@ -191,15 +192,12 @@ uploadArchives {
repositories { repositories {
mavenDeployer { mavenDeployer {
//This is used when the build is done on a slave node //This is used when the build is done on a slave node
if (project.hasProperty('mavenPass')) if (project.hasProperty('mavenPass')) {
{
println 'Uploading to remote Maven Repo' println 'Uploading to remote Maven Repo'
repository(url: "http://mavenupload.modmuss50.me/") { repository(url: "http://mavenupload.modmuss50.me/") {
authentication(userName: "buildslave", password: project.getProperty('mavenPass')) authentication(userName: "buildslave", password: project.getProperty('mavenPass'))
} }
} } else {
else
{
//this is when the build is executed on the master node //this is when the build is executed on the master node
println 'Uploading to local Maven Repo' println 'Uploading to local Maven Repo'
repository(url: "file:///var/www/maven/") repository(url: "file:///var/www/maven/")
@ -233,12 +231,12 @@ uploadArchives {
developer { developer {
id 'modmuss50' id 'modmuss50'
name 'modmuss50' name 'modmuss50'
roles { role 'developer' } roles {role 'developer'}
} }
developer { developer {
id 'Gigabit101' id 'Gigabit101'
name 'Gigabit101' name 'Gigabit101'
roles { role 'developer' } roles {role 'developer'}
} }
} }
} }
@ -276,15 +274,15 @@ task updateMappings(dependsOn: sourceJar) {
into remapped into remapped
include '**/*.java' include '**/*.java'
filter { javaLine -> filter {javaLine ->
map.entrySet().each { entry -> map.entrySet().each {entry ->
javaLine = javaLine.replace(entry.getKey(), entry.getValue()) javaLine = javaLine.replace(entry.getKey(), entry.getValue())
} }
return javaLine return javaLine
} }
includeEmptyDirs = false includeEmptyDirs = false
eachFile { println "Processing: $it.name" } eachFile {println "Processing: $it.name"}
} }
} }
} }
@ -310,14 +308,15 @@ build.dependsOn signJar
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
import org.apache.commons.io.FileUtils; import groovy.util.XmlSlurper
import groovy.util.XmlSlurper; import org.apache.commons.io.FileUtils
import java.io.File;
task curseTools { task curseTools {
doLast { doLast {
def cacheFiles = new File(".gradle/curseTools") def cacheFiles = new File(".gradle/curseTools")
if (!cacheFiles.exists()) cacheFiles.mkdirs() if (!cacheFiles.exists()) {
cacheFiles.mkdirs()
}
def mavenMetadata = new File(cacheFiles, "maven-metadata.xml") def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")

View file

@ -254,7 +254,7 @@ public class ConfigTechReborn {
AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU") AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU")
.getInt(); .getInt();
pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How mutch eu should the pump use to extract the fluid") pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How much eu should the pump use to extract the fluid")
.getInt(); .getInt();
//Transformers //Transformers
@ -332,13 +332,13 @@ public class ConfigTechReborn {
ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000, ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000,
"Set the max charge for the ThermalGenerator").getInt(); "Set the max charge for the ThermalGenerator").getInt();
AverageEuOutTickTime = config.get(CATEGORY_POWER, "config.techreborn.AverageEuOutTickTime", 100, AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100,
"config.techreborn.AverageEuOutTickTime.tooltip").getInt(); "Set the average EU-out tick time").getInt();
LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000, LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000,
"The Amount of energy storage added per Storage block").getInt(); "The Amount of energy storage added per Storage block").getInt();
BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU befor upgrades") BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU before upgrades")
.getInt(); .getInt();
ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt(); ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt();
@ -435,7 +435,7 @@ public class ConfigTechReborn {
.getBoolean(true); .getBoolean(true);
REMOVE_DUPLICATES = config REMOVE_DUPLICATES = config
.get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This atempts to fully intergrate TR with ic2 recipes (Beta)") .get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This attempts to fully integrate TR with ic2 recipes (Beta)")
.getBoolean(false); .getBoolean(false);
disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false); disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false);
@ -592,13 +592,13 @@ public class ConfigTechReborn {
.getBoolean(true); .getBoolean(true);
// Integration // Integration
AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP suport") AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP support")
.getBoolean(true); .getBoolean(true);
AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry suport") AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry support")
.getBoolean(true); .getBoolean(true);
AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura suport") AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura support")
.getBoolean(true); .getBoolean(true);
if (config.hasChanged()) { if (config.hasChanged()) {

View file

@ -107,7 +107,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
if (!super.world.isRemote) { if (!super.world.isRemote) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
final ItemStack stack = this.inventory.getStackInSlot(i); final ItemStack stack = this.inventory.getStackInSlot(i);
if (!stack.isEmpty()) { if (!stack.isEmpty() && spaceForOutput()) {
final int amp = this.getValue(stack); final int amp = this.getValue(stack);
if (amp != 0 && this.canUseEnergy(85)) { if (amp != 0 && this.canUseEnergy(85)) {
this.useEnergy(85); this.useEnergy(85);

View file

@ -19,18 +19,48 @@
"fluid": "fluidcalciumcarbonate" "fluid": "fluidcalciumcarbonate"
} }
}, },
"techreborn.carbon": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidcarbon"
}
},
"techreborn.carbonfiber": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidcarbonfiber"
}
},
"techreborn.chlorite": { "techreborn.chlorite": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidchlorite" "fluid": "fluidchlorite"
} }
}, },
"techreborn.compressedair": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidcompressedair"
}
},
"techreborn.deuterium": { "techreborn.deuterium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluiddeuterium" "fluid": "fluiddeuterium"
} }
}, },
"techreborn.diesel": {
"model": "forge:fluid",
"custom": {
"fluid": "fluiddiesel"
}
},
"techreborn.electrolyzedwater": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidelectrolyzedwater"
}
},
"techreborn.glyceryl": { "techreborn.glyceryl": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
@ -79,12 +109,24 @@
"fluid": "fluidmethane" "fluid": "fluidmethane"
} }
}, },
"techreborn.nitrocarbon": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidnitrocarbon"
}
},
"techreborn.nitrocoalfuel": { "techreborn.nitrocoalfuel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
"fluid": "fluidnitrocoalfuel" "fluid": "fluidnitrocoalfuel"
} }
}, },
"techreborn.nitrodiesel": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidnitrodiesel"
}
},
"techreborn.nitrofuel": { "techreborn.nitrofuel": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
@ -103,6 +145,12 @@
"fluid": "fluidnitrogendioxide" "fluid": "fluidnitrogendioxide"
} }
}, },
"techreborn.oil": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidoil"
}
},
"techreborn.potassium": { "techreborn.potassium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {
@ -127,6 +175,24 @@
"fluid": "fluidsodiumpersulfate" "fluid": "fluidsodiumpersulfate"
} }
}, },
"techreborn.sodiumsulfide": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidsodiumsulfide"
}
},
"techreborn.sulfur": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidsulfur"
}
},
"techreborn.sulfuricacid": {
"model": "forge:fluid",
"custom": {
"fluid": "fluidsulfuricacid"
}
},
"techreborn.tritium": { "techreborn.tritium": {
"model": "forge:fluid", "model": "forge:fluid",
"custom": { "custom": {

View file

@ -1,4 +1,4 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "builtin/generated", "model": "builtin/generated",

View file

@ -972,8 +972,9 @@ death.attack.shock=%s was electrocuted
#Entitys #Entitys
entity.techreborn.nuke.name=Nuke entity.nuke.name=Nuke
#Tooltips
tooltip.wip=WIP Coming Soon tooltip.wip=WIP Coming Soon
tooltip.upBroken=Upgrades DO NOT function! tooltip.upBroken=Upgrades DO NOT function!
tooltip.ingredient=Currently only a crafting ingredient tooltip.ingredient=Currently only a crafting ingredient

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 537 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 653 B