Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2
|
@ -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()) {
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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": {
|
||||||
|
|
|
@ -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
|
||||||
|
|
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 104 B |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 5.4 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 3.7 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 6.9 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 537 B |
After Width: | Height: | Size: 2.8 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 2.5 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":1
|
||||||
|
}
|
||||||
|
}
|
After Width: | Height: | Size: 1.8 KiB |
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"animation":{
|
||||||
|
"frametime":2
|
||||||
|
}
|
||||||
|
}
|