Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep

# Conflicts:
#	src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
#	src/main/java/techreborn/client/container/ContainerPda.java
#	src/main/java/techreborn/client/gui/TRBuilder.java
#	src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
#	src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
#	src/main/java/techreborn/compat/jei/RecipeUtil.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
#	src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
#	src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
#	src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
#	src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
#	src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
#	src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
#	src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
#	src/main/java/techreborn/init/ModBlocks.java
#	src/main/java/techreborn/init/ModTileEntities.java
#	src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
#	src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
#	src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
#	src/main/resources/assets/techreborn/lang/en_us.lang
#	src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
#	src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
#	src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
#	src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
#	src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
#	src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
This commit is contained in:
Modmuss50 2018-09-05 17:49:49 +01:00
commit 6060a97855
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
77 changed files with 1863 additions and 4017 deletions

View file

@ -1,6 +1,6 @@
![](https://i.imgur.com/evHOtQl.png "Tech Reborn") ![](https://i.imgur.com/evHOtQl.png "Tech Reborn")
[![](http://cf.way2muchnoise.eu/full_233564_downloads.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](http://cf.way2muchnoise.eu/versions/233564.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](https://img.shields.io/badge/Discord-TeamReborn-738bd7.svg)](https://discord.gg/teamreborn) [![](http://cf.way2muchnoise.eu/full_233564_downloads.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](http://cf.way2muchnoise.eu/versions/233564.svg)](https://minecraft.curseforge.com/projects/techreborn) [![](https://img.shields.io/badge/Discord-TeamReborn-738bd7.svg)](https://discord.gg/teamreborn) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/techreborn/localized.svg)](https://translate.techreborn.ovh/project/techreborn)
# Tech Reborn for 1.12 [![Build Status](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.12/badge/icon)](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.12/) # Tech Reborn for 1.12 [![Build Status](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.12/badge/icon)](https://jenkins.modmuss50.me/job/Team%20Reborn/job/TechReborn/job/1.12/)
@ -31,6 +31,10 @@ If you're looking for the latest bleeding edge build, these are found on our Jen
To report an issue or make a suggestion, please head up to the `Issues` tab up above, and open a new issue. You will need a GitHub account for this (it's free!). **It is very important that you include the version of Tech Reborn you are using in your issue report.** To report an issue or make a suggestion, please head up to the `Issues` tab up above, and open a new issue. You will need a GitHub account for this (it's free!). **It is very important that you include the version of Tech Reborn you are using in your issue report.**
# Translation
Techreborn is available in a range of diffrent languages, if you want to help out translate the mod please see our crowdin project at [https://translate.techreborn.ovh/](https://translate.techreborn.ovh/) The translations are automaticly included in the jar files at build time.
# Screenshots # Screenshots
**Please note that the following screenshots use the new Tech Reborn textures that are in the 1.11+ releases:** **Please note that the following screenshots use the new Tech Reborn textures that are in the 1.11+ releases:**

View file

@ -1,6 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
jcenter()
maven { maven {
name = "forge" name = "forge"
url = "http://files.minecraftforge.net/maven" url = "http://files.minecraftforge.net/maven"
@ -16,6 +17,7 @@ buildscript {
dependencies { dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath "gradle.plugin.net.minecrell:licenser:0.2.1" classpath "gradle.plugin.net.minecrell:licenser:0.2.1"
classpath 'de.undercouch:gradle-download-task:3.4.3'
} }
} }
@ -23,6 +25,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: net.minecrell.gradle.licenser.Licenser apply plugin: net.minecrell.gradle.licenser.Licenser
apply plugin: 'de.undercouch.download'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
@ -35,7 +38,7 @@ repositories {
} }
} }
version = "2.16.2" version = "2.17.3"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
@ -111,6 +114,9 @@ jar {
manifest { manifest {
attributes 'FMLAT': 'techreborn_at.cfg' attributes 'FMLAT': 'techreborn_at.cfg'
} }
from { crowdin.getDidWork() ? fileTree('build/translations').matching{exclude "**/en_US.lang"} : null}
dependsOn 'renameCrowdin'
} }
task apiJar(type: Jar) { task apiJar(type: Jar) {
@ -125,6 +131,41 @@ apiJar.mustRunAfter deobfJar
build.dependsOn deobfJar, apiJar build.dependsOn deobfJar, apiJar
//Triggers crowdin to export the latest translations
task crowdinExport() {
onlyIf {
project.hasProperty('crowdinKey')
}
doLast{
def apiKey = project.crowdinKey
def projectId = 'techreborn'
def response = new URL(sprintf('https://api.crowdin.com/api/project/%1$s/export?key=%2$s', [projectId, apiKey])).text
def metadata = new XmlParser().parseText(response)
project.logger.lifecycle("crowdin export status: " + metadata.@status)
}
}
task crowdin(type: Download, dependsOn: 'crowdinExport'){
src 'https://crowdin.com/backend/download/project/techreborn.zip'
dest file("build/translations.zip")
overwrite true
}
task cleanCrowdin(type: Delete){
delete 'build/translations'
}
//Renames the translation files to be all lower case
task renameCrowdin(type: Copy, dependsOn: ['crowdin', 'cleanCrowdin']){
mustRunAfter 'crowdin'
from zipTree(file("build/translations.zip"))
into file('build/translations')
rename {
String filename -> return filename.toLowerCase()
}
}
publishing { publishing {
publications { publications {
maven(MavenPublication) { maven(MavenPublication) {

View file

@ -24,6 +24,7 @@
package techreborn.api.fluidreplicator; package techreborn.api.fluidreplicator;
import reborncore.common.util.FluidUtils;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
@ -114,11 +115,11 @@ public class FluidReplicatorRecipe implements Cloneable {
if (fluid == null) { if (fluid == null) {
return false; return false;
} }
if (!fluid.equals(output)) { if (!FluidUtils.fluidEquals(fluid, output)) {
return false; return false;
} }
final Fluid tankFluid = tile.tank.getFluidType(); final Fluid tankFluid = tile.tank.getFluidType();
if (tankFluid != null && !tankFluid.equals(output)) { if (tankFluid != null && !FluidUtils.fluidEquals(tankFluid, fluid)) {
return false; return false;
} }

View file

@ -26,6 +26,7 @@ package techreborn.api.fluidreplicator;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import reborncore.common.util.FluidUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Optional; import java.util.Optional;
@ -72,6 +73,6 @@ public class FluidReplicatorRecipeList {
* @return FluidReplicatorRecipe Recipe for fluid provided * @return FluidReplicatorRecipe Recipe for fluid provided
*/ */
public static Optional<FluidReplicatorRecipe> getRecipeForFluid(Fluid fluid) { public static Optional<FluidReplicatorRecipe> getRecipeForFluid(Fluid fluid) {
return recipes.stream().filter(recipe -> recipe.getFluid().equals(fluid)).findAny(); return recipes.stream().filter(recipe -> FluidUtils.fluidEquals(recipe.getFluid(), fluid)).findAny();
} }
} }

View file

@ -25,6 +25,7 @@
package techreborn.api.generator; package techreborn.api.generator;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import reborncore.common.util.FluidUtils;
public class FluidGeneratorRecipe { public class FluidGeneratorRecipe {
private final EFluidGenerator generatorType; private final EFluidGenerator generatorType;
@ -79,7 +80,7 @@ public class FluidGeneratorRecipe {
if (fluid == null) { if (fluid == null) {
if (other.fluid != null) if (other.fluid != null)
return false; return false;
} else if (!fluid.equals(other.fluid)) } else if (!FluidUtils.fluidEquals(other.fluid, fluid))
return false; return false;
if (generatorType != other.generatorType) if (generatorType != other.generatorType)
return false; return false;

View file

@ -26,6 +26,7 @@ package techreborn.api.generator;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import reborncore.common.util.FluidUtils;
import java.util.HashSet; import java.util.HashSet;
import java.util.Optional; import java.util.Optional;
@ -48,7 +49,7 @@ public class FluidGeneratorRecipeList {
} }
public Optional<FluidGeneratorRecipe> getRecipeForFluid(Fluid fluid) { public Optional<FluidGeneratorRecipe> getRecipeForFluid(Fluid fluid) {
return this.recipes.stream().filter(recipe -> recipe.getFluid().equals(fluid)).findAny(); return this.recipes.stream().filter(recipe -> FluidUtils.fluidEquals(recipe.getFluid(), fluid)).findAny();
} }
public HashSet<FluidGeneratorRecipe> getRecipes() { public HashSet<FluidGeneratorRecipe> getRecipes() {

View file

@ -228,7 +228,7 @@ public class BlockCable extends BlockContainer {
@Override @Override
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) { public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
return getStateFromMeta(placer.getHeldItem(hand).getItemDamage()); return getStateFromMeta(meta);
} }
@Override @Override

View file

@ -0,0 +1,69 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.blocks.tier3;
import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileCreativeQuantumChest;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCreativeQuantumChest extends BlockMachineBase {
public BlockCreativeQuantumChest() {
super();
this.setUnlocalizedName("techreborn.creativeQuantumChest");
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileCreativeQuantumChest();
}
@Override
public IMachineGuiHandler getGui() {
return EGui.QUANTUM_CHEST;
}
@Override
public boolean isAdvanced() {
return true;
}
@Override
public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
//lets not drop max int items into the world, that sounds like a bad idea
worldIn.removeTileEntity(pos);
}
}

View file

@ -0,0 +1,60 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.blocks.tier3;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.api.tile.IMachineGuiHandler;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileCreativeQuantumTank;
import techreborn.utils.TechRebornCreativeTab;
public class BlockCreativeQuantumTank extends BlockMachineBase {
public BlockCreativeQuantumTank() {
super();
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileCreativeQuantumTank();
}
@Override
public IMachineGuiHandler getGui() {
return EGui.QUANTUM_TANK;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -37,6 +37,7 @@ public class ContainerDestructoPack extends RebornContainer {
private EntityPlayer player; private EntityPlayer player;
private Inventory inv; private Inventory inv;
@SuppressWarnings("deprecation")
public ContainerDestructoPack(EntityPlayer player) { public ContainerDestructoPack(EntityPlayer player) {
super(null); super(null);
this.player = player; this.player = player;

View file

@ -61,7 +61,7 @@ public class GuiAESU extends GuiBase {
super.drawGuiContainerForegroundLayer(mouseX, mouseY); super.drawGuiContainerForegroundLayer(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(!GuiBase.showSlotConfig){ if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.scale(0.6, 0.6, 1); GlStateManager.scale(0.6, 0.6, 1);
this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getEnergy()) + "/" this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getEnergy()) + "/"

View file

@ -28,7 +28,9 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.client.config.GuiUtils;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@ -36,8 +38,11 @@ import org.lwjgl.input.Keyboard;
import reborncore.api.tile.IUpgradeable; import reborncore.api.tile.IUpgradeable;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.gui.slot.GuiFluidConfiguration;
import techreborn.client.gui.slot.GuiSlotConfiguration; import techreborn.client.gui.slot.GuiSlotConfiguration;
import techreborn.client.gui.widget.GuiButtonPowerBar; import techreborn.client.gui.widget.GuiButtonPowerBar;
import techreborn.init.ModItems;
import techreborn.items.DynamicCell;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -53,7 +58,7 @@ public class GuiBase extends GuiContainer {
public TRBuilder builder = new TRBuilder(); public TRBuilder builder = new TRBuilder();
public TileEntity tile; public TileEntity tile;
public BuiltContainer container; public BuiltContainer container;
public static boolean showSlotConfig = false; public static SlotConfigType slotConfigType = SlotConfigType.NONE;
public boolean upgrades; public boolean upgrades;
@ -61,7 +66,7 @@ public class GuiBase extends GuiContainer {
super(container); super(container);
this.tile = tile; this.tile = tile;
this.container = container; this.container = container;
showSlotConfig = false; slotConfigType = SlotConfigType.NONE;
} }
protected void drawSlot(int x, int y, Layer layer) { protected void drawSlot(int x, int y, Layer layer) {
@ -119,6 +124,9 @@ public class GuiBase extends GuiContainer {
public void initGui() { public void initGui() {
super.initGui(); super.initGui();
GuiSlotConfiguration.init(this); GuiSlotConfiguration.init(this);
if(getMachine().getTank() != null && getMachine().showTankConfig()){
GuiFluidConfiguration.init(this);
}
} }
@Override @Override
@ -136,7 +144,10 @@ public class GuiBase extends GuiContainer {
} }
} }
if(getMachine().hasSlotConfig()){ if(getMachine().hasSlotConfig()){
builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades); builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades, new ItemStack(ModItems.WRENCH));
}
if(getMachine().showTankConfig()){
builder.drawSlotTab(this, guiLeft, guiTop + 27, mouseX, mouseY, upgrades, DynamicCell.getCellWithFluid(FluidRegistry.LAVA));
} }
} }
@ -153,10 +164,14 @@ public class GuiBase extends GuiContainer {
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.buttonList.clear(); this.buttonList.clear();
drawTitle(); drawTitle();
if(showSlotConfig && getMachine().hasSlotConfig()){ if(slotConfigType == SlotConfigType.ITEMS && getMachine().hasSlotConfig()){
GuiSlotConfiguration.draw(this, mouseX, mouseY); GuiSlotConfiguration.draw(this, mouseX, mouseY);
} }
if(slotConfigType == SlotConfigType.FLUIDS && getMachine().showTankConfig()){
GuiFluidConfiguration.draw(this, mouseX, mouseY);
}
int offset = 0; int offset = 0;
if(!upgrades){ if(!upgrades){
offset = 80; offset = 80;
@ -168,6 +183,13 @@ public class GuiBase extends GuiContainer {
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
} }
if (builder.isInRect(guiLeft - 19, guiTop + 92 - offset + 27, 12, 12, mouseX, mouseY) && getMachine().hasSlotConfig()) {
List<String> list = new ArrayList<>();
list.add("Configure Fluids");
GuiUtils.drawHoveringText(list, mouseX - guiLeft , mouseY - guiTop , width, height, -1, mc.fontRenderer);
GlStateManager.disableLighting();
GlStateManager.color(1, 1, 1, 1);
}
} }
@Override @Override
@ -212,19 +234,27 @@ public class GuiBase extends GuiContainer {
@Override @Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
if(showSlotConfig && getMachine().hasSlotConfig()){ if(slotConfigType == SlotConfigType.ITEMS && getMachine().hasSlotConfig()){
if(GuiSlotConfiguration.mouseClicked(mouseX, mouseY, mouseButton, this)){ if(GuiSlotConfiguration.mouseClicked(mouseX, mouseY, mouseButton, this)){
return; return;
} }
} }
if(slotConfigType == SlotConfigType.FLUIDS && getMachine().showTankConfig()){
if(GuiFluidConfiguration.mouseClicked(mouseX, mouseY, mouseButton, this)){
return;
}
}
super.mouseClicked(mouseX, mouseY, mouseButton); super.mouseClicked(mouseX, mouseY, mouseButton);
} }
@Override @Override
protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
if(showSlotConfig && getMachine().hasSlotConfig()){ if(slotConfigType == SlotConfigType.ITEMS && getMachine().hasSlotConfig()){
GuiSlotConfiguration.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick, this); GuiSlotConfiguration.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick, this);
} }
if(slotConfigType == SlotConfigType.FLUIDS && getMachine().showTankConfig()){
GuiFluidConfiguration.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick, this);
}
super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
} }
@ -235,22 +265,38 @@ public class GuiBase extends GuiContainer {
offset = 80; offset = 80;
} }
if(isPointInRegion(-26, 84 - offset, 30, 30, mouseX, mouseY) && getMachine().hasSlotConfig()){ if(isPointInRegion(-26, 84 - offset, 30, 30, mouseX, mouseY) && getMachine().hasSlotConfig()){
showSlotConfig = !showSlotConfig; if(slotConfigType != SlotConfigType.ITEMS){
if(!showSlotConfig){ slotConfigType = SlotConfigType.ITEMS;
} else {
slotConfigType = SlotConfigType.NONE;
}
if(slotConfigType == SlotConfigType.ITEMS){
GuiSlotConfiguration.reset(); GuiSlotConfiguration.reset();
} }
} }
if(showSlotConfig && getMachine().hasSlotConfig()){ if(isPointInRegion(-26, 84 - offset + 27, 30, 30, mouseX, mouseY) && getMachine().hasSlotConfig()){
if(slotConfigType != SlotConfigType.FLUIDS){
slotConfigType = SlotConfigType.FLUIDS;
} else {
slotConfigType = SlotConfigType.NONE;
}
}
if(slotConfigType == SlotConfigType.ITEMS && getMachine().hasSlotConfig()){
if(GuiSlotConfiguration.mouseReleased(mouseX, mouseY, state, this)){ if(GuiSlotConfiguration.mouseReleased(mouseX, mouseY, state, this)){
return; return;
} }
} }
if(slotConfigType == SlotConfigType.FLUIDS && getMachine().showTankConfig()){
if(GuiFluidConfiguration.mouseReleased(mouseX, mouseY, state, this)){
return;
}
}
super.mouseReleased(mouseX, mouseY, state); super.mouseReleased(mouseX, mouseY, state);
} }
@Override @Override
protected void keyTyped(char typedChar, int keyCode) throws IOException { protected void keyTyped(char typedChar, int keyCode) throws IOException {
if(showSlotConfig){ if(slotConfigType == SlotConfigType.ITEMS){
if(isCtrlKeyDown() && keyCode == Keyboard.KEY_C){ if(isCtrlKeyDown() && keyCode == Keyboard.KEY_C){
GuiSlotConfiguration.copyToClipboard(); GuiSlotConfiguration.copyToClipboard();
return; return;
@ -264,7 +310,7 @@ public class GuiBase extends GuiContainer {
@Override @Override
public void onGuiClosed() { public void onGuiClosed() {
showSlotConfig = false; slotConfigType = SlotConfigType.NONE;
super.onGuiClosed(); super.onGuiClosed();
} }
@ -276,13 +322,14 @@ public class GuiBase extends GuiContainer {
return (TileLegacyMachineBase) tile; return (TileLegacyMachineBase) tile;
} }
//TODO
public enum SlotRender {
STANDARD, OUTPUT, NONE, SPRITE;
}
public enum Layer { public enum Layer {
BACKGROUND, FOREGROUND BACKGROUND, FOREGROUND
} }
public enum SlotConfigType{
NONE,
ITEMS,
FLUIDS
}
} }

View file

@ -52,7 +52,7 @@ public class GuiBatbox extends GuiBase {
super.drawGuiContainerForegroundLayer(mouseX, mouseY); super.drawGuiContainerForegroundLayer(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(!GuiBase.showSlotConfig){ if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.scale(0.6, 0.6, 5); GlStateManager.scale(0.6, 0.6, 5);
this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.tile.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);

View file

@ -107,7 +107,7 @@ public class GuiBlastFurnace extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -103,7 +103,7 @@ public class GuiDistillationTower extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -112,7 +112,7 @@ public class GuiFluidReplicator extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -122,7 +122,7 @@ public class GuiFusionReactor extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
updateMultiBlockRender(); updateMultiBlockRender();
} else { } else {

View file

@ -105,7 +105,7 @@ public class GuiImplosionCompressor extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -109,7 +109,7 @@ public class GuiIndustrialGrinder extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -108,7 +108,7 @@ public class GuiIndustrialSawmill extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -27,7 +27,9 @@ package techreborn.client.gui;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import techreborn.init.ModItems;
import techreborn.tiles.tier0.TileIronFurnace; import techreborn.tiles.tier0.TileIronFurnace;
public class GuiIronFurnace extends GuiBase { public class GuiIronFurnace extends GuiBase {
@ -48,7 +50,7 @@ public class GuiIronFurnace extends GuiBase {
protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) {
this.drawDefaultBackground(); this.drawDefaultBackground();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades); builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(ModItems.WRENCH));
this.mc.getTextureManager().bindTexture(GuiIronFurnace.texture); this.mc.getTextureManager().bindTexture(GuiIronFurnace.texture);
final int k = (this.width - this.xSize) / 2; final int k = (this.width - this.xSize) / 2;
final int l = (this.height - this.ySize) / 2; final int l = (this.height - this.ySize) / 2;

View file

@ -53,7 +53,7 @@ public class GuiMFE extends GuiBase {
super.drawGuiContainerForegroundLayer(mouseX, mouseY); super.drawGuiContainerForegroundLayer(mouseX, mouseY);
final Layer layer = Layer.FOREGROUND; final Layer layer = Layer.FOREGROUND;
if(!GuiBase.showSlotConfig){ if(GuiBase.slotConfigType == SlotConfigType.NONE){
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.scale(0.6, 0.6, 1); GlStateManager.scale(0.6, 0.6, 1);
this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer); this.drawCentredString(PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.mfe.getEnergy()) + "/" + PowerSystem.getLocaliszedPowerFormattedNoSuffix((int) this.mfe.getMaxPower()) + " " + PowerSystem.getDisplayPower().abbreviation, 35, 0, 58, layer);

View file

@ -24,7 +24,6 @@
package techreborn.client.gui; package techreborn.client.gui;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import techreborn.tiles.TileQuantumTank; import techreborn.tiles.TileQuantumTank;
@ -52,12 +51,6 @@ public class GuiQuantumTank extends GuiBase {
protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) { protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY); super.drawGuiContainerForegroundLayer(mouseX, mouseY);
final String name = I18n.format("tile.techreborn:quantum_tank.name");
this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6,
4210752);
this.fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752);
FluidStack fluid = this.quantumTank.tank.getFluid(); FluidStack fluid = this.quantumTank.tank.getFluid();
if(fluid != null){ if(fluid != null){
this.fontRenderer.drawString( "Fluid Type:", 10, 20, 4210752); this.fontRenderer.drawString( "Fluid Type:", 10, 20, 4210752);

View file

@ -100,7 +100,7 @@ public class GuiVacuumFreezer extends GuiBase {
@Override @Override
public void actionPerformed(final GuiButton button) throws IOException { public void actionPerformed(final GuiButton button) throws IOException {
super.actionPerformed(button); super.actionPerformed(button);
if (button.id == 212 && !GuiBase.showSlotConfig) { if (button.id == 212 && GuiBase.slotConfigType == SlotConfigType.NONE) {
if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.

View file

@ -62,7 +62,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawMultiEnergyBar(GuiBase gui, int x, int y, int energyStored, int maxEnergyStored, int mouseX, int mouseY, int buttonID, GuiBase.Layer layer) { public void drawMultiEnergyBar(GuiBase gui, int x, int y, int energyStored, int maxEnergyStored, int mouseX, int mouseY, int buttonID, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -104,7 +104,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawProgressBar(GuiBase gui, int progress, int maxProgress, int x, int y, int mouseX, int mouseY, ProgressDirection direction, GuiBase.Layer layer) { public void drawProgressBar(GuiBase gui, int progress, int maxProgress, int x, int y, int mouseX, int mouseY, ProgressDirection direction, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -152,7 +152,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawTank(GuiBase gui, int x, int y, int mouseX, int mouseY, FluidStack fluid, int maxCapacity, boolean isTankEmpty, GuiBase.Layer layer) { public void drawTank(GuiBase gui, int x, int y, int mouseX, int mouseY, FluidStack fluid, int maxCapacity, boolean isTankEmpty, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -213,7 +213,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawJEIButton(GuiBase gui, int x, int y, GuiBase.Layer layer) { public void drawJEIButton(GuiBase gui, int x, int y, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (Loader.isModLoaded("jei")) { if (Loader.isModLoaded("jei")) {
@ -227,7 +227,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawLockButton(GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer, boolean locked) { public void drawLockButton(GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer, boolean locked) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -251,7 +251,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawHologramButton(GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer) { public void drawHologramButton(GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -278,7 +278,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawUpDownButtons(GuiBase gui, int x, int y, GuiBase.Layer layer){ public void drawUpDownButtons(GuiBase gui, int x, int y, GuiBase.Layer layer){
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -293,7 +293,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawUpDownButtonsSmall(GuiBase gui, int x, int y, GuiBase.Layer layer){ public void drawUpDownButtonsSmall(GuiBase gui, int x, int y, GuiBase.Layer layer){
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -308,7 +308,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawEnergyOutput(GuiBase gui, int right, int top, int maxOutput, GuiBase.Layer layer){ public void drawEnergyOutput(GuiBase gui, int right, int top, int maxOutput, GuiBase.Layer layer){
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
String text = PowerSystem.getLocaliszedPowerFormattedNoSuffix(maxOutput) + " " String text = PowerSystem.getLocaliszedPowerFormattedNoSuffix(maxOutput) + " "
@ -325,7 +325,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawBigBlueBar(GuiBase gui, int x, int y, int value, int max, int mouseX, int mouseY, String suffix, GuiBase.Layer layer) { public void drawBigBlueBar(GuiBase gui, int x, int y, int value, int max, int mouseX, int mouseY, String suffix, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -360,7 +360,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawBigHeatBar(GuiBase gui, int x, int y, int value, int max, GuiBase.Layer layer) { public void drawBigHeatBar(GuiBase gui, int x, int y, int value, int max, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
if (layer == GuiBase.Layer.BACKGROUND) { if (layer == GuiBase.Layer.BACKGROUND) {
@ -380,7 +380,7 @@ public class TRBuilder extends GuiBuilder {
} }
public void drawMultiblockMissingBar(GuiBase gui, GuiBase.Layer layer) { public void drawMultiblockMissingBar(GuiBase gui, GuiBase.Layer layer) {
if(GuiBase.showSlotConfig){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.NONE){
return; return;
} }
int x = 0; int x = 0;
@ -448,8 +448,8 @@ public class TRBuilder extends GuiBuilder {
gui.drawTexturedModalRect(posX - 27, posY + 4, 126, 151, 30, 87); gui.drawTexturedModalRect(posX - 27, posY + 4, 126, 151, 30, 87);
} }
public void drawSlotTab(GuiScreen gui, int posX, int posY, int mouseX, int mouseY, boolean upgrades){ public void drawSlotTab(GuiScreen gui, int posX, int posY, int mouseX, int mouseY, boolean upgrades, ItemStack stack){
int offset = 0; int offset = -1;
if(!upgrades){ if(!upgrades){
offset = 80; offset = 80;
} }

View file

@ -0,0 +1,153 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.client.gui.slot;
import com.google.common.collect.Lists;
import net.minecraft.client.Minecraft;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.input.Keyboard;
import reborncore.common.tile.TileLegacyMachineBase;
import techreborn.client.gui.GuiBase;
import techreborn.client.gui.slot.elements.ConfigFluidElement;
import techreborn.client.gui.slot.elements.ElementBase;
import techreborn.client.gui.slot.elements.SlotType;
import javax.annotation.Nullable;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
public class GuiFluidConfiguration {
static ConfigFluidElement fluidConfigElement;
public static void init(GuiBase guiBase) {
fluidConfigElement = new ConfigFluidElement(guiBase.getMachine().getTank(), SlotType.NORMAL, 35 - guiBase.guiLeft + 50, 35 - guiBase.guiTop - 25, guiBase);
}
public static void draw(GuiBase guiBase, int mouseX, int mouseY) {
fluidConfigElement.draw(guiBase);
}
@SubscribeEvent
public static void keyboardEvent(GuiScreenEvent.KeyboardInputEvent event) {
if (GuiBase.slotConfigType == GuiBase.SlotConfigType.FLUIDS && Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
GuiBase.slotConfigType = GuiBase.SlotConfigType.NONE;
event.setCanceled(true);
}
}
public static List<ConfigFluidElement> getVisibleElements() {
return Collections.singletonList(fluidConfigElement);
}
public static boolean mouseClicked(int mouseX, int mouseY, int mouseButton, GuiBase guiBase) throws IOException {
if (mouseButton == 0) {
for (ConfigFluidElement configFluidElement : getVisibleElements()) {
for (ElementBase element : configFluidElement.elements) {
if (element.isInRect(guiBase, element.x, element.y, element.getWidth(guiBase.getMachine()), element.getHeight(guiBase.getMachine()), mouseX, mouseY)) {
element.isPressing = true;
boolean action = element.onStartPress(guiBase.getMachine(), guiBase, mouseX, mouseY);
for (ElementBase e : getVisibleElements()) {
if (e != element) {
e.isPressing = false;
}
}
if (action)
break;
} else {
element.isPressing = false;
}
}
}
}
return !getVisibleElements().isEmpty();
}
public static void mouseClickMove(int mouseX, int mouseY, int mouseButton, long timeSinceLastClick, GuiBase guiBase) {
if (mouseButton == 0) {
for (ConfigFluidElement configFluidElement : getVisibleElements()) {
for (ElementBase element : configFluidElement.elements) {
if (element.isInRect(guiBase, element.x, element.y, element.getWidth(guiBase.getMachine()), element.getHeight(guiBase.getMachine()), mouseX, mouseY)) {
element.isDragging = true;
boolean action = element.onDrag(guiBase.getMachine(), guiBase, mouseX, mouseY);
for (ElementBase e : getVisibleElements()) {
if (e != element) {
e.isDragging = false;
}
}
if (action)
break;
} else {
element.isDragging = false;
}
}
}
}
}
public static boolean mouseReleased(int mouseX, int mouseY, int mouseButton, GuiBase guiBase) {
boolean clicked = false;
if (mouseButton == 0) {
for (ConfigFluidElement configFluidElement : getVisibleElements()) {
if (configFluidElement.isInRect(guiBase, configFluidElement.x, configFluidElement.y, configFluidElement.getWidth(guiBase.getMachine()), configFluidElement.getHeight(guiBase.getMachine()), mouseX, mouseY)) {
clicked = true;
}
for (ElementBase element : Lists.reverse(configFluidElement.elements)) {
if (element.isInRect(guiBase, element.x, element.y, element.getWidth(guiBase.getMachine()), element.getHeight(guiBase.getMachine()), mouseX, mouseY)) {
element.isReleasing = true;
boolean action = element.onRelease(guiBase.getMachine(), guiBase, mouseX, mouseY);
for (ElementBase e : getVisibleElements()) {
if (e != element) {
e.isReleasing = false;
}
}
if (action)
clicked = true;
break;
} else {
element.isReleasing = false;
}
}
}
}
return clicked;
}
@Nullable
private static TileLegacyMachineBase getMachine() {
if (!(Minecraft.getMinecraft().currentScreen instanceof GuiBase)) {
return null;
}
GuiBase base = (GuiBase) Minecraft.getMinecraft().currentScreen;
if (!(base.tile instanceof TileLegacyMachineBase)) {
return null;
}
TileLegacyMachineBase machineBase = (TileLegacyMachineBase) base.tile;
return machineBase;
}
}

View file

@ -51,7 +51,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class GuiSlotConfiguration { public class GuiSlotConfiguration {
static HashMap<Integer, ConfigSlotElement> slotElementMap = new HashMap<>(); static HashMap<Integer, ConfigSlotElement> slotElementMap = new HashMap<>();
@ -236,7 +236,7 @@ public class GuiSlotConfiguration {
} }
public static List<Rectangle> getExtraSpace(GuiBase guiBase){ public static List<Rectangle> getExtraSpace(GuiBase guiBase){
if(!GuiBase.showSlotConfig || slectedSlot == -1){ if(GuiBase.slotConfigType != GuiBase.SlotConfigType.ITEMS || slectedSlot == -1){
return Collections.emptyList(); return Collections.emptyList();
} }
List<Rectangle> list = new ArrayList<>(); List<Rectangle> list = new ArrayList<>();

View file

@ -27,14 +27,17 @@ package techreborn.client.gui.slot.elements;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
import techreborn.client.gui.GuiBase; import techreborn.client.gui.GuiBase;
import java.util.function.Predicate;
public class CheckBoxElement extends ElementBase { public class CheckBoxElement extends ElementBase {
public String label, type; public String label, type;
public int labelColor, slotID; public int labelColor, slotID;
TileLegacyMachineBase machineBase; public TileLegacyMachineBase machineBase;
Predicate<CheckBoxElement> ticked;
private Sprite.CheckBox checkBoxSprite; private Sprite.CheckBox checkBoxSprite;
public CheckBoxElement(String label, int labelColor, int x, int y, String type, int slotID, Sprite.CheckBox checkBoxSprite, TileLegacyMachineBase machineBase) { public CheckBoxElement(String label, int labelColor, int x, int y, String type, int slotID, Sprite.CheckBox checkBoxSprite, TileLegacyMachineBase machineBase, Predicate<CheckBoxElement> ticked) {
super(x, y, checkBoxSprite.getNormal()); super(x, y, checkBoxSprite.getNormal());
this.checkBoxSprite = checkBoxSprite; this.checkBoxSprite = checkBoxSprite;
this.type = type; this.type = type;
@ -42,13 +45,14 @@ public class CheckBoxElement extends ElementBase {
this.machineBase = machineBase; this.machineBase = machineBase;
this.label = label; this.label = label;
this.labelColor = labelColor; this.labelColor = labelColor;
if (isTicked()) { this.ticked = ticked;
if (ticked.test(this)) {
container.setSprite(0, checkBoxSprite.getTicked()); container.setSprite(0, checkBoxSprite.getTicked());
} else { } else {
container.setSprite(0, checkBoxSprite.getNormal()); container.setSprite(0, checkBoxSprite.getNormal());
} }
this.addPressAction((element, gui, provider, mouseX, mouseY) -> { this.addPressAction((element, gui, provider, mouseX, mouseY) -> {
if (isTicked()) { if (ticked.test(this)) {
element.container.setSprite(0, checkBoxSprite.getTicked()); element.container.setSprite(0, checkBoxSprite.getTicked());
} else { } else {
element.container.setSprite(0, checkBoxSprite.getNormal()); element.container.setSprite(0, checkBoxSprite.getNormal());
@ -61,21 +65,11 @@ public class CheckBoxElement extends ElementBase {
public void draw(GuiBase gui) { public void draw(GuiBase gui) {
// super.draw(gui); // super.draw(gui);
ISprite sprite = checkBoxSprite.getNormal(); ISprite sprite = checkBoxSprite.getNormal();
if(isTicked()){ if(ticked.test(this)){
sprite = checkBoxSprite.getTicked(); sprite = checkBoxSprite.getTicked();
} }
drawSprite(gui, sprite, x, y ); drawSprite(gui, sprite, x, y );
drawString(gui, label, x + checkBoxSprite.getNormal().width + 5, ((y + getHeight(gui.getMachine()) / 2) - (gui.mc.fontRenderer.FONT_HEIGHT / 2)), labelColor); drawString(gui, label, x + checkBoxSprite.getNormal().width + 5, ((y + getHeight(gui.getMachine()) / 2) - (gui.mc.fontRenderer.FONT_HEIGHT / 2)), labelColor);
} }
public boolean isTicked() {
if(type.equalsIgnoreCase("output")){
return machineBase.slotConfiguration.getSlotDetails(slotID).autoOutput();
}
if(type.equalsIgnoreCase("filter")){
return machineBase.slotConfiguration.getSlotDetails(slotID).filter();
}
return machineBase.slotConfiguration.getSlotDetails(slotID).autoInput();
}
} }

View file

@ -0,0 +1,79 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.client.gui.slot.elements;
import reborncore.common.util.Tank;
import techreborn.client.gui.GuiBase;
import java.util.ArrayList;
import java.util.List;
public class ConfigFluidElement extends ElementBase {
SlotType type;
Tank tank;
public List<ElementBase> elements = new ArrayList<>();
boolean filter = false;
public ConfigFluidElement(Tank tank, SlotType type, int x, int y, GuiBase gui) {
super(x, y, type.getButtonSprite());
this.type = type;
this.tank = tank;
FluidConfigPopupElement popupElement;
elements.add(popupElement = new FluidConfigPopupElement(x - 22, y - 22, this));
elements.add(new ButtonElement(x + 37, y - 25, Sprite.EXIT_BUTTON).addReleaseAction((element, gui1, provider, mouseX, mouseY) -> {
GuiBase.slotConfigType = GuiBase.SlotConfigType.NONE;
return true;
}));
elements.add(new CheckBoxElement("Pull In", 0xFFFFFFFF, x - 26, y + 42, "input", 0, Sprite.LIGHT_CHECK_BOX, gui.getMachine(),
checkBoxElement -> checkBoxElement.machineBase.fluidConfiguration.autoInput()).addPressAction((element, gui12, provider, mouseX, mouseY) -> {
popupElement.updateCheckBox((CheckBoxElement) element, "input", gui12);
return true;
}));
elements.add(new CheckBoxElement("Pump Out", 0xFFFFFFFF, x - 26, y + 57, "output", 0, Sprite.LIGHT_CHECK_BOX, gui.getMachine(),
checkBoxElement -> checkBoxElement.machineBase.fluidConfiguration.autoOutput()).addPressAction((element, gui13, provider, mouseX, mouseY) -> {
popupElement.updateCheckBox((CheckBoxElement) element, "output", gui13);
return true;
}));
setWidth(85);
setHeight(105 + (filter ? 15 : 0));
}
@Override
public void draw(GuiBase gui) {
super.draw(gui);
if (isHovering) {
drawSprite(gui, type.getButtonHoverOverlay(), x, y);
}
elements.forEach(elementBase -> elementBase.draw(gui));
}
public SlotType getType() {
return type;
}
}

View file

@ -58,14 +58,17 @@ public class ConfigSlotElement extends ElementBase {
elements.add(popupElement = new SlotConfigPopupElement(this.id, x - 22, y - 22, this)); elements.add(popupElement = new SlotConfigPopupElement(this.id, x - 22, y - 22, this));
elements.add(new ButtonElement(x + 37, y - 25, Sprite.EXIT_BUTTON).addReleaseAction((element, gui1, provider, mouseX, mouseY) -> { elements.add(new ButtonElement(x + 37, y - 25, Sprite.EXIT_BUTTON).addReleaseAction((element, gui1, provider, mouseX, mouseY) -> {
GuiSlotConfiguration.slectedSlot = -1; GuiSlotConfiguration.slectedSlot = -1;
GuiBase.slotConfigType = GuiBase.SlotConfigType.NONE;
return true; return true;
})); }));
elements.add(new CheckBoxElement("Auto Input", 0xFFFFFFFF, x - 26, y + 42, "input", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine()).addPressAction((element, gui12, provider, mouseX, mouseY) -> { elements.add(new CheckBoxElement("Auto Input", 0xFFFFFFFF, x - 26, y + 42, "input", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine(),
checkBoxElement -> checkBoxElement.machineBase.slotConfiguration.getSlotDetails(checkBoxElement.slotID).autoInput()).addPressAction((element, gui12, provider, mouseX, mouseY) -> {
popupElement.updateCheckBox((CheckBoxElement) element, "input", gui12); popupElement.updateCheckBox((CheckBoxElement) element, "input", gui12);
return true; return true;
})); }));
elements.add(new CheckBoxElement("Auto Output", 0xFFFFFFFF, x - 26, y + 57,"output", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine()).addPressAction((element, gui13, provider, mouseX, mouseY) -> { elements.add(new CheckBoxElement("Auto Output", 0xFFFFFFFF, x - 26, y + 57, "output", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine(),
checkBoxElement -> checkBoxElement.machineBase.slotConfiguration.getSlotDetails(checkBoxElement.slotID).autoOutput()).addPressAction((element, gui13, provider, mouseX, mouseY) -> {
popupElement.updateCheckBox((CheckBoxElement) element, "output", gui13); popupElement.updateCheckBox((CheckBoxElement) element, "output", gui13);
return true; return true;
})); }));
@ -73,7 +76,8 @@ public class ConfigSlotElement extends ElementBase {
if(gui.getMachine() instanceof IRecipeCrafterProvider){ if(gui.getMachine() instanceof IRecipeCrafterProvider){
RecipeCrafter recipeCrafter = ((IRecipeCrafterProvider) gui.getMachine()).getRecipeCrafter(); RecipeCrafter recipeCrafter = ((IRecipeCrafterProvider) gui.getMachine()).getRecipeCrafter();
if(Arrays.stream(recipeCrafter.inputSlots).anyMatch(value -> value == slotId)){ if(Arrays.stream(recipeCrafter.inputSlots).anyMatch(value -> value == slotId)){
elements.add(new CheckBoxElement("Filter Input", 0xFFFFFFFF, x - 26, y + 72,"filter", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine()).addPressAction((element, gui13, provider, mouseX, mouseY) -> { elements.add(new CheckBoxElement("Filter Input", 0xFFFFFFFF, x - 26, y + 72, "filter", slotId, Sprite.LIGHT_CHECK_BOX, gui.getMachine(),
checkBoxElement -> checkBoxElement.machineBase.slotConfiguration.getSlotDetails(checkBoxElement.slotID).filter()).addPressAction((element, gui13, provider, mouseX, mouseY) -> {
popupElement.updateCheckBox((CheckBoxElement) element, "filter", gui13); popupElement.updateCheckBox((CheckBoxElement) element, "filter", gui13);
return true; return true;
})); }));

View file

@ -0,0 +1,222 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.client.gui.slot.elements;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.client.FMLClientHandler;
import reborncore.RebornCore;
import reborncore.client.gui.GuiUtil;
import reborncore.common.network.NetworkManager;
import reborncore.common.network.packet.PacketFluidConfigSave;
import reborncore.common.network.packet.PacketFluidIOSave;
import reborncore.common.tile.FluidConfiguration;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.MachineFacing;
import techreborn.client.gui.GuiBase;
import java.awt.*;
public class FluidConfigPopupElement extends ElementBase {
public boolean filter = false;
ConfigFluidElement fluidElement;
int lastMousex, lastMousey;
public FluidConfigPopupElement(int x, int y, ConfigFluidElement fluidElement) {
super(x, y, Sprite.SLOT_CONFIG_POPUP);
this.fluidElement = fluidElement;
}
@Override
public void draw(GuiBase gui) {
drawDefaultBackground(gui, adjustX(gui, getX() - 8), adjustY(gui, getY() - 7), 84, 105 + (filter ? 15 : 0));
super.draw(gui);
TileLegacyMachineBase machine = ((TileLegacyMachineBase) gui.tile);
IBlockAccess blockAccess = machine.getWorld();
BlockPos pos = machine.getPos();
IBlockState state = blockAccess.getBlockState(pos);
IBlockState actualState = state.getBlock().getDefaultState().getActualState(blockAccess, pos);
BlockRendererDispatcher dispatcher = FMLClientHandler.instance().getClient().getBlockRendererDispatcher();
IBakedModel model = dispatcher.getBlockModelShapes().getModelForState(state.getBlock().getDefaultState());
FMLClientHandler.instance().getClient().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 4, 23); //left
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 23, -12, -90F, 1F, 0F, 0F); //top
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 23, 23, -90F, 0F, 1F, 0F); //centre
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 23, 42, 90F, 1F, 0F, 0F); //bottom
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 26, 23, 180F, 0F, 1F, 0F); //right
drawState(gui, blockAccess, model, actualState, pos, dispatcher, 26, 42, 90F, 0F, 1F, 0F); //back
drawSateColor(gui.getMachine(), MachineFacing.UP.getFacing(machine), 22, -1, gui);
drawSateColor(gui.getMachine(), MachineFacing.FRONT.getFacing(machine), 22, 18, gui);
drawSateColor(gui.getMachine(), MachineFacing.DOWN.getFacing(machine), 22, 37, gui);
drawSateColor(gui.getMachine(), MachineFacing.RIGHT.getFacing(machine), 41, 18, gui);
drawSateColor(gui.getMachine(), MachineFacing.BACK.getFacing(machine), 41, 37, gui);
drawSateColor(gui.getMachine(), MachineFacing.LEFT.getFacing(machine), 3, 18, gui);
}
@Override
public boolean onRelease(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) {
if (isInBox(23, 4, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.UP.getFacing(provider), gui);
} else if (isInBox(23, 23, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.FRONT.getFacing(provider), gui);
} else if (isInBox(42, 23, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.RIGHT.getFacing(provider), gui);
} else if (isInBox(4, 23, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.LEFT.getFacing(provider), gui);
} else if (isInBox(23, 42, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.DOWN.getFacing(provider), gui);
} else if (isInBox(42, 42, 16, 16, mouseX, mouseY, gui)) {
cyleConfig(MachineFacing.BACK.getFacing(provider), gui);
} else {
return false;
}
return true;
}
public void cyleConfig(EnumFacing side, GuiBase guiBase) {
FluidConfiguration.FluidConfig config = guiBase.getMachine().fluidConfiguration.getSideDetail(side);
FluidConfiguration.ExtractConfig fluidIO = config.getIoConfig().getNext();
FluidConfiguration.FluidConfig newConfig = new FluidConfiguration.FluidConfig(side, fluidIO);
PacketFluidConfigSave packetSave = new PacketFluidConfigSave(guiBase.tile.getPos(), newConfig);
NetworkManager.sendToServer(packetSave);
}
public void updateCheckBox(CheckBoxElement checkBoxElement, String type, GuiBase guiBase) {
FluidConfiguration configHolder = guiBase.getMachine().fluidConfiguration;
boolean input = configHolder.autoInput();
boolean output = configHolder.autoOutput();
if (type.equalsIgnoreCase("input")) {
input = !configHolder.autoInput();
}
if (type.equalsIgnoreCase("output")) {
output = !configHolder.autoOutput();
}
PacketFluidIOSave packetFluidIOSave = new PacketFluidIOSave(guiBase.tile.getPos(), input, output);
NetworkManager.sendToServer(packetFluidIOSave);
}
@Override
public boolean onHover(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) {
lastMousex = mouseX;
lastMousey = mouseY;
return super.onHover(provider, gui, mouseX, mouseY);
}
private void drawSateColor(TileLegacyMachineBase machineBase, EnumFacing side, int inx, int iny, GuiBase gui) {
iny += 4;
int sx = inx + getX() + gui.guiLeft;
int sy = iny + getY() + gui.guiTop;
FluidConfiguration fluidConfiguration = machineBase.fluidConfiguration;
if (fluidConfiguration == null) {
RebornCore.logHelper.debug("Humm, this isnt suppoed to happen");
return;
}
FluidConfiguration.FluidConfig fluidConfig = fluidConfiguration.getSideDetail(side);
Color color;
switch (fluidConfig.getIoConfig()) {
case NONE:
color = new Color(0, 0, 0, 0);
break;
case INPUT:
color = new Color(0, 0, 255, 128);
break;
case OUTPUT:
color = new Color(255, 69, 0, 128);
break;
case ALL:
color = new Color(52, 255, 30, 128);
break;
default:
color = new Color(0, 0, 0, 0);
break;
}
GlStateManager.color(255, 255, 255);
GuiUtil.drawGradientRect(sx, sy, 18, 18, color.getRGB(), color.getRGB());
GlStateManager.color(255, 255, 255);
}
private boolean isInBox(int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY, GuiBase guiBase) {
rectX += getX();
rectY += getY();
return isInRect(guiBase, rectX, rectY, rectWidth, rectHeight, pointX, pointY);
//return (pointX - guiBase.getGuiLeft()) >= rectX - 1 && (pointX - guiBase.getGuiLeft()) < rectX + rectWidth + 1 && (pointY - guiBase.getGuiTop()) >= rectY - 1 && (pointY - guiBase.getGuiTop()) < rectY + rectHeight + 1;
}
public void drawState(GuiBase gui,
IBlockAccess blockAccess,
IBakedModel model,
IBlockState actualState,
BlockPos pos,
BlockRendererDispatcher dispatcher,
int x,
int y,
float rotAngle,
float rotX,
float rotY,
float rotZ) {
GlStateManager.pushMatrix();
GlStateManager.enableDepth();
GlStateManager.translate(8 + gui.guiLeft + this.x + x, 8 + gui.guiTop + this.y + y, 512);
GlStateManager.scale(16F, 16F, 16F);
GlStateManager.translate(0.5F, 0.5F, 0.5F);
GlStateManager.scale(-1, -1, -1);
if (rotAngle != 0) {
GlStateManager.rotate(rotAngle, rotX, rotY, rotZ);
}
dispatcher.getBlockModelRenderer().renderModelBrightness(model, actualState, 1F, false);
GlStateManager.disableDepth();
GlStateManager.popMatrix();
/* GlStateManager.pushMatrix();
GlStateManager.enableDepth();
// GlStateManager.translate(8 + gui.xFactor + this.x + x, 8 + gui.yFactor + this.y + y, 1000);
GlStateManager.translate(gui.xFactor + this.x + x, gui.yFactor + this.y + y, 512);
if (rotAngle != 0) {
GlStateManager.rotate(rotAngle, rotX, rotY, rotZ);
}
GlStateManager.scale(16F, 16F, 16F);
GlStateManager.translate(-0.5F, -0.5F, -0.5F);
GlStateManager.scale(-1, -1, -1);
GlStateManager.disableDepth();
GlStateManager.popMatrix();*/
}
public void drawState(GuiBase gui, IBlockAccess blockAccess, IBakedModel model, IBlockState actualState, BlockPos pos, BlockRendererDispatcher dispatcher, int x, int y) {
drawState(gui, blockAccess, model, actualState, pos, dispatcher, x, y, 0, 0, 0, 0);
}
}

View file

@ -120,5 +120,12 @@ public class ConfigTechReborn {
@ConfigRegistry(config = "generators", category = "solarPanelQuantum", key = "quantumNightRate", comment = "Generation rate during night for Quantum Solar Panel (Value in EU)") @ConfigRegistry(config = "generators", category = "solarPanelQuantum", key = "quantumNightRate", comment = "Generation rate during night for Quantum Solar Panel (Value in EU)")
public static int quantumGenerationRateN = 64; public static int quantumGenerationRateN = 64;
@ConfigRegistry(config = "world", category = "loot", key = "enableOverworldLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to OverWorld loot chests.")
public static boolean enableOverworldLoot = true;
@ConfigRegistry(config = "world", category = "loot", key = "enableNetherLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to Nether loot chests.")
public static boolean enableNetherLoot = true;
@ConfigRegistry(config = "world", category = "loot", key = "enableEndLoot", comment = "When true TechReborn will add ingots, machine frames and circuits to The End loot chests.")
public static boolean enableEndLoot = true;
} }

View file

@ -31,13 +31,24 @@ import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.explosion.RebornExplosion; import reborncore.common.explosion.RebornExplosion;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.lib.ModInfo;
/** /**
* Created by Mark on 13/03/2016. * Created by Mark on 13/03/2016.
*/ */
@RebornRegistry(modID = ModInfo.MOD_ID)
public class EntityNukePrimed extends EntityTNTPrimed { public class EntityNukePrimed extends EntityTNTPrimed {
public int fuse = 400; @ConfigRegistry(config = "misc", category = "nuke", key = "fuse", comment = "Nuke fuse time (ticks)")
public static int fuse = 400;
@ConfigRegistry(config = "misc", category = "nuke", key = "radius", comment = "Nuke explision radius")
public static int radius = 40;
@ConfigRegistry(config = "misc", category = "nuke", key = "enabled", comment = "Should the nuke explode, set to false to prevent block damage")
public static boolean enabled = true;
public EntityNukePrimed(World world) { public EntityNukePrimed(World world) {
super(world); super(world);
@ -76,8 +87,11 @@ public class EntityNukePrimed extends EntityTNTPrimed {
} }
public void explodeNuke() { public void explodeNuke() {
if(!enabled){
return;
}
RebornExplosion nukeExplosion = new RebornExplosion(new BlockPos(this.posX, this.posY, this.posZ), world, RebornExplosion nukeExplosion = new RebornExplosion(new BlockPos(this.posX, this.posY, this.posZ), world,
40); radius);
nukeExplosion.setLivingBase(getTntPlacedBy()); nukeExplosion.setLivingBase(getTntPlacedBy());
nukeExplosion.explode(); nukeExplosion.explode();
} }

View file

@ -46,6 +46,7 @@ import techreborn.Core;
public class StackToolTipEvent { public class StackToolTipEvent {
@SuppressWarnings("deprecation")
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@SubscribeEvent @SubscribeEvent
public void handleItemTooltipEvent(ItemTooltipEvent event) { public void handleItemTooltipEvent(ItemTooltipEvent event) {

View file

@ -60,7 +60,9 @@ public class ModBlocks {
public static Block THERMAL_GENERATOR; public static Block THERMAL_GENERATOR;
public static Block QUANTUM_TANK; public static Block QUANTUM_TANK;
public static Block CREATIVE_QUANTUM_TANK;
public static Block QUANTUM_CHEST; public static Block QUANTUM_CHEST;
public static Block CREATIVE_QUANTUM_CHEST;
public static Block DIGITAL_CHEST; public static Block DIGITAL_CHEST;
public static Block INDUSTRIAL_CENTRIFUGE; public static Block INDUSTRIAL_CENTRIFUGE;
public static Block ROLLING_MACHINE; public static Block ROLLING_MACHINE;
@ -151,9 +153,15 @@ public class ModBlocks {
QUANTUM_TANK = new BlockQuantumTank(); QUANTUM_TANK = new BlockQuantumTank();
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank"); registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
CREATIVE_QUANTUM_TANK = new BlockCreativeQuantumTank();
registerBlock(CREATIVE_QUANTUM_TANK, ItemBlockQuantumTank.class, "creative_quantum_tank");
QUANTUM_CHEST = new BlockQuantumChest(); QUANTUM_CHEST = new BlockQuantumChest();
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest"); registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
CREATIVE_QUANTUM_CHEST = new BlockCreativeQuantumChest();
registerBlock(CREATIVE_QUANTUM_CHEST, ItemBlockQuantumChest.class, "creative_quantum_chest");
DIGITAL_CHEST = new BlockDigitalChest(); DIGITAL_CHEST = new BlockDigitalChest();
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest"); registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
@ -393,7 +401,7 @@ public class ModBlocks {
*/ */
public static void registerBlock(Block block, String name) { public static void registerBlock(Block block, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setTranslationKey(ModInfo.MOD_ID + ":" + name); block.setTranslationKey(ModInfo.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, new ResourceLocation(ModInfo.MOD_ID, name)); RebornRegistry.registerBlock(block, new ResourceLocation(ModInfo.MOD_ID, name));
} }
@ -405,19 +413,19 @@ public class ModBlocks {
*/ */
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) { public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setTranslationKey(ModInfo.MOD_ID + ":" + name); block.setTranslationKey(ModInfo.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(ModInfo.MOD_ID, name)); RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(ModInfo.MOD_ID, name));
} }
public static void registerBlock(Block block, ItemBlock itemBlock, String name) { public static void registerBlock(Block block, ItemBlock itemBlock, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setTranslationKey(ModInfo.MOD_ID + ":" + name); block.setTranslationKey(ModInfo.MOD_ID + "." + name);
RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(ModInfo.MOD_ID, name)); RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(ModInfo.MOD_ID, name));
} }
public static void registerBlockNoItem(Block block, String name) { public static void registerBlockNoItem(Block block, String name) {
name = name.toLowerCase(); name = name.toLowerCase();
block.setTranslationKey(ModInfo.MOD_ID + ":" + name); block.setTranslationKey(ModInfo.MOD_ID + "." + name);
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name)); RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name));
} }

View file

@ -30,6 +30,7 @@ import net.minecraft.world.storage.loot.conditions.LootCondition;
import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.LootTableLoadEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import techreborn.Core; import techreborn.Core;
import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.ArrayList; import java.util.ArrayList;
@ -40,18 +41,24 @@ public class ModLoot {
public static List<ResourceLocation> lootTables = new ArrayList<ResourceLocation>(); public static List<ResourceLocation> lootTables = new ArrayList<ResourceLocation>();
public static void init() { public static void init() {
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft")); if (ConfigTechReborn.enableOverworldLoot) {
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith")); lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion"));
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion")); }
if (ConfigTechReborn.enableNetherLoot) {
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge"));
}
if (ConfigTechReborn.enableEndLoot) {
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure"));
}
for (ResourceLocation lootTable : lootTables) { for (ResourceLocation lootTable : lootTables) {
LootTableList.register(lootTable); LootTableList.register(lootTable);

View file

@ -93,6 +93,8 @@ public enum ModTileEntities {
ELECTRIC_FURNACE(TileElectricFurnace.class, "electric_furnace"), ELECTRIC_FURNACE(TileElectricFurnace.class, "electric_furnace"),
SOLAR_PANEL(TileSolarPanel.class, "solar_panel"), SOLAR_PANEL(TileSolarPanel.class, "solar_panel"),
CREATIVE_SOLAR_PANEL(TileCreativeSolarPanel.class, "creative_solar_panel"), CREATIVE_SOLAR_PANEL(TileCreativeSolarPanel.class, "creative_solar_panel"),
CREATIVE_QUANTUM_TANK(TileCreativeQuantumTank.class, "creative_quantum_tank"),
CREATIVE_QUANTUM_CHEST(TileCreativeQuantumChest.class, "creative_quantum_chest"),
WATER_MILL(TileWaterMill.class, "water_mill"), WATER_MILL(TileWaterMill.class, "water_mill"),
WIND_MILL(TileWindMill.class, "wind_mill"), WIND_MILL(TileWindMill.class, "wind_mill"),
MACHINE_BASE(TileLegacyMachineBase.class, "machine_base"), MACHINE_BASE(TileLegacyMachineBase.class, "machine_base"),

View file

@ -58,9 +58,9 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GAG", "GGG", "GAG", 'A', "plateAdvancedAlloy", 'G', "blockGlass");
registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass"); registerShaped(getStack(ModBlocks.REINFORCED_GLASS, 7), "GGG", "AGA", "GGG", 'A', "plateAdvancedAlloy", 'G', "blockGlass");
// registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); // registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy");
// Tools and devices // Tools and devices
registerShaped(getStack(TRItems.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze"); registerShaped(getStack(TRItems.WRENCH), "BNB", "NBN", " B ", 'B', "ingotBronze", 'N', "nuggetBronze");
registerShaped(getStack(TRItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood"); registerShaped(getStack(TRItems.TREE_TAP), " S ", "PPP", "P ", 'S', "stickWood", 'P', "plankWood");
registerShaped(getStack(TRItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(TRItems.TREE_TAP), 'B', "reBattery"); registerShaped(getStack(TRItems.ELECTRIC_TREE_TAP), "TB", " ", 'T', getStack(TRItems.TREE_TAP), 'B', "reBattery");
registerShaped(getStack(TRItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', "dustsmallGlowstone"); registerShaped(getStack(TRItems.NANOSABER), "DC ", "DC ", "GLG", 'L', "lapotronCrystal", 'C', "plateCarbon", 'D', "plateDiamond", 'G', "dustsmallGlowstone");
@ -80,13 +80,13 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(TRItems.LAPOTRONIC_ORB_PACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_BATTERY_PACK)); registerShaped(getStack(TRItems.LAPOTRONIC_ORB_PACK), "FOF", "SPS", "FIF", 'F', "circuitMaster", 'O', getStack(TRItems.LAPOTRONIC_ORB), 'S', "craftingSuperconductor", 'I', "ingotIridium", 'P', getStack(TRItems.LITHIUM_BATTERY_PACK));
registerShaped(getStack(TRItems.RE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack()); registerShaped(getStack(TRItems.RE_BATTERY), " W ", "TRT", "TRT", 'T', "ingotTin", 'R', "dustRedstone", 'W', EnumCableType.ICOPPER.getStack());
registerShaped(getStack(TRItems.LITHIUM_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack()); registerShaped(getStack(TRItems.LITHIUM_BATTERY), " C ", "PFP", "PFP", 'F', getCell("lithium"), 'P', "plateAluminum", 'C', EnumCableType.IGOLD.getStack());
registerShaped(getStack(TRItems.LITHIUM_BATTERY_PACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced"); registerShaped(getStack(TRItems.LITHIUM_BATTERY_PACK), "BCB", "BPB", "B B", 'B', getStack(TRItems.LITHIUM_BATTERY), 'P', "plateAluminum", 'C', "circuitAdvanced");
registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond"); registerShaped(getStack(TRItems.ENERGY_CRYSTAL), "RRR", "RDR", "RRR", 'R', "dustRedstone", 'D', "gemDiamond");
registerShaped(getStack(TRItems.LAPOTRONIC_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic"); registerShaped(getStack(TRItems.LAPOTRONIC_CRYSTAL), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E', "energyCrystal", 'C', "circuitBasic");
registerShaped(getStack(TRItems.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy"); registerShaped(getStack(TRItems.LAPOTRONIC_ORB), "LLL", "LPL", "LLL", 'L', "lapotronCrystal", 'P', "plateIridiumAlloy");
registerShaped(getStack(TRItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', TRIngredients.Parts.SCRAP.getStack()); registerShaped(getStack(TRItems.SCRAP_BOX), "SSS", "SSS", "SSS", 'S', TRIngredients.Parts.SCRAP.getStack());
registerShapeless(getStack(TRItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic"); registerShapeless(getStack(TRItems.FREQUENCY_TRANSMITTER), EnumCableType.ICOPPER.getStack(), "circuitBasic");
if (ConfigTechReborn.enableGemArmorAndTools) { if (ConfigTechReborn.enableGemArmorAndTools) {
addToolAndArmourRecipes(getStack(TRItems.RUBY_SWORD), getStack(TRItems.RUBY_PICKAXE), getStack(TRItems.RUBY_AXE), getStack(TRItems.RUBY_HOE), getStack(TRItems.RUBY_SPADE), getStack(TRItems.RUBY_HELMET), getStack(TRItems.RUBY_CHESTPLATE), getStack(TRItems.RUBY_LEGGINGS), getStack(TRItems.RUBY_BOOTS), "gemRuby"); addToolAndArmourRecipes(getStack(TRItems.RUBY_SWORD), getStack(TRItems.RUBY_PICKAXE), getStack(TRItems.RUBY_AXE), getStack(TRItems.RUBY_HOE), getStack(TRItems.RUBY_SPADE), getStack(TRItems.RUBY_HELMET), getStack(TRItems.RUBY_CHESTPLATE), getStack(TRItems.RUBY_LEGGINGS), getStack(TRItems.RUBY_BOOTS), "gemRuby");
addToolAndArmourRecipes(getStack(TRItems.SAPPHIRE_SWORD), getStack(TRItems.SAPPHIRE_PICKAXE), getStack(TRItems.SAPPHIRE_AXE), getStack(TRItems.SAPPHIRE_HOE), getStack(TRItems.SAPPHIRE_SPADE), getStack(TRItems.SAPPHIRE_HELMET), getStack(TRItems.SAPPHIRE_CHSTPLATE), getStack(TRItems.SAPPHIRE_LEGGINGS), getStack(TRItems.SAPPHIRE_BOOTS), "gemSapphire"); addToolAndArmourRecipes(getStack(TRItems.SAPPHIRE_SWORD), getStack(TRItems.SAPPHIRE_PICKAXE), getStack(TRItems.SAPPHIRE_AXE), getStack(TRItems.SAPPHIRE_HOE), getStack(TRItems.SAPPHIRE_SPADE), getStack(TRItems.SAPPHIRE_HELMET), getStack(TRItems.SAPPHIRE_CHSTPLATE), getStack(TRItems.SAPPHIRE_LEGGINGS), getStack(TRItems.SAPPHIRE_BOOTS), "gemSapphire");
@ -122,7 +122,7 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(ModBlocks.ELECTRIC_FURNACE)); registerShaped(getStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), "CHC", "HBH", "FHF", 'H', getMaterial("cupronickelHeatingCoil", Type.PART), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'F', getStack(ModBlocks.ELECTRIC_FURNACE));
registerShaped(getStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(ModBlocks.GRINDER)); registerShaped(getStack(ModBlocks.INDUSTRIAL_GRINDER), "ECG", "HHH", "CBC", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'H', "craftingDiamondGrinder", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'G', getStack(ModBlocks.GRINDER));
// registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR)); // registerShaped(getStack(ModBlocks.IMPLOSION_COMPRESSOR), "ABA", "CPC", "ABA", 'A', getMaterialObject("advancedAlloy", Type.INGOT), 'C', "circuitAdvanced", 'B', "machineBlockAdvanced", 'P', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(ModBlocks.EXTRACTOR)); registerShaped(getStack(ModBlocks.VACUUM_FREEZER), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C', "circuitAdvanced", 'G', "glassReinforced", 'P', getStack(ModBlocks.EXTRACTOR));
registerShaped(getStack(ModBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(ModBlocks.EXTRACTOR)); registerShaped(getStack(ModBlocks.DISTILLATION_TOWER), "CMC", "PBP", "EME", 'E', getStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), 'M', "circuitMaster", 'B', "machineBlockElite", 'C', getStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), 'P', getStack(ModBlocks.EXTRACTOR));
registerShaped(getStack(ModBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(ModBlocks.EXTRACTOR), 'P', getStack(ModBlocks.COMPRESSOR), 'E', getStack(ModBlocks.EXTRACTOR)); registerShaped(getStack(ModBlocks.CHEMICAL_REACTOR), "IMI", "CPC", "IEI", 'I', "plateInvar", 'C', "circuitAdvanced", 'M', getStack(ModBlocks.EXTRACTOR), 'P', getStack(ModBlocks.COMPRESSOR), 'E', getStack(ModBlocks.EXTRACTOR));
registerShaped(getStack(ModBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.COMPRESSOR), 'B', "machineBlockBasic"); registerShaped(getStack(ModBlocks.ROLLING_MACHINE), "PCP", "MBM", "PCP", 'P', getStack(Blocks.PISTON), 'C', "circuitAdvanced", 'M', getStack(ModBlocks.COMPRESSOR), 'B', "machineBlockBasic");
@ -177,15 +177,15 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getMaterial("machine", Type.MACHINE_FRAME), "AAA", "A A", "AAA", 'A', "ingotRefinedIron"); registerShaped(getMaterial("machine", Type.MACHINE_FRAME), "AAA", "A A", "AAA", 'A', "ingotRefinedIron");
registerShaped(getMaterial("advanced_machine", Type.MACHINE_FRAME), " C ", "AMA", " C ", 'A', "plateAdvancedAlloy", 'C', "plateCarbon", 'M', "machineBlockBasic"); registerShaped(getMaterial("advanced_machine", Type.MACHINE_FRAME), " C ", "AMA", " C ", 'A', "plateAdvancedAlloy", 'C', "plateCarbon", 'M', "machineBlockBasic");
registerShaped(getMaterial("highly_advanced_machine", Type.MACHINE_FRAME), "CTC", "TBT", "CTC", 'C', "plateChrome", 'T', "plateTitanium", 'B', "machineBlockAdvanced"); registerShaped(getMaterial("highly_advanced_machine", Type.MACHINE_FRAME), "CTC", "TBT", "CTC", 'C', "plateChrome", 'T', "plateTitanium", 'B', "machineBlockAdvanced");
// Multiblock casings // Multiblock casings
registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "ingotRefinedIron", 'C', "circuitBasic", 'A', "machineBlockBasic"); registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "ingotRefinedIron", 'C', "circuitBasic", 'A', "machineBlockBasic");
registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateIron", 'C', "circuitBasic", 'A', "machineBlockBasic"); registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateIron", 'C', "circuitBasic", 'A', "machineBlockBasic");
registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateAluminum", 'C', "circuitBasic", 'A', "machineBlockBasic"); registerShaped(getMaterial("standard", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateAluminum", 'C', "circuitBasic", 'A', "machineBlockBasic");
registerShaped(getMaterial("reinforced", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateSteel", 'C', "circuitAdvanced", 'A', "machineBlockAdvanced"); registerShaped(getMaterial("reinforced", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateSteel", 'C', "circuitAdvanced", 'A', "machineBlockAdvanced");
registerShaped(getMaterial("reinforced", 1, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateSteel", 'C', "circuitAdvanced", 'A', getMaterial("standard", Type.MACHINE_CASING)); registerShaped(getMaterial("reinforced", 1, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateSteel", 'C', "circuitAdvanced", 'A', getMaterial("standard", Type.MACHINE_CASING));
registerShaped(getMaterial("advanced", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateChrome", 'C', "circuitElite", 'A', "machineBlockElite"); registerShaped(getMaterial("advanced", 4, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateChrome", 'C', "circuitElite", 'A', "machineBlockElite");
registerShaped(getMaterial("advanced", 1, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateChrome", 'C', "circuitElite", 'A', getMaterial("reinforced", Type.MACHINE_CASING)); registerShaped(getMaterial("advanced", 1, Type.MACHINE_CASING), "RRR", "CAC", "RRR", 'R', "plateChrome", 'C', "circuitElite", 'A', getMaterial("reinforced", Type.MACHINE_CASING));
// Parts // Parts
// registerShaped(getMaterial("data_storage_circuit", Type.PART), "RGR", "LCL", "EEE", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic", 'E', "plateEmerald"); // registerShaped(getMaterial("data_storage_circuit", Type.PART), "RGR", "LCL", "EEE", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic", 'E', "plateEmerald");
@ -193,7 +193,7 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(getMaterial("energy_flow_circuit", 4, Type.PART), "ATA", "LIL", "ATA", 'T', "ingotTungsten", 'I', "plateIridiumAlloy", 'A', "circuitAdvanced", 'L', "lapotronCrystal"); // registerShaped(getMaterial("energy_flow_circuit", 4, Type.PART), "ATA", "LIL", "ATA", 'T', "ingotTungsten", 'I', "plateIridiumAlloy", 'A', "circuitAdvanced", 'L', "lapotronCrystal");
// registerShaped(getMaterial("data_orb", Type.PART), "DDD", "DSD", "DDD", 'D', "circuitStorage", 'S', "circuitElite"); // registerShaped(getMaterial("data_orb", Type.PART), "DDD", "DSD", "DDD", 'D', "circuitStorage", 'S', "circuitElite");
// registerShaped(getMaterial("diamond_saw_blade", 4, Type.PART), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel"); // registerShaped(getMaterial("diamond_saw_blade", 4, Type.PART), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel");
// registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond"); // registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond");
// registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel"); // registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel");
// registerShaped(getMaterial("computer_monitor", Type.PART), "ADA", "DGD", "ADA", 'D', "dye", 'A', "ingotAluminum", 'G', "paneGlass"); // registerShaped(getMaterial("computer_monitor", Type.PART), "ADA", "DGD", "ADA", 'D', "dye", 'A', "ingotAluminum", 'G', "paneGlass");
// registerShaped(getMaterial("coolant_simple", 2, Type.PART), " T ", "TWT", " T ", 'T', "ingotTin", 'W', getStack(Items.WATER_BUCKET)); // registerShaped(getMaterial("coolant_simple", 2, Type.PART), " T ", "TWT", " T ", 'T', "ingotTin", 'W', getStack(Items.WATER_BUCKET));
@ -214,7 +214,7 @@ public class CraftingTableRecipes extends RecipeMethods {
// registerShaped(getMaterial("carbon_fiber", Type.PART), "CCC", "C C", "CCC", 'C', getCell("carbon")); // registerShaped(getMaterial("carbon_fiber", Type.PART), "CCC", "C C", "CCC", 'C', getCell("carbon"));
// registerShapeless(getMaterial("carbon_mesh", Type.PART), getMaterial("carbon_fiber", Type.PART), getMaterial("carbon_fiber", Type.PART)); // registerShapeless(getMaterial("carbon_mesh", Type.PART), getMaterial("carbon_fiber", Type.PART), getMaterial("carbon_fiber", Type.PART));
// registerShaped(getMaterial("electronic_circuit", Type.PART), "WWW", "SRS", "WWW", 'R', "ingotRefinedIron", 'S', Items.REDSTONE, 'W', EnumCableType.ICOPPER.getStack()); // registerShaped(getMaterial("electronic_circuit", Type.PART), "WWW", "SRS", "WWW", 'R', "ingotRefinedIron", 'S', Items.REDSTONE, 'W', EnumCableType.ICOPPER.getStack());
// registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic"); // registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic");
// Cables // Cables
registerShaped(getMaterial("copper", 6, Type.CABLE), "CCC", 'C', "ingotCopper"); registerShaped(getMaterial("copper", 6, Type.CABLE), "CCC", 'C', "ingotCopper");

View file

@ -49,10 +49,11 @@ public class IndustrialGrinderRecipes extends RecipeMethods {
if (oresExist("dustSmallThorium")) { if (oresExist("dustSmallThorium")) {
register(getOre("oreCoal"), WATER, 100, 64, getStack(Items.COAL, 2), getOre("dustSmallThorium")); register(getOre("oreCoal"), WATER, 100, 64, getStack(Items.COAL, 2), getOre("dustSmallThorium"));
} else { } else {
register(getOre("oreCoal"), WATER, 100, 64, getStack(Items.COAL, 2)); register(getOre("oreCoal"), WATER, 100, 64, getStack(Items.COAL, 3));
register(getOre("oreCoal"), MERCURY, 100, 64, getStack(Items.COAL, 4));
} }
// TODO: Fix recipe // TODO: Fix recipe
// register(getOre("oreIron"), WATER, 100, 64, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); // register(getOre("oreIron"), WATER, 100, 64, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST));
// register(getOre("oreGold"), WATER, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); // register(getOre("oreGold"), WATER, 100, 64, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST));
@ -64,7 +65,7 @@ public class IndustrialGrinderRecipes extends RecipeMethods {
// register(getOre("oreRedstone"), WATER, 100, 64, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); // register(getOre("oreRedstone"), WATER, 100, 64, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST));
// register(getOre("oreDiamond"), WATER, 100, 64, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); // register(getOre("oreDiamond"), WATER, 100, 64, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST));
//
// register(getOre("oreEmerald"), WATER, 100, 64, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); // register(getOre("oreEmerald"), WATER, 100, 64, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST));
//TR ores //TR ores

View file

@ -43,6 +43,7 @@ import techreborn.config.ConfigTechReborn;
import techreborn.init.TRItems; import techreborn.init.TRItems;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -61,6 +62,9 @@ public class ItemAdvancedDrill extends ItemDrill {
return new HashSet<BlockPos>(); return new HashSet<BlockPos>();
} }
RayTraceResult raytrace = rayTrace(worldIn, playerIn, false); RayTraceResult raytrace = rayTrace(worldIn, playerIn, false);
if(raytrace == null || raytrace.sideHit == null){
return Collections.emptySet();
}
EnumFacing enumfacing = raytrace.sideHit; EnumFacing enumfacing = raytrace.sideHit;
if (enumfacing == EnumFacing.SOUTH || enumfacing == EnumFacing.NORTH) { if (enumfacing == EnumFacing.SOUTH || enumfacing == EnumFacing.NORTH) {
for (int i = -1; i < 2; i++) { for (int i = -1; i < 2; i++) {

View file

@ -110,7 +110,9 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
@Override @Override
public void onCreated(ItemStack stack, World worldIn, EntityPlayer playerIn) { public void onCreated(ItemStack stack, World worldIn, EntityPlayer playerIn) {
stack.addEnchantment(Enchantments.SILK_TOUCH, 1); if (!stack.isItemEnchanted()) {
stack.addEnchantment(Enchantments.SILK_TOUCH, 1);
}
} }
@Override @Override

View file

@ -46,6 +46,7 @@ import techreborn.client.ClientEventHandler;
import techreborn.client.IconSupplier; import techreborn.client.IconSupplier;
import techreborn.client.RegisterItemJsons; import techreborn.client.RegisterItemJsons;
import techreborn.client.gui.GuiBase; import techreborn.client.gui.GuiBase;
import techreborn.client.gui.slot.GuiFluidConfiguration;
import techreborn.client.gui.slot.GuiSlotConfiguration; import techreborn.client.gui.slot.GuiSlotConfiguration;
import techreborn.client.keybindings.KeyBindings; import techreborn.client.keybindings.KeyBindings;
import techreborn.client.render.ModelDynamicCell; import techreborn.client.render.ModelDynamicCell;
@ -80,6 +81,7 @@ public class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(new StackToolTipEvent()); MinecraftForge.EVENT_BUS.register(new StackToolTipEvent());
multiblockRenderEvent = new MultiblockRenderEvent(); multiblockRenderEvent = new MultiblockRenderEvent();
MinecraftForge.EVENT_BUS.register(GuiSlotConfiguration.class); MinecraftForge.EVENT_BUS.register(GuiSlotConfiguration.class);
MinecraftForge.EVENT_BUS.register(GuiFluidConfiguration.class);
MinecraftForge.EVENT_BUS.register(multiblockRenderEvent); MinecraftForge.EVENT_BUS.register(multiblockRenderEvent);
// TODO FIX ME // TODO FIX ME
ClientRegistry.registerKeyBinding(KeyBindings.config); ClientRegistry.registerKeyBinding(KeyBindings.config);

View file

@ -0,0 +1,47 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.tiles;
import net.minecraft.item.ItemStack;
public class TileCreativeQuantumChest extends TileQuantumChest {
@Override
public void update() {
super.update();
ItemStack stack = getStackInSlot(1);
if (!stack.isEmpty() && storedItem.isEmpty()) {
stack.setCount(stack.getMaxStackSize());
storedItem = stack.copy();
}
storedItem.setCount(maxCapacity - storedItem.getMaxStackSize());
}
@Override
public int slotTransferSpeed() {
return 1;
}
}

View file

@ -0,0 +1,46 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.tiles;
public class TileCreativeQuantumTank extends TileQuantumTank {
@Override
public void update() {
super.update();
if (!tank.isEmpty() && !tank.isFull()) {
tank.setFluidAmount(Integer.MAX_VALUE);
}
}
@Override
public int slotTransferSpeed() {
return 1;
}
@Override
public int fluidTransferAmount() {
return 10000;
}
}

View file

@ -32,12 +32,10 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.RebornRegistry;
@ -45,6 +43,7 @@ import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.Tank; import reborncore.common.util.Tank;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
/** /**
@ -161,19 +160,9 @@ public class TilePump extends TilePowerAcceptor {
return tagCompound; return tagCompound;
} }
@Nullable
@Override @Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) { public Tank getTank() {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return tank;
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
return super.getCapability(capability, facing);
} }
} }

View file

@ -29,9 +29,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager; import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
@ -47,6 +44,7 @@ import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
@ -113,22 +111,6 @@ public class TileQuantumTank extends TileLegacyMachineBase
readFromNBT(packet.getNbtCompound()); readFromNBT(packet.getNbtCompound());
} }
@Override
public boolean hasCapability(final Capability<?> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(final Capability<T> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
return super.getCapability(capability, facing);
}
// IInventoryProvider // IInventoryProvider
@Override @Override
public Inventory getInventory() { public Inventory getInventory() {
@ -161,4 +143,10 @@ public class TileQuantumTank extends TileLegacyMachineBase
.addInventory().tile(this).fluidSlot(0, 80, 17).outputSlot(1, 80, 53).addInventory() .addInventory().tile(this).fluidSlot(0, 80, 17).outputSlot(1, 80, 53).addInventory()
.create(this); .create(this);
} }
@Nullable
@Override
public Tank getTank() {
return tank;
}
} }

View file

@ -26,9 +26,7 @@ package techreborn.tiles.generator;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.api.IToolDrop; import reborncore.api.IToolDrop;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
@ -41,6 +39,8 @@ import techreborn.api.generator.FluidGeneratorRecipe;
import techreborn.api.generator.FluidGeneratorRecipeList; import techreborn.api.generator.FluidGeneratorRecipeList;
import techreborn.api.generator.GeneratorRecipeHelper; import techreborn.api.generator.GeneratorRecipeHelper;
import javax.annotation.Nullable;
public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IToolDrop, IInventoryProvider { public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IToolDrop, IInventoryProvider {
private final FluidGeneratorRecipeList recipes; private final FluidGeneratorRecipeList recipes;
@ -90,7 +90,7 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement
} }
if (tank.getFluidAmount() > 0) { if (tank.getFluidAmount() > 0) {
if (currentRecipe == null || !currentRecipe.getFluid().equals(tank.getFluidType())) if (currentRecipe == null || !FluidUtils.fluidEquals(currentRecipe.getFluid(), tank.getFluidType()))
currentRecipe = getRecipes().getRecipeForFluid(tank.getFluidType()).orElse(null); currentRecipe = getRecipes().getRecipeForFluid(tank.getFluidType()).orElse(null);
if (currentRecipe != null) { if (currentRecipe != null) {
@ -172,22 +172,6 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement
return inventory; return inventory;
} }
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
return super.getCapability(capability, facing);
}
@Override @Override
public void readFromNBT(NBTTagCompound tagCompound) { public void readFromNBT(NBTTagCompound tagCompound) {
super.readFromNBT(tagCompound); super.readFromNBT(tagCompound);
@ -221,4 +205,10 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement
public void setTankAmount(int amount){ public void setTankAmount(int amount){
tank.setFluidAmount(amount); tank.setFluidAmount(amount);
} }
@Nullable
@Override
public Tank getTank() {
return tank;
}
} }

View file

@ -27,10 +27,7 @@ package techreborn.tiles.multiblock;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.common.recipes.RecipeCrafter; import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.registration.impl.ConfigRegistry;
@ -46,6 +43,8 @@ import techreborn.init.TRIngredients;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable;
/** /**
* @author drcrazy * @author drcrazy
* *
@ -124,22 +123,6 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
return tagCompound; return tagCompound;
} }
@Override
public boolean hasCapability(final Capability<?> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(final Capability<T> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
return super.getCapability(capability, facing);
}
// TileLegacyMachineBase // TileLegacyMachineBase
@Override @Override
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
@ -161,4 +144,10 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
.outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory() .outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory()
.create(this); .create(this);
} }
@Nullable
@Override
public Tank getTank() {
return tank;
}
} }

View file

@ -31,9 +31,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
@ -53,6 +51,8 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class TileIndustrialGrinder extends TileGenericMachine implements IContainerProvider, ITileRecipeHandler<IndustrialGrinderRecipe> { public class TileIndustrialGrinder extends TileGenericMachine implements IContainerProvider, ITileRecipeHandler<IndustrialGrinderRecipe> {
@ -128,22 +128,6 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
return tagCompound; return tagCompound;
} }
@Override
public boolean hasCapability(final Capability<?> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(final Capability<T> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
return super.getCapability(capability, facing);
}
// TileLegacyMachineBase // TileLegacyMachineBase
@Override @Override
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
@ -214,4 +198,10 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
} }
return false; return false;
} }
@Nullable
@Override
public Tank getTank() {
return tank;
}
} }

View file

@ -31,9 +31,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
@ -53,6 +51,8 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import techreborn.tiles.TileGenericMachine; import techreborn.tiles.TileGenericMachine;
import javax.annotation.Nullable;
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class TileIndustrialSawmill extends TileGenericMachine implements IContainerProvider, ITileRecipeHandler<IndustrialSawmillRecipe> { public class TileIndustrialSawmill extends TileGenericMachine implements IContainerProvider, ITileRecipeHandler<IndustrialSawmillRecipe> {
@ -128,24 +128,6 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
return tagCompound; return tagCompound;
} }
@Override
public boolean hasCapability(final Capability<?> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
return true;
}
return super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(final Capability<T> capability, final EnumFacing facing) {
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
if (tank != null) {
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tank);
}
}
return super.getCapability(capability, facing);
}
// TileLegacyMachineBase // TileLegacyMachineBase
@Override @Override
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
@ -213,4 +195,10 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
} }
return false; return false;
} }
@Nullable
@Override
public Tank getTank() {
return tank;
}
} }

View file

@ -59,7 +59,7 @@ import java.util.List;
*/ */
@RebornRegistry(modID = ModInfo.MOD_ID) @RebornRegistry(modID = ModInfo.MOD_ID)
public class TileAutoCraftingTable extends TilePowerAcceptor public class TileAutoCraftingTable extends TilePowerAcceptor
implements IToolDrop, IInventoryProvider, IContainerProvider { implements IToolDrop, IInventoryProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "autocrafter", key = "AutoCrafterInput", comment = "AutoCrafting Table Max Input (Value in EU)") @ConfigRegistry(config = "machines", category = "autocrafter", key = "AutoCrafterInput", comment = "AutoCrafting Table Max Input (Value in EU)")
public static int maxInput = 32; public static int maxInput = 32;
@ -85,8 +85,8 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
public IRecipe getIRecipe() { public IRecipe getIRecipe() {
InventoryCrafting crafting = getCraftingInventory(); InventoryCrafting crafting = getCraftingInventory();
if (!crafting.isEmpty()) { if (!crafting.isEmpty()) {
if(lastRecipe != null){ if (lastRecipe != null) {
if(lastRecipe.matches(crafting, world)){ if (lastRecipe.matches(crafting, world)) {
return lastRecipe; return lastRecipe;
} }
} }
@ -181,41 +181,39 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
} }
public boolean make(IRecipe recipe) { public boolean make(IRecipe recipe) {
if (canMake(recipe)) { if (recipe == null || !canMake(recipe)) {
if (recipe == null) { return false;
return false; }
} else if (recipe != null) { for (int i = 0; i < recipe.getIngredients().size(); i++) {
for (int i = 0; i < recipe.getIngredients().size(); i++) { Ingredient ingredient = recipe.getIngredients().get(i);
Ingredient ingredient = recipe.getIngredients().get(i); // Looks for the best slot to take it from
//Looks for the best slot to take it from ItemStack bestSlot = inventory.getStackInSlot(i);
ItemStack bestSlot = inventory.getStackInSlot(i); if (ingredient.apply(bestSlot)) {
if (ingredient.apply(bestSlot)) { handleContainerItem(bestSlot);
handleContainerItem(bestSlot); bestSlot.shrink(1);
bestSlot.shrink(1); } else {
} else { for (int j = 0; j < 9; j++) {
for (int j = 0; j < 9; j++) { ItemStack stack = inventory.getStackInSlot(j);
ItemStack stack = inventory.getStackInSlot(j); if (ingredient.apply(stack)) {
if (ingredient.apply(stack)) { handleContainerItem(stack);
handleContainerItem(stack); stack.shrink(1); // TODO is this right? or do I need
stack.shrink(1); //TODO is this right? or do I need to use it as an actull crafting grid // to use it as an actull
break; // crafting grid
} break;
}
} }
} }
ItemStack output = inventory.getStackInSlot(9);
//TODO fire forge recipe event
ItemStack ouputStack = recipe.getCraftingResult(getCraftingInventory());
if (output.isEmpty()) {
inventory.setInventorySlotContents(9, ouputStack.copy());
} else {
//TODO use ouputStack in someway?
output.grow(recipe.getRecipeOutput().getCount());
}
return true;
} }
} }
return false; ItemStack output = inventory.getStackInSlot(9);
// TODO fire forge recipe event
ItemStack ouputStack = recipe.getCraftingResult(getCraftingInventory());
if (output.isEmpty()) {
inventory.setInventorySlotContents(9, ouputStack.copy());
} else {
// TODO use ouputStack in someway?
output.grow(recipe.getRecipeOutput().getCount());
}
return true;
} }
private void handleContainerItem(ItemStack stack) { private void handleContainerItem(ItemStack stack) {
@ -225,7 +223,8 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
if (hasOutputSpace(containerItem, 10)) { if (hasOutputSpace(containerItem, 10)) {
if (extraOutputSlot.isEmpty()) { if (extraOutputSlot.isEmpty()) {
setInventorySlotContents(10, containerItem.copy()); setInventorySlotContents(10, containerItem.copy());
} else if (ItemUtils.isItemEqual(extraOutputSlot, containerItem, true, true) && extraOutputSlot.getMaxStackSize() < extraOutputSlot.getCount() + containerItem.getCount()) { } else if (ItemUtils.isItemEqual(extraOutputSlot, containerItem, true, true)
&& extraOutputSlot.getMaxStackSize() < extraOutputSlot.getCount() + containerItem.getCount()) {
extraOutputSlot.grow(1); extraOutputSlot.grow(1);
} }
} }
@ -264,14 +263,15 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
if (ingredient != Ingredient.EMPTY && ingredient.apply(stack)) { if (ingredient != Ingredient.EMPTY && ingredient.apply(stack)) {
if (stackInSlot.isEmpty()) { if (stackInSlot.isEmpty()) {
possibleSlots.add(i); possibleSlots.add(i);
} else if (stackInSlot.getItem() == stack.getItem() && stackInSlot.getItemDamage() == stack.getItemDamage()) { } else if (stackInSlot.getItem() == stack.getItem()
&& stackInSlot.getItemDamage() == stack.getItemDamage()) {
if (stackInSlot.getMaxStackSize() >= stackInSlot.getCount() + stack.getCount()) { if (stackInSlot.getMaxStackSize() >= stackInSlot.getCount() + stack.getCount()) {
possibleSlots.add(i); possibleSlots.add(i);
} }
} }
} }
} }
//Slot, count // Slot, count
Pair<Integer, Integer> smallestCount = null; Pair<Integer, Integer> smallestCount = null;
for (Integer slot : possibleSlots) { for (Integer slot : possibleSlots) {
ItemStack slotStack = inventory.getStackInSlot(slot); ItemStack slotStack = inventory.getStackInSlot(slot);
@ -328,7 +328,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
progress++; progress++;
if (progress == 1) { if (progress == 1) {
world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), ModSounds.AUTO_CRAFTING, world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), ModSounds.AUTO_CRAFTING,
SoundCategory.BLOCKS, 0.3F, 0.8F); SoundCategory.BLOCKS, 0.3F, 0.8F);
} }
useEnergy(euTick); useEnergy(euTick);
} }
@ -342,7 +342,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
} }
} }
//Easyest way to sync back to the client // Easyest way to sync back to the client
public int getLockedInt() { public int getLockedInt() {
return locked ? 1 : 0; return locked ? 1 : 0;
} }
@ -384,7 +384,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
@Override @Override
public void readFromNBT(NBTTagCompound tag) { public void readFromNBT(NBTTagCompound tag) {
if(tag.hasKey("locked")){ if (tag.hasKey("locked")) {
locked = tag.getBoolean("locked"); locked = tag.getBoolean("locked");
} }
super.readFromNBT(tag); super.readFromNBT(tag);
@ -407,12 +407,12 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
@Override @Override
public int[] getSlotsForFace(EnumFacing side) { public int[] getSlotsForFace(EnumFacing side) {
return new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; return new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
} }
@Override @Override
public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) { public boolean canInsertItem(int index, ItemStack stack, EnumFacing direction) {
if(index > 8){ if (index > 8) {
return false; return false;
} }
int bestSlot = findBestSlotForStack(getIRecipe(), stack); int bestSlot = findBestSlotForStack(getIRecipe(), stack);
@ -424,13 +424,13 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
@Override @Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
if(index > 8){ if (index > 8) {
return true; return true;
} }
return false; return false;
} }
//This machine doesnt have a facing // This machine doesnt have a facing
@Override @Override
public EnumFacing getFacingEnum() { public EnumFacing getFacingEnum() {
return EnumFacing.NORTH; return EnumFacing.NORTH;
@ -451,16 +451,12 @@ public class TileAutoCraftingTable extends TilePowerAcceptor
// IContainerProvider // IContainerProvider
@Override @Override
public BuiltContainer createContainer(EntityPlayer player) { public BuiltContainer createContainer(EntityPlayer player) {
return new ContainerBuilder("autocraftingtable").player(player.inventory).inventory().hotbar() return new ContainerBuilder("autocraftingtable").player(player.inventory).inventory().hotbar().addInventory()
.addInventory().tile(this) .tile(this).slot(0, 28, 25).slot(1, 46, 25).slot(2, 64, 25).slot(3, 28, 43).slot(4, 46, 43)
.slot(0, 28, 25).slot(1, 46, 25).slot(2, 64, 25) .slot(5, 64, 43).slot(6, 28, 61).slot(7, 46, 61).slot(8, 64, 61).outputSlot(9, 145, 42)
.slot(3, 28, 43).slot(4, 46, 43).slot(5, 64, 43) .outputSlot(10, 145, 70).syncEnergyValue().syncIntegerValue(this::getProgress, this::setProgress)
.slot(6, 28, 61).slot(7, 46, 61).slot(8, 64, 61) .syncIntegerValue(this::getMaxProgress, this::setMaxProgress)
.outputSlot(9, 145, 42).outputSlot(10, 145, 70).syncEnergyValue() .syncIntegerValue(this::getLockedInt, this::setLockedInt).addInventory().create(this);
.syncIntegerValue(this::getProgress, this::setProgress)
.syncIntegerValue(this::getMaxProgress, this::setMaxProgress)
.syncIntegerValue(this::getLockedInt, this::setLockedInt)
.addInventory().create(this);
} }
@Override @Override

View file

@ -114,8 +114,8 @@ public class TechRebornWorldGen implements IWorldGenerator {
for (OreConfig ore : config) { for (OreConfig ore : config) {
if (ore.blockName.equals(defaultOre.blockName) && ore.meta == defaultOre.meta) { if (ore.blockName.equals(defaultOre.blockName) && ore.meta == defaultOre.meta) {
hasFoundOre = true; hasFoundOre = true;
ore.state = defaultOre.state; // Should allow for states to // Should allow for states to be saved/loaded
// be saved/loaded ore.state = defaultOre.state;
} }
} }
if (!hasFoundOre) { if (!hasFoundOre) {
@ -194,52 +194,53 @@ public class TechRebornWorldGen implements IWorldGenerator {
boolean genTree = false; boolean genTree = false;
List<OreConfig> list = new ArrayList<>(); List<OreConfig> list = new ArrayList<>();
Predicate<IBlockState> predicate = BlockMatcher.forBlock(Blocks.STONE); Predicate<IBlockState> predicate = BlockMatcher.forBlock(Blocks.STONE);
if (world.provider.isSurfaceWorld()) { if (world.provider.getDimension() == -1) {
list.addAll(getAllGenOresFromList(config.overworldOres));
genTree = true;
} else if (world.provider.getDimension() == -1) {
list.addAll(getAllGenOresFromList(config.neatherOres)); list.addAll(getAllGenOresFromList(config.neatherOres));
predicate = BlockMatcher.forBlock(Blocks.NETHERRACK); predicate = BlockMatcher.forBlock(Blocks.NETHERRACK);
} else if (world.provider.getDimension() == 1) { } else if (world.provider.getDimension() == 1) {
list.addAll(getAllGenOresFromList(config.endOres)); list.addAll(getAllGenOresFromList(config.endOres));
predicate = BlockMatcher.forBlock(Blocks.END_STONE); predicate = BlockMatcher.forBlock(Blocks.END_STONE);
} }
else if (config.overworldOresInModdedDims || world.provider.getDimension() == 0) {
list.addAll(getAllGenOresFromList(config.overworldOres));
genTree = true;
}
if (!list.isEmpty() && config.generateOres) { if (!list.isEmpty() && config.generateOres) {
int xPos, yPos, zPos; int xPos, yPos, zPos;
for (OreConfig ore : list) { for (OreConfig ore : list) {
WorldGenMinable worldGenMinable = new WorldGenMinable(ore.state, ore.veinSize, predicate); WorldGenMinable worldGenMinable = new WorldGenMinable(ore.state, ore.veinSize, predicate);
if (ore.state != null) { if (ore.state == null) {
for (int i = 0; i < ore.veinsPerChunk; i++) { continue;
xPos = chunkX * 16 + random.nextInt(16); }
if (ore.maxYHeight == -1 || ore.minYHeight == -1) { for (int i = 0; i < ore.veinsPerChunk; i++) {
continue; xPos = chunkX * 16 + random.nextInt(16);
} if (ore.maxYHeight == -1 || ore.minYHeight == -1) {
yPos = ore.minYHeight + random.nextInt(ore.maxYHeight - ore.minYHeight); continue;
zPos = chunkZ * 16 + random.nextInt(16); }
BlockPos pos = new BlockPos(xPos, yPos, zPos); yPos = ore.minYHeight + random.nextInt(ore.maxYHeight - ore.minYHeight);
zPos = chunkZ * 16 + random.nextInt(16);
if (ore.veinSize < 4){ BlockPos pos = new BlockPos(xPos, yPos, zPos);
// Workaround for small veins
for (int j = 1; j < ore.veinSize; j++) { if (ore.veinSize < 4) {
// standard worldgen offset is added here like in WorldGenMinable#generate // Workaround for small veins
BlockPos smallVeinPos = pos.add(8, 0, 8); for (int j = 1; j < ore.veinSize; j++) {
smallVeinPos.add(random.nextInt(2), random.nextInt(2), random.nextInt(2)); // standard worldgen offset is added here like in WorldGenMinable#generate
IBlockState blockState = world.getBlockState(smallVeinPos); BlockPos smallVeinPos = pos.add(8, 0, 8);
if (blockState.getBlock().isReplaceableOreGen(blockState, world, smallVeinPos, predicate)) { smallVeinPos.add(random.nextInt(2), random.nextInt(2), random.nextInt(2));
world.setBlockState(smallVeinPos, ore.state, 2); IBlockState blockState = world.getBlockState(smallVeinPos);
} if (blockState.getBlock().isReplaceableOreGen(blockState, world, smallVeinPos, predicate)) {
} world.setBlockState(smallVeinPos, ore.state, 2);
} else {
try {
worldGenMinable.generate(world, random, pos);
} catch (ArrayIndexOutOfBoundsException e) {
Core.logHelper.error("Something bad is happening during world gen the ore "
+ ore.blockNiceName
+ " caused a crash when generating. Report this to the TechReborn devs with a log");
} }
} }
} else {
try {
worldGenMinable.generate(world, random, pos);
} catch (ArrayIndexOutOfBoundsException e) {
Core.logHelper.error("Something bad is happening during world gen the ore "
+ ore.blockNiceName
+ " caused a crash when generating. Report this to the TechReborn devs with a log");
}
} }
} }
} }

View file

@ -36,6 +36,8 @@ public class WorldGenConfig {
public boolean generateOres = true; public boolean generateOres = true;
public boolean retroGenOres = false; public boolean retroGenOres = false;
public boolean overworldOresInModdedDims = true;
public List<OreConfig> overworldOres; public List<OreConfig> overworldOres;

View file

@ -0,0 +1,45 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "orientable",
"textures": {
"particle": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side",
"down": "techreborn:blocks/machines/tier3_machines/quantum_chest_bottom",
"top": "techreborn:blocks/machines/tier3_machines/quantum_chest_top",
"side": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side",
"front": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side"
}
},
"variants": {
"inventory": {
"transform": "forge:default-block",
"model": "orientable",
"textures": {
}
},
"facing": {
"north": {
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
}
},
"active": {
"true": {
"textures": {
}
},
"false": {
"textures": {
}
}
}
}
}

View file

@ -0,0 +1,45 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "orientable",
"textures": {
"particle": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side",
"down": "techreborn:blocks/machines/tier3_machines/quantum_tank_bottom",
"top": "techreborn:blocks/machines/tier3_machines/quantum_tank_top",
"side": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side",
"front": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side"
}
},
"variants": {
"inventory": {
"transform": "forge:default-block",
"model": "orientable",
"textures": {
}
},
"facing": {
"north": {
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
}
},
"active": {
"true": {
"textures": {
}
},
"false": {
"textures": {
}
}
}
}
}

File diff suppressed because it is too large Load diff

View file

@ -1,892 +0,0 @@
itemGroup.techreborn=Tech Reborn
#machines
tile.techreborn.gasTurbine.name=Turbine à gaz
tile.techreborn.industrialBlock.name=Industriel
tile.techreborn.thermalGenerator.name=Générateur thermique
tile.techreborn.quantumTank.name=Réservoir quantique
tile.techreborn.quantumChest.name=Coffre quantique
tile.techreborn.digitalChest.name=Coffre digital
tile.techreborn.centrifuge.name=Centrifugeuse
tile.techreborn.rollingmachine.name=Lamineuse
tile.techreborn.machineCasing.standard.name=Boitier de machine standard
tile.techreborn.machineCasing.reinforced.name=Boitier de machine renforcé
tile.techreborn.machineCasing.advanced.name=Boitier de machine avancé
tile.techreborn.highlyAdvancedMachine.name=Boitier de machine hautement avancé
tile.techreborn.blastfurnace.name=Haut fourneau industriel
tile.techreborn.alloysmelter.name=Four électrique d'alliage
tile.techreborn.matterfabricator.name=Fabricateur de matière
tile.techreborn.implosioncompressor.name=Compresseur à implosion
tile.techreborn.grinder.name=Broyeur industriel
tile.techreborn.chunkloader.name=Chargeur de chunk industriel
tile.techreborn.magicenergyconverter.name=Convertiseur d'énergie magique
tile.techreborn.dieselgenerator.name=Générateur diesel
tile.techreborn.industrialelectrolyzer.name=Électrolyseur industriel
tile.techreborn.magicenergyabsorber.name=Absorbeur d'énergie magique
tile.techreborn.assemblingmachine.name=Assembleur
tile.techreborn.semifluidgenerator.name=Générateur semi-fluide
tile.techreborn.alloyfurnace.name=Four en fer d'alliage
tile.techreborn.chemicalreactor.name=Réacteur chimique
tile.techreborn.dragoneggsiphoner.name=Syphon d'énergie d'oeuf de dragon
tile.techreborn.idsu.name=USID
tile.techreborn.pos.name=USEA
tile.techreborn.lesu.name=USEL
tile.techreborn.lesustorage.name=Stockage USEL
tile.techreborn.distillationtower.name=Tour de distillation
tile.techreborn.electriccraftingtable.name=Table d'autotraitement électrique
tile.techreborn.vacuumfreezer.name=Congélateur à vide
tile.techreborn.plasmagenerator.name=Générateur plasma
tile.techreborn.fusioncontrolcomputer.name=Ordinateur de contrôle de fusion
tile.techreborn.computercube.name=Cube d'ordinateur TechReborn
tile.techreborn.fusioncoil.name=Bobine de fusion
tile.techreborn.lightningrod.name=Paratonnerre
tile.techreborn.assemblinmachine.name=Machine d'assemblage
tile.techreborn.heatgenerator.name=Générateur de chaleur
tile.techreborn.machineFrame.aluminum.name=Coque de machine en aluminum
tile.techreborn.machineFrame.iron.name=Coque de machine en fer
tile.techreborn.machineFrame.bronze.name=Coque de machine en bronze
tile.techreborn.machineFrame.brass.name=Coque de machine en laiton
tile.techreborn.machineFrame.steel.name=Coque de machine en acier
tile.techreborn.machineFrame.titanium.name=Coque de machine en titane
tile.techreborn.industrialsawmill.name=Scierie
tile.techreborn.chargebench.name=Banc de recharge
#Ores
tile.techreborn.ore.Galena.name=Minerai de galène
tile.techreborn.ore.Iridium.name=Minerai d'iridium
tile.techreborn.ore.Ruby.name=Minerai de rubis
tile.techreborn.ore.Sapphire.name=Minerai de saphire
tile.techreborn.ore.Bauxite.name=Minerai de bauxite
tile.techreborn.ore.Pyrite.name=Minerai de pyrite
tile.techreborn.ore.Cinnabar.name=Minerai de cinabre
tile.techreborn.ore.Sphalerite.name=Minerai de sphalérite
tile.techreborn.ore.Tungsten.name=Minerai de tungstène
tile.techreborn.ore.Sheldonite.name=Minerai de sheldonite
tile.techreborn.ore.Peridot.name=Minerai de péridot
tile.techreborn.ore.Sodalite.name=Minerai de sodalite
tile.techreborn.ore.Tetrahedrite.name=Minerai de tétrahèdrite
tile.techreborn.ore.Cassiterite.name=Minerai de cassitérite
tile.techreborn.ore.Lead.name=Minerai de plomb
tile.techreborn.ore.Silver.name=Minerai d'argent
#Storage
tile.techreborn.storage.silver.name=Bloc d'argent
tile.techreborn.storage.aluminum.name=Bloc d'aluminum
tile.techreborn.storage.titanium.name=Bloc de titane
tile.techreborn.storage.chrome.name=Bloc de chrome
tile.techreborn.storage.steel.name=Bloc d'acier
tile.techreborn.storage.brass.name=Bloc de laiton
tile.techreborn.storage.lead.name=Bloc de plomb
tile.techreborn.storage.electrum.name=Bloc d'électrum
tile.techreborn.storage.zinc.name=Bloc de zinc
tile.techreborn.storage.platinum.name=Bloc de platine
tile.techreborn.storage.tungsten.name=Bloc de tungstène
tile.techreborn.storage.nickel.name=Bloc de nickel
tile.techreborn.storage.invar.name=Bloc d'invar
tile.techreborn.storage.osmium.name=Bloc d'osmium
tile.techreborn.storage.iridium.name=Bloc d'iridium
tile.techreborn.storage2.tungstensteel.name=Bloc d'acier au tungstène
tile.techreborn.storage2.lodestone.name=Bloc d'aimant naturel
tile.techreborn.storage2.tellurium.name=Bloc de tellure
tile.techreborn.storage2.iridium_reinforced_tungstensteel.name=Bloc d'acier au tungstène renforcé d'iridium
tile.techreborn.storage2.iridium_reinforced_stone.name=Pierre renforcée d'iridium
tile.techreborn.storage2.ruby.name=Bloc de rubis
tile.techreborn.storage2.sapphire.name=Bloc de saphirs
tile.techreborn.storage2.peridot.name=Bloc de péridot
tile.techreborn.storage2.yellow_garnet.name=Bloc de grenat jaune
tile.techreborn.storage2.red_garnet.name=Bloc de grenat rouge
tile.techreborn.farm.name=Ferme
#Fluids
tile.techreborn.berylium.name=Source de béryllium
tile.techreborn.calcium.name=Source de calcium
tile.techreborn.calciumcarbonate.name=Source de carbonate de calcium
tile.techreborn.chlorite.name=Source de chlorite
tile.techreborn.deuterium.name=Source de deutérium
tile.techreborn.glyceryl.name=Source de glycéryle
tile.techreborn.helium.name=Source d'hélium
tile.techreborn.helium3.name=Source d'hélium3
tile.techreborn.heliumplasma.name=Source de plasma d'hélium
tile.techreborn.hydrogen.name=Source d'hydrogène
tile.techreborn.lithium.name=Source de lithium
tile.techreborn.mercury.name=Source de mercure
tile.techreborn.methane.name=Source de méthane
tile.techreborn.nitrocoalfuel.name=Source de carburant nitrocarbonate
tile.techreborn.nitrofuel.name=Source de carburant azote
tile.techreborn.nitrogen.name=Source d'azote
tile.techreborn.nitrogendioxide.name=Source de dioxyde d'azote
tile.techreborn.potassium.name=Source de potassium
tile.techreborn.silicon.name=Source de silicium
tile.techreborn.sodium.name=Source de sodium
tile.techreborn.sodiumpersulfate.name=Source de persulfate de sodium
tile.techreborn.tritium.name=Source de tritium
tile.techreborn.wolframium.name=Source de wolfanium
tile.techreborn.supercondensator.name=Supercondensateur
fluid.fluid.fluidberylium=Bérylium
fluid.fluid.fluidcalcium=Calcium
fluid.fluid.fluidcalciumcarbonate=Carbonate de calcium
fluid.fluid.fluidchlorite=Chlorite
fluid.fluid.fluiddeuterium=Deutérium
fluid.fluid.fluidglyceryl=Glycéryle
fluid.fluid.fluidhelium=Hélium
fluid.fluid.fluidhelium3=Hélium3
fluid.fluid.fluidheliumplasma=Plasmea d'hélium
fluid.fluid.fluidhydrogen=Hydrogène
fluid.fluid.fluidlithium=Lithium
fluid.fluid.fluidmercury=Mercure
fluid.fluid.fluidmethane=Méthane
fluid.fluid.fluidnitrocoalfuel=Carburant nitrocarbonate
fluid.fluid.fluidnitrofuel=Carburant azote
fluid.fluid.fluidnitrogen=Azote
fluid.fluid.fluidnitrogendioxide=Dioxyde d'azote
fluid.fluid.fluidpotassium=Potassium
fluid.fluid.fluidsilicon=Silicium
fluid.fluid.fluidsodium=Sodium
fluid.fluid.fluidsodiumpersulfate=Persulfate de sodium
fluid.fluid.fluidtritium=Tritium
fluid.fluid.fluidwolframium=Wolframium
fluid.tile.techreborn.glyceryl=Glycéryle
fluid.tile.techreborn.berylium=Bérylium
fluid.tile.techreborn.chlorite=Chlorite
fluid.tile.techreborn.helium3=Hélium3
fluid.tile.techreborn.deuterium=Deutérium
fluid.tile.techreborn.helium=Hélium
fluid.tile.techreborn.calciumcarbonate=Carbonate de calcium
#Dusts
item.techreborn.dust.almandine.name=Poudre d'almandine
item.techreborn.dust.aluminumBrass.name=poudre de laiton d'aluminium
item.techreborn.dust.aluminum.name=Poudre d'aluminium
item.techreborn.dust.alumite.name=poudre d'alumite
item.techreborn.dust.andradite.name=Poudre d'andradite
item.techreborn.dust.antimony.name=Poudre d'antimoine
item.techreborn.dust.ardite.name=Poudre d'ardite
item.techreborn.dust.ashes.name=Cendres
item.techreborn.dust.basalt.name=Poudre de basalt
item.techreborn.dust.bauxite.name=Poudre de bauxite
item.techreborn.dust.biotite.name=poudre de biotite
item.techreborn.dust.brass.name=Poudre de laiton
item.techreborn.dust.bronze.name=Poudre de bronze
item.techreborn.dust.cadmium.name=Poudre de cadmium
item.techreborn.dust.calcite.name=Poudre de calcite
item.techreborn.dust.charcoal.name=Poudre de charbon de bois
item.techreborn.dust.chrome.name=Poudre de chrome
item.techreborn.dust.cinnabar.name=Poudre de cinabre
item.techreborn.dust.clay.name=Poudre d'argile
item.techreborn.dust.coal.name=Poudre de charbon
item.techreborn.dust.cobalt.name=Poudre de cobalt
item.techreborn.dust.copper.name=Poudre de cuivre
item.techreborn.dust.cupronickel.name=Poudre de cupronickel
item.techreborn.dust.darkAshes.name=Cendres sombres
item.techreborn.dust.darkIron.name=Poudre de fer sombre
item.techreborn.dust.diamond.name=Poudre de diamant
item.techreborn.dust.electrum.name=Poudre d'électrum
item.techreborn.dust.emerald.name=Poudre d'émeraude
item.techreborn.dust.enderEye.name=Poudre d'oeil du néant
item.techreborn.dust.enderPearl.name=Poudre de perle du néant
item.techreborn.dust.endstone.name=Poudre de pierre du néant
item.techreborn.dust.flint.name=Poudre de silex
item.techreborn.dust.gold.name=Poudre d'or
item.techreborn.dust.graphite.name=Poudre de graphite
item.techreborn.dust.grossular.name=Poudre de grossularite
item.techreborn.dust.indium.name=Poudre d'indium
item.techreborn.dust.invar.name=Poudre d'invar
item.techreborn.dust.iridium.name=Poudre d'iridium
item.techreborn.dust.iron.name=Poudre de fer
item.techreborn.dust.kanthal.name=Poudre de kanthal
item.techreborn.dust.lapis.name=Poudre de lapis lazuli
item.techreborn.dust.lazurite.name=Poudre de lazurite
item.techreborn.dust.lead.name=Poudre de plomb
item.techreborn.dust.limestone.name=Poudre de calcaire
item.techreborn.dust.lodestone.name=Aimant naturel
item.techreborn.dust.magnesium.name=Poudre de magnésium
item.techreborn.dust.magnetite.name=Poudre de magnétite
item.techreborn.dust.manganese.name=Poudre de manganèse
item.techreborn.dust.manyullyn.name=Poudre de manyullyn
item.techreborn.dust.marble.name=Poudre de marbre
item.techreborn.dust.mithril.name=Poudre de mithril
item.techreborn.dust.netherrack.name=Poudre de pierre du nether
item.techreborn.dust.nichrome.name=Poudre de nichrome
item.techreborn.dust.nickel.name=Poudre de nickel
item.techreborn.dust.obsidian.name=Poudre d'obsidienne
item.techreborn.dust.osmium.name=Poudre d'osmium
item.techreborn.dust.peridot.name=Péridot
item.techreborn.dust.phosphorous.name=Poudre phosphoré
item.techreborn.dust.platinum.name=Poudre de platine
item.techreborn.dust.potassiumFeldspar.name=Poudre de feldspaths potassiques
item.techreborn.dust.pyrite.name=Poudre de pyrite
item.techreborn.dust.pyrope.name=Poudre de pyrope
item.techreborn.dust.redGarnet.name=Poudre de grenat rouge
item.techreborn.dust.redrock.name=Poudre de roche rouge
item.techreborn.dust.ruby.name=Poudre de rubis
item.techreborn.dust.saltpeter.name=Poudre de salpètre
item.techreborn.dust.sapphire.name=Poudre de saphir
item.techreborn.dust.silicon.name=Poudre de silicium
item.techreborn.dust.silver.name=Poudre d'argent
item.techreborn.dust.sodalite.name=Poudre de sodalite
item.techreborn.dust.spessartine.name=Poudre de spessartine
item.techreborn.dust.sphalerite.name=Poudre de sphalérite
item.techreborn.dust.steel.name=Poudre d'acier
item.techreborn.dust.sulfur.name=Poudre de souffre
item.techreborn.dust.tellurium.name=Poudre de tellure
item.techreborn.dust.teslatite.name=Poudre de teslatite
item.techreborn.dust.tetrahedrite.name=Poudre de tétrahédrite
item.techreborn.dust.tin.name=Poudre d'étain
item.techreborn.dust.titanium.name=Poudre de titane
item.techreborn.dust.tungsten.name=Poudre de tungstène
item.techreborn.dust.uvarovite.name=Poudre de uvarovite
item.techreborn.dust.vinteum.name=Poudre de vinteum
item.techreborn.dust.voidstone.name=Poudre de pierre du néant
item.techreborn.dust.yellowGarnet.name=Poudre de grenat jaune
item.techreborn.dust.zinc.name=Poudre de zinc
item.techreborn.dust.galena.name=Poudre de galène
item.techreborn.dust.greenSapphire.name=Poudre de saphir vert
item.techreborn.dust.sawDust.name=Sciure
#Small Dusts
item.techreborn.dustsmall.Almandine.name=Petit tas de poudre d'almandine
item.techreborn.dustsmall.AluminumBrass.name=Petit tas de poudre de laiton d'aluminium
item.techreborn.dustsmall.Aluminum.name=Petit tas de poudre d'aluminium
item.techreborn.dustsmall.Alumite.name=Petit tas de poudre d'alumite
item.techreborn.dustsmall.Andradite.name=Petit tas de poudre d'andradite
item.techreborn.dustsmall.Antimony.name=Petit tas de poudre d'antimoine
item.techreborn.dustsmall.Ardite.name=Petit tas de poudre d'ardite
item.techreborn.dustsmall.Ashes.name=Petit tas de cendres
item.techreborn.dustsmall.Basalt.name=Petit tas de poudre de basalt
item.techreborn.dustsmall.Bauxite.name=Petit tas de poudre de bauxite
item.techreborn.dustsmall.Biotite.name=Petit tas de poudre de biotite
item.techreborn.dustsmall.Brass.name=Petit tas de poudre de laiton
item.techreborn.dustsmall.Bronze.name=Petit tas de poudre de bronze
item.techreborn.dustsmall.Cadmium.name=Petit tas de poudre de cadmium
item.techreborn.dustsmall.Calcite.name=Petit tas de poudre de calcite
item.techreborn.dustsmall.Charcoal.name=Petit tas de poudre de charbon de bois
item.techreborn.dustsmall.Chrome.name=Petit tas de poudre de chrome
item.techreborn.dustsmall.Cinnabar.name=Petit tas de poudre de cinabre
item.techreborn.dustsmall.Clay.name=Petit tas de poudre d'argile
item.techreborn.dustsmall.Coal.name=Petit tas de poudre de charbon
item.techreborn.dustsmall.Cobalt.name=Petit tas de poudre Cobalt Dust
item.techreborn.dustsmall.Copper.name=Petit tas de poudre de cuivre
item.techreborn.dustsmall.Cupronickel.name=Petit tas de poudre de cupronickel
item.techreborn.dustsmall.DarkAshes.name=Petit tas de cendres sombres
item.techreborn.dustsmall.DarkIron.name=Petit tas de poudre de fer sombre
item.techreborn.dustsmall.Diamond.name=Petit tas de poudre de diamant
item.techreborn.dustsmall.Electrum.name=Petit tas de poudre d'électrum
item.techreborn.dustsmall.Emerald.name=Petit tas de poudre d'émeraude
item.techreborn.dustsmall.EnderEye.name=Petit tas de poudre d'oeil du néant
item.techreborn.dustsmall.EnderPearl.name=Petit tas de poudre de perle du néant
item.techreborn.dustsmall.Endstone.name=Petit tas de poudre de pierre du néant
item.techreborn.dustsmall.Flint.name=Petit tas de poudre de silex
item.techreborn.dustsmall.Glowstone.name=Petit tas de poudre de pierre lumineuse
item.techreborn.dustsmall.Gold.name=Petit tas de poudre d'or
item.techreborn.dustsmall.Graphite.name=Petit tas de poudre de graphite
item.techreborn.dustsmall.Grossular.name=Petit tas de poudre de grossularite
item.techreborn.dustsmall.Gunpowder.name=Petit tas de poudre à canon
item.techreborn.dustsmall.Indium.name=Petit tas de poudre d'indium
item.techreborn.dustsmall.Invar.name=Petit tas de poudre d'invar
item.techreborn.dustsmall.Iridium.name=Petit tas de poudre d'iridium
item.techreborn.dustsmall.Iron.name=Petit tas de poudre de fer
item.techreborn.dustsmall.Kanthal.name=Petit tas de poudre de kanthal
item.techreborn.dustsmall.Lapis.name=Petit tas de poudre de lapis lazuli
item.techreborn.dustsmall.Lazurite.name=Petit tas de poudre de lazurite
item.techreborn.dustsmall.Lead.name=Petit tas de poudre de plomb
item.techreborn.dustsmall.Limestone.name=Petit tas de poudre de calcaire
item.techreborn.dustsmall.Lodestone.name=Petit tas de poudre d'aimant naturel
item.techreborn.dustsmall.Magnesium.name=Petit tas de poudre de magnésium
item.techreborn.dustsmall.Magnetite.name=Petit tas de poudre de magnétite
item.techreborn.dustsmall.Manganese.name=Petit tas de poudre de manganèse
item.techreborn.dustsmall.Manyullyn.name=Petit tas de poudre de manyullyn
item.techreborn.dustsmall.Marble.name=Petit tas de poudre de marbre
item.techreborn.dustsmall.Mithril.name=Petit tas de poudre de mithril
item.techreborn.dustsmall.Netherrack.name=Petit tas de poudre de pierre du nether
item.techreborn.dustsmall.Nichrome.name=Petit tas de poudre de nichrome
item.techreborn.dustsmall.Nickel.name=Petit tas de poudre de nickel
item.techreborn.dustsmall.Obsidian.name=Petit tas de poudre d'obsidienne
item.techreborn.dustsmall.Osmium.name=Petit tas de poudre d'osmium
item.techreborn.dustsmall.Peridot.name=Petit tas de péridot
item.techreborn.dustsmall.Phosphorous.name=Petit tas de poudre phosphoré
item.techreborn.dustsmall.Platinum.name=Petit tas de poudre de platine
item.techreborn.dustsmall.PotassiumFeldspar.name=Petit tas de poudre de feldspaths potassiques
item.techreborn.dustsmall.Pyrite.name=Petit tas de poudre de pyrite
item.techreborn.dustsmall.Pyrope.name=Petit tas de poudreof de pyrope
item.techreborn.dustsmall.RedGarnet.name=Petit tas de poudre de grenat rouge
item.techreborn.dustsmall.Redrock.name=Petit tas de poudre de roche rouge
item.techreborn.dustsmall.Redstone.name=Petit tas de redstone
item.techreborn.dustsmall.Ruby.name=Petit tas de poudre de rubis
item.techreborn.dustsmall.Saltpeter.name=Petit tas de poudre de salpètre
item.techreborn.dustsmall.Sapphire.name=Petit tas de poudre de saphir
item.techreborn.dustsmall.Silicon.name=Petit tas de poudre de silicium
item.techreborn.dustsmall.Silver.name=Petit tas de poudre d'argent
item.techreborn.dustsmall.Sodalite.name=Petit tas de poudre de sodalite
item.techreborn.dustsmall.Spessartine.name=Petit tas de poudre de spessartine
item.techreborn.dustsmall.Sphalerite.name=Petit tas de poudre de sphalérite
item.techreborn.dustsmall.Steel.name=Petit tas de poudre d'acier
item.techreborn.dustsmall.Sulfur.name=Petit tas de poudre de souffre
item.techreborn.dustsmall.Tellurium.name=Petit tas de poudre de tellure
item.techreborn.dustsmall.Teslatite.name=Petit tas de poudre de teslatite
item.techreborn.dustsmall.Tetrahedrite.name=Petit tas de poudre de tétrahédrite
item.techreborn.dustsmall.Tin.name=Petit tas de poudre d'étain
item.techreborn.dustsmall.Titanium.name=Petit tas de poudre de titane
item.techreborn.dustsmall.Tungsten.name=Petit tas de poudre de tungstène
item.techreborn.dustsmall.Uvarovite.name=Petit tas de poudre de uvarovite
item.techreborn.dustsmall.Vinteum.name=Petit tas de poudre de vinteum
item.techreborn.dustsmall.Voidstone.name=Petit tas de poudre de pierre du néant
item.techreborn.dustsmall.YellowGarnet.name=Petit tas de poudre de grenat jaune
item.techreborn.dustsmall.Zinc.name=Petit tas de poudre de zinc
item.techreborn.dustsmall.Galena.name=Petit tas de poudre de galène
#Cells
item.techreborn.cell.Berylium.name=Cellule de bérylium
item.techreborn.cell.biomass.name=Cellule de biomass
item.techreborn.cell.calciumCarbonate.name=Cellule de carbonate de calcium
item.techreborn.cell.calcium.name=Cellule de calcium
item.techreborn.cell.carbon.name=Cellule de carbone
item.techreborn.cell.chlorine.name=Chlorine chlore
item.techreborn.cell.deuterium.name=Cellule de deutérium
item.techreborn.cell.diesel.name=Cellule de diesel
item.techreborn.cell.ethanol.name=Cellule d'éthanol
item.techreborn.cell.glyceryl.name=Cellule de glycéryle
item.techreborn.cell.helium3.name=Cellule d'hélium3
item.techreborn.cell.helium.name=Cellule d'hélium
item.techreborn.cell.heliumPlasma.name=Cellule de plasma d'hélium
item.techreborn.cell.hydrogen.name=Cellule d'hydrogène
item.techreborn.cell.ice.name=Cellule de glace
item.techreborn.cell.lithium.name=Cellule de lithium
item.techreborn.cell.mercury.name=Cellule de mercure
item.techreborn.cell.methane.name=Cellule de méthane
item.techreborn.cell.nitrocarbon.name=Cellule de nitrocarbone
item.techreborn.cell.nitroCoalfuel.name=Cellule de carburant nitrocarbonate
item.techreborn.cell.nitroDiesel.name=Cellule de nitro diesel
item.techreborn.cell.nitrogen.name=Cellule d'azote
item.techreborn.cell.nitrogenDioxide.name=Cellule de dioxyde d'azote
item.techreborn.cell.oil.name=Cellule de pétrole
item.techreborn.cell.potassium.name=Cellule de potassium
item.techreborn.cell.seedOil.name=Cellule d'huile végétale
item.techreborn.cell.silicon.name=Cellule de silicon
item.techreborn.cell.sodium.name=Cellule de sodium
item.techreborn.cell.sodiumPersulfate.name=Cellule de persulfate de sodium
item.techreborn.cell.sodiumSulfide.name=Cellule de sulfate de sodium
item.techreborn.cell.sulfur.name=Cellule de souffre
item.techreborn.cell.sulfuricAcid.name=Cellule d'acide sulfurique
item.techreborn.cell.tritium.name=Cellule de tritium
item.techreborn.cell.wolframium.name=Cellule de wolframium
item.techreborn.cell.empty.name=Cellule vide
#Gems
item.techreborn.gem.ruby.name=Rubis
item.techreborn.gem.sapphire.name=Saphir
item.techreborn.gem.peridot.name=Saphir vert
item.techreborn.gem.redGarnet.name=Grenat rouge
item.techreborn.gem.yellowGarnet.name=Grenat Jaune
#Ingots
item.techreborn.ingot.aluminum.name=Lingot d'aluminum
item.techreborn.ingot.antimony.name=Lingot d'antimoine
item.techreborn.ingot.batteryAlloy.name=Lingot d'alliage de batterie
item.techreborn.ingot.redAlloy.name=Lingot d'alliage rouge
item.techreborn.ingot.blueAlloy.name=Lingot d'alliage bleu
item.techreborn.ingot.brass.name=Lingot de laiton
item.techreborn.ingot.bronze.name=Lingot de bronze
item.techreborn.ingot.cadmium.name=Lingot de cadmium
item.techreborn.ingot.chrome.name=Lingot de chrome
item.techreborn.ingot.copper.name=Lingot de cuivre
item.techreborn.ingot.cupronickel.name=Lingot de cupronickel
item.techreborn.ingot.electrum.name=Lingot d'électrum
item.techreborn.ingot.indium.name=Lingot d'indium
item.techreborn.ingot.invar.name=Lingot d'invar
item.techreborn.ingot.iridium.name=Lingot d'iridium
item.techreborn.ingot.kanthal.name=Lingot de kanthal
item.techreborn.ingot.lead.name=Lingot de plomb
item.techreborn.ingot.lodestone.name=Lingot d'aimant naturel
item.techreborn.ingot.magnalium.name=Lingot de magnalium
item.techreborn.ingot.nichrome.name=Lingot de nichrome
item.techreborn.ingot.nickel.name=Lingot de nickel
item.techreborn.ingot.osmium.name=Lingot d'osmium
item.techreborn.ingot.platinum.name=Lingot de platine
item.techreborn.ingot.silver.name=Lingot d'argent
item.techreborn.ingot.steel.name=Lingot d'acier
item.techreborn.ingot.tellurium.name=Lingot de tellure
item.techreborn.ingot.tin.name=Lingot d'étain
item.techreborn.ingot.titanium.name=Lingot de titane
item.techreborn.ingot.tungsten.name=Lingot de tungstène
item.techreborn.ingot.hotTungstensteel.name=Lingot d'acier au tungstène chaud
item.techreborn.ingot.tungstensteel.name=Lingot d'acier au tungstène
item.techreborn.ingot.zinc.name=Lingot de zinc
#Nuggets
item.techreborn.nuggets.aluminum.name=Pépite d'aluminum
item.techreborn.nuggets.antimony.name=Pépite d'antimoine
item.techreborn.nuggets.brass.name=Pépite de laiton
item.techreborn.nuggets.bronze.name=Pépite de bronze
item.techreborn.nuggets.chrome.name=Pépite de chrome
item.techreborn.nuggets.copper.name=Pépite de cuivre
item.techreborn.nuggets.electrum.name=Pépite d'électrum
item.techreborn.nuggets.invar.name=Pépite d'invar
item.techreborn.nuggets.iridium.name=Pépite d'iridium
item.techreborn.nuggets.iron.name=Pépite de fer
item.techreborn.nuggets.lead.name=Pépite de plomb
item.techreborn.nuggets.nickel.name=Pépite de nickel
item.techreborn.nuggets.osmium.name=Pépite d'osmium
item.techreborn.nuggets.platinum.name=Pépite de platine
item.techreborn.nuggets.silver.name=Pépite d'argent
item.techreborn.nuggets.steel.name=Pépite d'acier
item.techreborn.nuggets.tin.name=Pépite d'étain
item.techreborn.nuggets.titanium.name=Pépite de titane
item.techreborn.nuggets.tungsten.name=Pépite de tungstène
item.techreborn.nuggets.zinc.name=Pépite de zinc
#Crushed Ore
item.techreborn.crushedore.Aluminum.name=Minerai d'aluminum écrasé
item.techreborn.crushedore.Ardite.name=Minerai d'ardite écrasé
item.techreborn.crushedore.Bauxite.name=Minerai de bauxite écrasé
item.techreborn.crushedore.Cadmium.name=Minerai de cadmium écrasé
item.techreborn.crushedore.Cinnabar.name=Minerai de cinabre écrasé
item.techreborn.crushedore.Cobalt.name=Minerai de cobalt écrasé
item.techreborn.crushedore.DarkIron.name=Minerai de fer sombre écrasé
item.techreborn.crushedore.Indium.name=Minerai d'indium écrasé
item.techreborn.crushedore.Iridium.name=Minerai d'iridium écrasé
item.techreborn.crushedore.Nickel.name=Minerai de nickel écrasé
item.techreborn.crushedore.Osmium.name=Minerai d'osmium écrasé
item.techreborn.crushedore.Platinum.name=Minerai de platine écrasé
item.techreborn.crushedore.Pyrite.name=Minerai de pyrite écrasé
item.techreborn.crushedore.Sphalerite.name=Minerai de sphalérite écrasé
item.techreborn.crushedore.Tetrahedrite.name=Minerai de tétrahédrite écrasé
item.techreborn.crushedore.Tungsten.name=Minerai de tungstène écrasé
item.techreborn.crushedore.Galena.name=Minerai de galène écrasé
#Purified Crushed Ore
item.techreborn.purifiedcrushedore.Aluminum.name=Minerai d'aluminum écrasé purifié
item.techreborn.purifiedcrushedore.Ardite.name=Minerai d'ardite écrasé purifié
item.techreborn.purifiedcrushedore.Bauxite.name=Minerai de bauxite écrasé purifié
item.techreborn.purifiedcrushedore.Cadmium.name=Minerai de cadmium écrasé purifié
item.techreborn.purifiedcrushedore.Cinnabar.name=Minerai de cinabre écrasé purifié
item.techreborn.purifiedcrushedore.Cobalt.name=Minerai de cobalt écrasé purifié
item.techreborn.purifiedcrushedore.DarkIron.name=Minerai de fer sombre écrasé purifié
item.techreborn.purifiedcrushedore.Indium.name=Minerai d'indium écrasé purifié
item.techreborn.purifiedcrushedore.Iridium.name=Minerai d'iridium écrasé purifié
item.techreborn.purifiedcrushedore.Nickel.name=Minerai de nickel écrasé purifié
item.techreborn.purifiedcrushedore.Osmium.name=Minerai d'osmium écrasé purifié
item.techreborn.purifiedcrushedore.Platinum.name=Minerai de platine écrasé purifié
item.techreborn.purifiedcrushedore.Pyrite.name=Minerai de pyrite écrasé purifié
item.techreborn.purifiedcrushedore.Sphalerite.name=Minerai de sphalérite écrasé purifié
item.techreborn.purifiedcrushedore.Tetrahedrite.name=Minerai de tétrahédrite écrasé purifié
item.techreborn.purifiedcrushedore.Tungsten.name=Minerai de tungstène écrasé purifié
item.techreborn.purifiedcrushedore.Galena.name=Minerai de galène écrasé purifié
#Plates
item.techreborn.plate.aluminum.name=Plaque d'aluminum
item.techreborn.plate.batteryAlloy.name=Plaque d'alliage de batterie
item.techreborn.plate.brass.name=Plaque de laiton
item.techreborn.plate.bronze.name=Plaque de bronze
item.techreborn.plate.carbon.name=Plaque de carbone
item.techreborn.plate.coal.name=Plaque de charbon
item.techreborn.plate.chrome.name=Plaque de chrome
item.techreborn.plate.copper.name=Plaque de cuivre
item.techreborn.plate.diamond.name=Plaque de diamant
item.techreborn.plate.electrum.name=Plaque d'électrum
item.techreborn.plate.emerald.name=Plaque d'émeraude
item.techreborn.plate.gold.name=Plaque d'or
item.techreborn.plate.invar.name=Plaque d'invar
item.techreborn.plate.iridium.name=Plaque d'iridium
item.techreborn.plate.iron.name=Plaque de fer
item.techreborn.plate.lapis.name=Plaque de lapis lazuli
item.techreborn.plate.lead.name=Plaque de plomb
item.techreborn.plate.magnalium.name=Plaque de magnalium
item.techreborn.plate.nickel.name=Plaque de nickel
item.techreborn.plate.obsidian.name=Plaque d'obsidian
item.techreborn.plate.osmium.name=Plaque d'osmium
item.techreborn.plate.peridot.name=Plaque de péridot
item.techreborn.plate.platinum.name=Plaque de platine
item.techreborn.plate.redGarnet.name=Plaque de grenat rouge
item.techreborn.plate.redstone.name=Plaque de redstone
item.techreborn.plate.ruby.name=Plaque de rubis
item.techreborn.plate.sapphire.name=Plaque de saphir
item.techreborn.plate.silicon.name=Plaque de silicium
item.techreborn.plate.silver.name=Plaque d'argent
item.techreborn.plate.steel.name=Plaque d'acier
item.techreborn.plate.teslatite.name=Plaque de teslatite
item.techreborn.plate.tin.name=Plaque d'étain
item.techreborn.plate.titanium.name=Plaque de titane
item.techreborn.plate.tungsten.name=Plaque de tungstène
item.techreborn.plate.tungstensteel.name=Plaque d'acier au tungstène
item.techreborn.plate.yellowGarnet.name=Plaque de grenat jaune
item.techreborn.plate.zinc.name=Plaque de zinc
#Parts
item.techreborn.part.advancedCircuitParts.name=Pièces de circuit avancé
item.techreborn.part.basicCircuitBoard.name=Circuit imprimé de base
item.techreborn.part.advancedCircuitBoard.name=Circuit imprimé avancé
item.techreborn.part.processorCircuitBoard.name=Circuit imprimé du processeur
item.techreborn.part.energyFlowCircuit.name=Circuit de flux énergétique
item.techreborn.part.dataControlCircuit.name=Circuit de contrôle des données
item.techreborn.part.dataOrb.name=Orbe de données
item.techreborn.part.dataStorageCircuit.name=Circuit de stockage des données
item.techreborn.part.diamondGrindingHead.name=Tête de broyeur en diamant
item.techreborn.part.diamondSawBlade.name=Lame de scie en diamant
item.techreborn.part.tungstenGrindingHead.name=Tête de broyeur en tungstène
item.techreborn.part.heliumCoolantSimple.name=Cellule 60k de refroisissement à l'hélium
item.techreborn.part.heliumCoolantTriple.name=Cellule 180k de refroisissement à l'hélium
item.techreborn.part.heliumCoolantSix.name=Cellule 360k de refroisissement à l'hélium
item.techreborn.part.NaKCoolantSimple.name=Cellule 60k de refroisissement au NaK
item.techreborn.part.NaKCoolantTriple.name=Cellule 180k de refroisissement au NaK
item.techreborn.part.NaKCoolantSix.name=Cellule 360k de refroisissement au NaK
item.techreborn.part.cupronickelHeatingCoil.name=Réchauffeur en cupronickel
item.techreborn.part.nichromeHeatingCoil.name=Réchauffeur en nichrome
item.techreborn.part.kanthalHeatingCoil.name=Réchauffeur en kanthal
item.techreborn.part.steelGear.name=Engrenage en acier
item.techreborn.part.tungstensteelGear.name=Engrenage en acier au tungstène
item.techreborn.part.laserFocus.name=Foyer de laser
item.techreborn.part.ductTape.name=Ruban adhésif renforcé aérospatial avancé FAL-84
item.techreborn.part.lazuriteChunk.name=Parchelle de lazurite
item.techreborn.part.iridiumAlloyIngot.name=Lingot d'alliage d'iridium
item.techreborn.part.rockCutterBlade.name=Lame de coupe-roche
item.techreborn.part.superConductor.name=Superconducteur
item.techreborn.part.thoriumCell.name=Tige de carburant (Thorium)
item.techreborn.part.doubleThoriumCell.name=Double tige de carburant (Thorium)
item.techreborn.part.quadThoriumCell.name=Quadruple tige de carburant (Thorium)
item.techreborn.part.plutoniumCell.name=Tige de carburant (Plutonium)
item.techreborn.part.doublePlutoniumCell.name=Double tige de carburant (Plutonium)
item.techreborn.part.quadPlutoniumCell.name=Quadruple tige de carburant (Plutonium)
item.techreborn.part.destructoPack.name=Destructeur de paquet
item.techreborn.part.iridiumNeutronReflector.name=Réflecteur de neutron en iridium
item.techreborn.part.massHoleDevice.name=Dispositif de trou massif
item.techreborn.part.computerMonitor.name=Console d'ordinateur
item.techreborn.part.machineParts.name=Pièces de machine
item.techreborn.part.neutronReflector.name=Réflecteur de neutron
item.techreborn.part.thickNeutronReflector.name=Réflecteur de neutron épais
#Tools
item.techreborn.rockcutter.name=Foreuse
item.techreborn.lithiumbatpack.name=Propulseur au lithium
item.techreborn.lapotronpack.name=Packet de lapoton
item.techreborn.omniTool.name=Multi-outil
item.techreborn.advancedDrill.name=Foret avancé
item.techreborn.lapotronicorb.name=Orbe d'énergie Lapotronique
item.techreborn.cloakingdevice.name=Dispositif de dissimulation
#Buckets
item.bucketberylium.name=Seau de berylium
item.bucketcalcium.name=Seau de calcium
item.bucketcalciumcarbonate.name=Seau de carbonate de calcium
item.bucketchlorite.name=Seau de chlorite
item.bucketdeuterium.name=Seau de deutérium
item.bucketglyceryl.name=Seau de glycéryle
item.buckethelium.name=Seau d'hélium
item.buckethelium3.name=Seau d'hélium3
item.bucketheliumplasma.name=Seau de plasma d'hélium
item.buckethydrogen.name=Seau d'hydrogène
item.bucketlithium.name=Seau de lithium
item.bucketmercury.name=Seau de mercure
item.bucketmethane.name=Seau de méthane
item.bucketnitrocoalfuel.name=Seau de carburant nitrocarbonate
item.bucketnitrofuel.name=Seau de carburant azote
item.bucketnitrogen.name=Seau d'azote
item.bucketnitrogendioxide.name=Seau de dioxyde d'azote
item.bucketpotassium.name=Seau de potassium
item.bucketsilicon.name=Seau de silicium
item.bucketsodium.name=Seau de sodium
item.bucketsodiumpersulfate.name=Seau de persulfate de sodium
item.buckettritium.name=Seau de tritium
item.bucketwolframium.name=Seau de wolfanium
#Items
item.techreborn.uuMatter.name=Matière UU
item.techreborn.pda.name=PDA
#Configs
config.techreborn.allow.galenaOre=Permet le minerai de galène
config.techreborn.allow.galenaOre.tooltip=Decidez si le minerai de galène est généré ou pas
config.techreborn.allow.iridiumOre=Permet le minerai d'iridium
config.techreborn.allow.iridiumOre.tooltip=Decidez si le minerai d'iridium est généré ou pas
config.techreborn.allow.rubyOre=Permet le minerai de rubis
config.techreborn.allow.rubyOre.tooltip=Decidez si le minerai de rubis est généré ou pas
config.techreborn.allow.sapphireOre=Permet le minerai de saphir
config.techreborn.allow.sapphireOre.tooltip=Decidez si le minerai de saphir est généré ou pas
config.techreborn.allow.bauxiteOre=Permet le minerai de bauxite
config.techreborn.allow.bauxiteOre.tooltip=Decidez si le minerai de bauxite est généré ou pas
config.techreborn.allow.copperOre=Permet le minerai de cuivre
config.techreborn.allow.copperOre.tooltip=Decidez si le minerai de cuivre est généré ou pas
config.techreborn.allow.tinOre=Permet le minerai d'étain
config.techreborn.allow.tinOre.tooltip=Decidez si le minerai d'étain est généré ou pas
config.techreborn.allow.leadOre=Permet le minerai de plomb
config.techreborn.allow.leadOre.tooltip=Decidez si le minerai de plomb est généré ou pas
config.techreborn.allow.silverOre=Permet le minerai d'argent
config.techreborn.allow.silverOre.tooltip=Decidez si le minerai d'argent est généré ou pas
config.techreborn.allow.pyriteOre=Permet le minerai de pyrite
config.techreborn.allow.pyriteOre.tooltip=Decidez si le minerai de pyrite est généré ou pas
config.techreborn.allow.cinnabarOre=Permet le minerai de cinabre
config.techreborn.allow.cinnabarOre.tooltip=Decidez si le minerai de cinabre est généré ou pas
config.techreborn.allow.sphaleriteOre=Permet le minerai de sphalérite
config.techreborn.allow.sphaleriteOre.tooltip=Decidez si le minerai de sphalérite est généré ou pas
config.techreborn.allow.tungstenOre=Permet le minerai de tungstène
config.techreborn.allow.tungstenOre.tooltip=Decidez si le minerai de tungstène est généré ou pas
config.techreborn.allow.sheldoniteOre=Permet le minerai de sheldonite
config.techreborn.allow.sheldoniteOre.tooltip=Decidez si le minerai de sheldonite est généré ou pas
config.techreborn.allow.olivineOre=Permet le minerai d'olivine
config.techreborn.allow.olivineOre.tooltip=Decidez si le minerai d'olivine est généré ou pas
config.techreborn.allow.sodaliteOre=Permet le minerai de sodalite
config.techreborn.allow.sodaliteOre.tooltip=Decidez si le minerai de sodalite est généré ou pas
config.techreborn.fortuneSecondaryOreMultiplierPerLevel=Effet de fortune sur les secondaires
config.techreborn.fortuneSecondaryOreMultiplierPerLevel.tooltip=Quelle part d'augmentation devrait avoir chaque niveau de fortune sur des minerais secondaires obtenus ?
config.techreborn.allowExpensiveMacerator=Autorisez un macérateur couteux
config.techreborn.allowExpensiveMacerator.tooltip=
config.techreborn.allowExpensiveDrill=Autorisez un foret couteux
config.techreborn.allowExpensiveDrill.tooltip=
config.techreborn.allowExpensiveDiamondDrill=Autorisez un foret diamant couteux
config.techreborn.allowExpensiveDiamondDrill.tooltip=
config.techreborn.allowExpensiveSolarPanels=Autorisez des panneaux solaires couteux
config.techreborn.allowExpensiveSolarPanels.tooltip=
config.techreborn.advancedDrillTier=Niveau énergétique du foret avancé
config.techreborn.advancedDrillTier.tooltip=
config.techreborn.lapotronPackTier=Niveau énergétique du packet de lapoton
config.techreborn.lapotronPackTier.tooltip=
config.techreborn.lithiumBatpackTier=niveau énergétique du propulseur au lithium
config.techreborn.lithiumBatpackTier.tooltip=
config.techreborn.omniToolTier=Niveau énergétique du multi-outil
config.techreborn.omniToolTier.tooltip=
config.techreborn.rockCutterTier=Niveau énergétique de la foreuse
config.techreborn.rockCutterTier.tooltip=
config.techreborn.gravityChestplateTier=Niveau énergétique du plastron gravitationel
config.techreborn.gravityChestplateTier.tooltip=
config.techreborn.centrifugeTier=Niveau énergétique de la centrifugeuse
config.techreborn.centrifugeTier.tooltip=
config.techreborn.thermalGeneratorTier=Niveau énergétique du générateur thermique
config.techreborn.thermalGeneratorTier.tooltip=
config.techreborn.thermalGeneratorPower=Sortie du générateur thermique
config.techreborn.thermalGeneratorPower.tooltip=
config.techreborn.centrifugePowerUsage=Entrée par tic de la centrifugeuse
config.techreborn.centrifugePowerUsage.tooltip=
config.techreborn.advancedDrillMaxCharge=Charge maximale du foret avancé
config.techreborn.advancedDrillMaxCharge.tooltip=
config.techreborn.lapotronPackMaxCharge=Charge maximale du packet de lapotron
config.techreborn.lapotronPackMaxCharge.tooltip=
config.techreborn.omniToolMaxCharge=Charge maximale du multi-outil
config.techreborn.omniToolMaxCharge.tooltip=
config.techreborn.lithiumBatpackMaxCharge=Charge maximale du propulseur au lithium
config.techreborn.lithiumBatpackMaxCharge.tooltip=
config.techreborn.rockCutterMaxCharge=Charge maximale de la foreuse
config.techreborn.rockCutterMaxCharge.tooltip=
config.techreborn.gravityChestplateMaxCharge=Charge maximale du plastron gravitationel
config.techreborn.gravityChestplateMaxCharge.tooltip=
config.techreborn.centrifugeMaxCharge=Charge maximale de la centrifugeuse
config.techreborn.centrifugeMaxCharge.tooltip=
config.techreborn.thermalGeneratorMaxCharge=Charge maximale du générateur thermique
config.techreborn.thermalGeneratorMaxCharge.tooltip=
config.techreborn.aveargeEuOutTickTim=Temps de sortie d'EU
config.techreborn.aveargeEuOutTickTime.tooltip=Combien de fois par tic mettre à jour l'UE
config.techreborn.euPerRF=Convertion des EU
config.techreborn.euPerRF.tooltip=Quantité de RF pour 1 EU. Par défaut 4, donc 4RF == 1EU et .25EU == 1RF
config.techreborn.farmeu=Ferme EU par Tic
config.techreborn.farmeu.tooltip=Quantité de eu utilisé par tic par la ferme
config.techreborn.enableRF=Active le support RF
config.techreborn.enableRF.tooltip= Active le support RF pour toutes les machines.
config.techreborn.enableEU=Active le support EU
config.techreborn.enableEU.tooltip= Active le support EU pour toutes les machines.
config.techreborn.connectTextures=Active les textures connectées
config.techreborn.connectTextures.tooltip=Active les textures connectées
config.techreborn.rainExplosions=Active les explosions de machine quand la pluie touche
config.techreborn.rainExplosions.tooltip= Lorque ceci est activé,les machines exploserons lorsqu'elles seront en contact avec la pluie.
config.techreborn.allowExpensiveWatermill.tooltip= Autoriser le moulin à eau cher
config.techreborn.allowExpensiveWindmill.tooltip= Autoriser le moulin à vent cher
config.techreborn.allowBopRecipes.tooltip= Autoriser les recettes BOP
config.techreborn.allowForestryRecipes.tooltip= Autoriser les recettes Forestry
config.techreborn.allowNaturaRecipes.tooltip= Autoriser les recettes Natura
config.techreborn.aesuMaxOutput.tooltip= Sortie USEA maxi
config.techreborn.aesuMaxStorage.tooltip= Stockage USEA maxi
config.techreborn.baseLesuOutput.tooltip= Sortie USEL de base
config.techreborn.cloakingDeviceEUTick.tooltip= Eu/Tic du dispositif de dissimulation
config.techreborn.cloakingDeviceMaxCharge.tooltip= Charge maxi du dispositif de dissimulation
config.techreborn.cloakingDeviceTier.tooltip= Niveau du dispositif de dissimulation
config.techreborn.dragoneggsiphonerPower.tooltip=Eu/Tic du syphon d'énergie d'oeuf de dragon
config.techreborn.extraOutputPerLesuBlock.tooltip= Sortie suplémentaire du stockage USEL
config.techreborn.heatGeneratorOutput.tooltip= Sortie du générateur de chaleur
config.techreborn.lapotronicOrbMaxCharge= Recharge maxi de l'orbe lapotronique
config.techreborn.lapotronicOrbTier.tooltip= Niveau de l'orbe lapatronique
config.techreborn.lesuStoragePerBlock.tooltip= Sortie suplémentaire du stockage USEL
config.techreborn.showChargehud.tooltip=Monter l'interface de recharge
#Config UU
config.techreborn.allow.UUrecipesAluminumDust= Autoriser les recettes UU pour la poudre d'aluminium
config.techreborn.allow.UUrecipesCoal= Autoriser les recettes UU pour le charbon
config.techreborn.allow.UUrecipesCopperDust= Autoriser les recettes UU pour la poudre de cuivre
config.techreborn.allow.UUrecipesDiamond= Autoriser les recettes UU pour le diamant
config.techreborn.allow.UUrecipesEmerald= Autoriser les recettes UU pour l'émeraude
config.techreborn.allow.UUrecipesEmeraldOre= Autoriser les recettes UU pour le minerai d'émeraude
config.techreborn.allow.UUrecipesGoldDust= Autoriser les recettes UU pour la poudre d'or
config.techreborn.allow.UUrecipesGoldOre= Autoriser les recettes UU pour le minerai d'or
config.techreborn.allow.UUrecipesIronDust= Autoriser les recettes UU pour la poudre de fer
config.techreborn.allow.UUrecipesIronOre= Autoriser les recettes UU pour le minerai de fer
config.techreborn.allow.UUrecipesLapis= Autoriser les recettes UU pour le lapis
config.techreborn.allow.UUrecipesLeadDust= Autoriser les recettes UU pour la poudre de lapis
config.techreborn.allow.UUrecipesPlatinumDust= Autoriser les recettes UU pour le poudre de platine
config.techreborn.allow.UUrecipesRedStone= Autoriser les recettes UU pour la redstone
config.techreborn.allow.UUrecipesResin= Autoriser les recettes UU pour la résine collante
config.techreborn.allow.UUrecipesTinDust= Autoriser les recettes UU pour la poudre d'étain
config.techreborn.allow.UUrecipesTitaniumDust= Autoriser les recettes UU pour la poudre de titane
config.techreborn.allow.UUrecipesTungstenDust= Autoriser les recettes UU pour la poudre de tungstène
config.techreborn.allow.uurecipesBone= Autoriser les recettes UU pour l'os
config.techreborn.allow.uurecipesCactus= Autoriser les recettes UU pour le cactus
config.techreborn.allow.uurecipesCocoa= Autoriser les recettes UU pour le cacao
config.techreborn.allow.uurecipesEnderPearl= Autoriser les recettes UU pour la perle du Néant
config.techreborn.allow.uurecipesFeather= Autoriser les recettes UU pour le feuillage
config.techreborn.allow.uurecipesGlass= Autoriser les recettes UU pour le verre
config.techreborn.allow.uurecipesGlowstoneBlock= Autoriser les recettes UU pour le bloc de pierre lumineuse
config.techreborn.allow.uurecipesGrass= Autoriser les recettes UU pour l'herbe
config.techreborn.allow.uurecipesInk= Autoriser les recettes UU pour le sac d'encre
config.techreborn.allow.uurecipesIridiamOre= Autoriser les recettes UU pour le minerai d'iridiam
config.techreborn.allow.uurecipesLava= Autoriser les recettes UU pour la lave
config.techreborn.allow.uurecipesLilypad= Autoriser les recettes UU pour le nénuphar
config.techreborn.allow.uurecipesObsidian= Autoriser les recettes UU pour l'obsidienne
config.techreborn.allow.uurecipesSnowBall= Autoriser les recettes UU pour la boule de neige
config.techreborn.allow.uurecipesSnowBlock= Autoriser les recettes UU pour le bloc de neige
config.techreborn.allow.uurecipesStone= Autoriser les recettes UU pour la pierre
config.techreborn.allow.uurecipesSugarCane= Autoriser les recettes UU pour la canne à sucre
config.techreborn.allow.uurecipesVine= Autoriser les recettes UU pour la vigne
config.techreborn.allow.uurecipesWater= Autoriser les recettes UU pour l'eau
config.techreborn.allow.uurecipesWood= Autoriser les recettes UU pour le bois
#Config Tooltips UU
config.techreborn.allow.UUrecipesAluminumDust.tooltip= Autoriser les recettes UU pour la poudre d'aluminium
config.techreborn.allow.UUrecipesCoal.tooltip= Autoriser les recettes UU pour le charbon
config.techreborn.allow.UUrecipesCopperDust.tooltip= Autoriser les recettes UU pour la poudre de cuivre
config.techreborn.allow.UUrecipesDiamond.tooltip= Autoriser les recettes UU pour le diamant
config.techreborn.allow.UUrecipesEmerald.tooltip= Autoriser les recettes UU pour l'émeraude
config.techreborn.allow.UUrecipesEmeraldOre.tooltip= Autoriser les recettes UU pour le minerai d'émeraude
config.techreborn.allow.UUrecipesGoldDust.tooltip= Autoriser les recettes UU pour la poudre d'or
config.techreborn.allow.UUrecipesGoldOre.tooltip= Autoriser les recettes UU pour le minerai d'or
config.techreborn.allow.UUrecipesIronDust.tooltip= Autoriser les recettes UU pour la poudre de fer
config.techreborn.allow.UUrecipesIronOre.tooltip= Autoriser les recettes UU pour le minerai de fer
config.techreborn.allow.UUrecipesLapis.tooltip= Autoriser les recettes UU pour le lapis
config.techreborn.allow.UUrecipesLeadDust.tooltip= Autoriser les recettes UU pour la poudre de lapis
config.techreborn.allow.UUrecipesPlatinumDust.tooltip= AlAutoriser les recettes UU pour la poudre de platine
config.techreborn.allow.UUrecipesRedStone.tooltip= Autoriser les recettes UU pour la redstone
config.techreborn.allow.UUrecipesResin.tooltip= Autoriser les recettes UU pour la résine collante
config.techreborn.allow.UUrecipesTinDust.tooltip= Autoriser les recettes UU pour la poudre d'étain
config.techreborn.allow.UUrecipesTitaniumDust.tooltip= Autoriser les recettes UU pour la pourdre de titane
config.techreborn.allow.UUrecipesTungstenDust.tooltip= Autoriser les recettes UU pour la poudre de tungstène
config.techreborn.allow.hiderecipes.tooltip= Cacher les recettes UU dans NEI
config.techreborn.allow.uurecipesBone.tooltip= Autoriser les recettes UU pour l'os
config.techreborn.allow.uurecipesCactus.tooltip= Autoriser les recettes UU pourle cactus
config.techreborn.allow.uurecipesCocoa.tooltip= Autoriser les recettes UU pour le cacao
config.techreborn.allow.uurecipesEnderPearl.tooltip= Autoriser les recettes UU pour la perle du Néant
config.techreborn.allow.uurecipesFeather.tooltip= Autoriser les recettes UU pour le feuillage
config.techreborn.allow.uurecipesGlass.tooltip= Autoriser les recettes UU pour verre
config.techreborn.allow.uurecipesGlowstoneBlock.tooltip= Autoriser les recettes UU pour le bloc de pierre lumineuse
config.techreborn.allow.uurecipesGrass.tooltip= Autoriser les recettes UU pour l'herbe
config.techreborn.allow.uurecipesInk.tooltip= Autoriser les recettes UU pour le sac d'encre
config.techreborn.allow.uurecipesIridiamOre.tooltip= Autoriser les recettes UU pour le minerai d'iridiam
config.techreborn.allow.uurecipesLava.tooltip= Allow Autoriser les recettes UU pour la lave
config.techreborn.allow.uurecipesLilypad.tooltip= Autoriser les recettes UU pour le nénuphar
config.techreborn.allow.uurecipesObsidian.tooltip= Autoriser les recettes UU pour l'obsidienne
config.techreborn.allow.uurecipesSnowBall.tooltip= Autoriser les recettes UU pour la boule de neige
config.techreborn.allow.uurecipesSnowBlock.tooltip= Autoriser les recettes UU pour le bloc de neige
config.techreborn.allow.uurecipesStone.tooltip= Autoriser les recettes UU pour la pierre
config.techreborn.allow.uurecipesSugarCane.tooltip= Autoriser les recettes UU pour la canne à sucre
config.techreborn.allow.uurecipesVine.tooltip= Autoriser les recettes UU pour la vigne
config.techreborn.allow.uurecipesWater.tooltip= Autoriser les recettes UU pour l'eau
config.techreborn.allow.uurecipesWood.tooltip= Autoriser les recettes UU pour le bois
config.techreborn.allow.tungstonOre.tooltip= Autoriser les recettes UU pour le minerai de tungstène
config.techreborn.bauxiteOre.rare.tooltip=rareté du minerai de bauxite
config.techreborn.cinnabarOre.rare.tooltip=rareté du minerai de cinnabar
config.techreborn.copperOre.rare.tooltip=rareté du minerai de cuivre
config.techreborn.galenaOre.rare.tooltip=rareté du minerai de galène
config.techreborn.iridiumOre.rare.tooltip=rareté du minerai d'iridium
config.techreborn.leadOre.rare.tooltip=rareté du minerai de plomb
config.techreborn.olivineOre.rare.tooltip=rareté du minerai d'olivine
config.techreborn.pyriteOre.rare.tooltip=rareté du minerai de pyrite
config.techreborn.rubyOre.rare.tooltip=rareté du minerai de rubis
config.techreborn.sapphireOre.rare.tooltip=rareté du minerai de saphir
config.techreborn.sheldoniteOre.rare.tooltip=rareté du minerai de sheldonite
config.techreborn.silverOre.rare.tooltip=rareté du minerai d'argent
config.techreborn.sodaliteOre.rare.tooltip=rareté du minerai de sodalite
config.techreborn.sphaleriteOre.rare.tooltip=rareté du minerai de sphalérite
config.techreborn.tinOre.rare.tooltip=rareté du minerai d'étain
config.techreborn.tungstenOre.rare.tooltip=rareté du minerai de tungstène
config.techreborn.oreUnifer=Unification des minerai
config.techreborn.oreUnifer.tooltip=Active/Désactive l'unification auto des minerai
config.techreborn.aesuMaxOutput=Sortie maxi USEA
config.techreborn.aesuMaxStorage=Stockage maxi USEA
config.techreborn.aveargeEuOutTickTime=Temps pour calculer la production moyenne
config.techreborn.baseLesuOutput=Sortie USEL de base
config.techreborn.cloakingDeviceEUTick=Consommation de EU par tic du dispositif de dissimulation
config.techreborn.cloakingDeviceMaxCharge=Charge maxi du dispositif de dissimulation
config.techreborn.cloakingDeviceTier=Niveau du dispositif de dissimulation
config.techreborn.dragoneggsiphonerPower=Sortie Eu du syphon d'énergie d'oeuf de dragon
config.techreborn.extraOutputPerLesuBlock=Bloc d'énergie USEL
config.techreborn.heatGeneratorOutput=Sortie du générateur de chaleur
config.techreborn.lapotronicOrbTier=Niveau de l'orbe lapatronique
config.techreborn.lesuStoragePerBlock=Stockage par bloc de USEL
config.techreborn.showChargehud=Monter l'interface de recharge
config.techreborn.allowExpensiveWatermill=Autoriser le moulin à eau cher
config.techreborn.allowExpensiveWindmill=Autoriser le moulin à vent cher
#ConfigGui
config.techreborn.category.general=Options générales
config.techreborn.category.world=Options du monde
config.techreborn.category.power=Options d'énergie
config.techreborn.category.crafting=Options d'artisanat
config.techreborn.category.uu=Options UU
config.techreborn.category.emc=Options EMC
config.techreborn.category.integration=Intégration
tr.configgui.category.trGeneral.tooltip=Général
tr.configgui.category.trWorld.tooltip=Monde
tr.configgui.category.trPower.tooltip=Énergie
tr.configgui.category.trCrafting.tooltip=Artisanat
tr.configgui.category.truu.tooltip=UU
tr.configgui.category.tremc.tooltip=EMC
tr.configgui.category.treinter.tooltip=Intégration de mod
#Recipe Handlers
techreborn.recipe.ironalloysmelter=Recette de four en fer d'alliage
#Message
techreborn.message.missingmultiblock=MULTIBLOC MANQUANT
#Cables
Cable.copperCable.name=Câble de cuivre
Cable.insulatedCopperCable.name=Câble de cuivre insolé
Cable.goldCable.name=Câble d'or
Cable.insulatedGoldCable.name=Câble d'or isolé
Cable.doubleInsulatedGoldCable.name=Câble d'or double-isolé
Cable.ironCable.name=Câble de fer
###Cable.copperCable.name=Copper Cable
Cable.insulatedIronCable.name=Câble de fer isolé
Cable.doubleInsulatedIronCable.name=Câble de fer double-isolé
Cable.trippleInsulatedIronCable.name=Câble de fer triple-isolé
Cable.glassFiberCable.name=Câble de fibre de verre
Cable.tinCable.name=Câble d'étain
#PDA
techreborn.pda.contents=Sommaire
techreborn.pda.itemspage=Éléments
techreborn.pda.blockspage=Blocs
techreborn.pda.index=Index
techreborn.pda.backbutton=Préc.
item.techreborn.advancedDrill.description=Cette outil est une version avancée du foret de minage, lorsque cet élément est activé il creusera une zone de 3x3.
tile.techreborn.alloyfurnace.description=Cette machine est votre premier pas dans TechReborn avec elle vous pouvez fusionner les métaux en alliage. Ces alliages pourront être utilisé dans la fabrication de machines de niveau supérieur.
tile.techreborn.alloysmelter.description=Cette machine est une version améliorée du four en fer d'alliage. Ce bloc réclame de l'énergie EU ou RF.
tile.techreborn.assemblingmachine.description=Ce bloc est utilisé pour fabriquer quelques machines plus complexes qui ne pouvent pas être fabriquées dans l'établi normal.
tile.techreborn.blastfurnace.description=Cette machine a besoin de 3x4x3 boitiers de machine devant elle pour augmenter sa chaleur interne. Plus chaud la machine est, plus de recettes vous pourrez faire. Cette machine demande aussi des EU/RF.
keys.techreborn.category=Catégories TechReborn
keys.techreborn.config=Configuration
achievement.TechReborn:ore_Pickup=Nouveau minerai !
achievement.TechReborn:ore_Pickup.desc=Minez un minerai techreborn
achievement.TechReborn:centrifuge_Craft=Il est temps de tourner
achievement.TechReborn:thermalgen_Craft=Il est temps de chauffer
#Blocks
tile.techreborn:alarm.name=Alarme

View file

@ -1,711 +0,0 @@
item.missingRecipe.name=Faltando um Marcador de Receita
itemGroup.techreborn=Tech Reborn
#machines
tile.techreborn:pump.name=Bomba de Fluidos
tile.techreborn:gas_turbine.name=Turbina à Gás
tile.techreborn:industrial_block.name=Industrial
tile.techreborn:thermal_generator.name=Gerador Térmico
tile.techreborn:quantum_tank.name=Tanque Quântico
tile.techreborn:quantum_chest.name=Baú Quântico
tile.techreborn:digital_chest.name=Baú Digital
tile.techreborn:industrial_centrifuge.name=Centrífuga Industrial
tile.techreborn:rolling_machine.name=Máquina de Rolagem
tile.techreborn:machine_casing.standard.name=Estrutura de Máquina Padrão
tile.techreborn:machine_casing.reinforced.name=Estrutura de Máquina Reforçada
tile.techreborn:machine_casing.advanced.name=Estrutura de Máquina Avançada
tile.techreborn:industrial_blast_furnace.name=Fornalha Industrial
tile.techreborn:alloy_smelter.name=Fundidora de Ligas
tile.techreborn:matter_fabricator.name=Fabricador de Matéria
tile.techreborn:implosion_compressor.name=Compressor à Implosão
tile.techreborn:industrial_grinder.name=Triturador Industrial
tile.techreborn:chunk_loader.name=Chunkloader Industrial
tile.techreborn:magic_energy_converter.name=Conversor de Energia Mágica
tile.techreborn:diesel_generator.name=Gerador à Diesel
tile.techreborn:heat_generator.name=Gerador à Calor
tile.techreborn:industrial_electrolyzer.name=Eletrolizador Industrial
tile.techreborn:magic_energy_absorber.name=Absorvedor de Energia Mágica
tile.techreborn:assembly_machine.name=Máquina de Montagem
tile.techreborn:semi_fluid_generator.name=Gerador à Semi-fluidos
tile.techreborn:iron_alloy_furnace.name=Fornalha de Ferro para Ligas
tile.techreborn:chemical_reactor.name=Reator Químico
tile.techreborn:dragon_egg_syphon.name=Dragon Egg Energy Siphon
tile.techreborn:interdimensional_su.name=Cubo de Energia Transdimensional
tile.techreborn:adjustable_su.name=Cubo de Energia Ajustável
tile.techreborn:lapotronic_su.name=Controlador de UAEL
tile.techreborn:lsu_storage.name=Unidade de Armazenamento de Energia Lapotrônica (UAEL)
tile.techreborn:distillation_tower.name=Torre de Destilação
tile.techreborn:electric_crafting_table.name=Mesa de Auto-Fabricação Automática
tile.techreborn:vacuum_freezer.name=Congelador à Vacuo
tile.techreborn:plasma_generator.name=Greador à Plasma
tile.techreborn:fusion_control_computer.name=Controlador de Fusão
tile.techreborn:computer_cube.name=Computador em Cubo do Tech Reborn
tile.techreborn:fusion_coil.name=Bobina de Fusão
tile.techreborn:lightning_rod.name=Para-raios
tile.techreborn:industrial_sawmill.name=Serraria
tile.techreborn:charge_o_mat.name=Carregador
tile.techreborn:player_detector.all.name=Detector de Players (Todos)
tile.techreborn:player_detector.others.name=Detector de Players (Outros)
tile.techreborn:player_detector.you.name=Detector de Players (Você)
tile.techreborn:solid_fuel_generator.name=Gerador
tile.techreborn:extractor.name=Extrator
tile.techreborn:grinder.name=Triturador
tile.techreborn:compressor.name=Compressor
tile.techreborn:electric_furnace.name=Fornalha Elétrica
tile.techreborn:machine_frame.highly_advanced.name=Estrutura de Máquina Altamente Avançada
tile.techreborn:machine_frame.advanced.name=Estrutura de Máquina Avançada
tile.techreborn:machine_frame.basic.name=Estrutura de Máquina Básica
tile.techreborn:ore2.copper.name=Minério de Cobre
tile.techreborn:ore2.tin.name=Minério de Estanho
tile.techreborn:solar_panel.basic.name=Painel Solar Básico
tile.techreborn:solar_panel.hybrid.name=Painel Solar Híbrido
tile.techreborn:solar_panel.advanced.name=Painel Solar Avançado
tile.techreborn:solar_panel.ultimate.name=Painel Solar Ultimate
tile.techreborn:solar_panel.quantum.name=Painel Solar Quântico
tile.techreborn:creative_solar_panel.name=Painel Criativo
tile.techreborn:water_mill.name=Moinho D'água
tile.techreborn:wind_mill.name=Gerador Eólico
tile.techreborn:iron_furnace.name=Fornalha de Ferro
tile.techreborn:recycler.name=Reciclador
tile.techreborn:scrapboxinator.name=Sucateira
tile.techreborn:low_voltage_su.name=Caixa de Baterias
tile.techreborn:medium_voltage_su.name=Transmissor de Energia Multi-funcional
tile.techreborn:high_voltage_su.name=Unidade de Armazenamento Multi-funcional
tile.techreborn:reinforced_glass.name=Vidro Reforçado
tile.techreborn:nuke.name=Bomba Nuke
tile.techreborn:lv_transformer.name=Transformador de Baixa Voltagem
tile.techreborn:mv_transformer.name=Transformador de Média Voltagem
tile.techreborn:hv_transformer.name=Transformador de Alta Voltagem
tile.techreborn:ev_transformer.name=Transformador de Voltagem Extrema
tile.techreborn:auto_crafting_table.name=Mesa de Auto-Fabricação
#Blocks
tile.techreborn:rubber_log.name=Madeira de Seringueira
tile.techreborn:rubber_planks.name=Tábuas de Madeira de Seringueira
tile.techreborn:rubber_leaves.name=Folhas de Seringueira
tile.techreborn:rubber_sapling.name=Muda de Seringueira
tile.techreborn:refined_iron_fence.name=Cerca de Ferro
tile.techreborn:lamp_incandescent.name=Lâmpada Incandescente
tile.techreborn:lamp_led.name=Lâmpada de LED
tile.techreborn:alarm.name=Alarme
#Ores
tile.techreborn:ore.galena.name=Minério de Galena
tile.techreborn:ore.iridium.name=Minério de Irídio
tile.techreborn:ore.ruby.name=Minério de Rubi
tile.techreborn:ore.sapphire.name=Minério de Safira
tile.techreborn:ore.bauxite.name=Minério de Bauxita
tile.techreborn:ore.pyrite.name=Minério de Pirita
tile.techreborn:ore.cinnabar.name=Minério de Cinábrio
tile.techreborn:ore.sphalerite.name=Minério de Esfarelite
tile.techreborn:ore.tungsten.name=Minério de Tungstênio
tile.techreborn:ore.sheldonite.name=Minério de Sheldonite
tile.techreborn:ore.peridot.name=Minério de Peridoto
tile.techreborn:ore.sodalite.name=Minério de Sodalite
tile.techreborn:ore.tetrahedrite.name=Minério de Tetraedrite
tile.techreborn:ore.cassiterite.name=Minério de Cassiterite
tile.techreborn:ore.lead.name=Minério de Chumbo
tile.techreborn:ore.silver.name=Minério de Prata
#Storage
tile.techreborn:storage.silver.name=Bloco de Prata
tile.techreborn:storage.aluminum.name=Bloco de Alumínio
tile.techreborn:storage.titanium.name=Bloco de Titanio
tile.techreborn:storage.chrome.name=Bloco de Crômo
tile.techreborn:storage.steel.name=Bloco de Aço
tile.techreborn:storage.brass.name=Bloco de Latão
tile.techreborn:storage.lead.name=Bloco de Chumbo
tile.techreborn:storage.electrum.name=Bloco de Electro
tile.techreborn:storage.zinc.name=Bloco de Zinco
tile.techreborn:storage.platinum.name=Bloco de Platina
tile.techreborn:storage.tungsten.name=Bloco de Tungstênio
tile.techreborn:storage.nickel.name=Bloco de Níquel
tile.techreborn:storage.invar.name=Bloco de Invar
tile.techreborn:storage.osmium.name=Bloco de Ósmio
tile.techreborn:storage.iridium.name=Bloco de Irídio
tile.techreborn:storage.bronze.name=Bloco de Bronze
tile.techreborn:storage2.tungstensteel.name=Bloco de Aço de Tungstênio
tile.techreborn:storage2.lodestone.name=Bloco de Pedra-ímã
tile.techreborn:storage2.tellurium.name=Bloco de Telúrio
tile.techreborn:storage2.iridium_reinforced_tungstensteel.name=Bloco de Aço de Tungstênio Reforçado com Irídio
tile.techreborn:storage2.iridium_reinforced_stone.name=Pedra Reforçada com Irídio
tile.techreborn:storage2.ruby.name=Bloco de Rubi
tile.techreborn:storage2.sapphire.name=Bloco de Safira
tile.techreborn:storage2.peridot.name=Bloco de Peridoto
tile.techreborn:storage2.yellow_garnet.name=Bloco de Cristal Amarelo
tile.techreborn:storage2.red_garnet.name=Bloco de Cristal Vermelho
tile.techreborn:storage2.refined_iron.name=Bloco de Ferro Refinado
tile.techreborn:storage2.copper.name=Bloco de Cobre
tile.techreborn:storage2.tin.name=Bloco de Estanho
tile.techreborn:farm.name=Farm
#Fluids
tile.techreborn:berylium.name=Berílo Líquido
tile.techreborn:calcium.name=Calcio Líquido
tile.techreborn:calciumcarbonate.name=Carbonato de Cálcio Líquido
tile.techreborn:chlorite.name=Clorite Líquido
tile.techreborn:deuterium.name=Deutério Líquido
tile.techreborn:glyceryl.name=Glicerilo Líquido
tile.techreborn:helium.name=Hélio
tile.techreborn:helium3.name=Hélio3
tile.techreborn:heliumplasma.name=Plasma de Hélio
tile.techreborn:hydrogen.name=Hidrogênio
tile.techreborn:lithium.name=Lítio Líquido
tile.techreborn:mercury.name=Mercúrio Líquido
tile.techreborn:methane.name=Metano Líquido
tile.techreborn:nitrocoalfuel.name=Combustível de Nitrogênio Líquido
tile.techreborn:nitrofuel.name=Combustível Nitroso Líquido
tile.techreborn:nitrogen.name=Nitrogênio Líquido
tile.techreborn:nitrogendioxide.name=Dióxido de Nitrogênio Líquido
tile.techreborn:potassium.name=Potássio Líquido
tile.techreborn:silicon.name=Silicone Líquido
tile.techreborn:sodium.name=Sódio Líquido
tile.techreborn:sodiumpersulfate.name=Persulfato de Sódio Líquido
tile.techreborn:tritium.name=Tritio Líquido
tile.techreborn:wolframium.name=Wolframium Líquido
tile.techreborn:compressedair.name=Ar Comprimido
tile.techreborn:electrolyzedwater.name=Água Eletrolizada
tile.techreborn:supercondensator.name=Supercondensador
fluid.fluid.fluidberylium=Berílo
fluid.fluid.fluidcalcium=Calcio
fluid.fluid.fluidcalciumcarbonate=Carbonato de Cálcio
fluid.fluid.fluidchlorite=Clorite
fluid.fluid.fluiddeuterium=Deutério
fluid.fluid.fluidglyceryl=Glicerilo
fluid.fluid.fluidhelium=Hélio
fluid.fluid.fluidhelium3=Hélio3
fluid.fluid.fluidheliumplasma=Plasma de Hélio
fluid.fluid.fluidhydrogen=Hidrogênio
fluid.fluid.fluidlithium=Lítio
fluid.fluid.fluidmercury=Mercúrio
fluid.fluid.fluidmethane=Metano
fluid.fluid.fluidnitrocoalfuel=Combustível de Nitrogênio
fluid.fluid.fluidnitrofuel=Combustível Nitroso
fluid.fluid.fluidnitrogen=Nitrogênio
fluid.fluid.fluidnitrogendioxide=Dióxido de Nitrogênio
fluid.fluid.fluidpotassium=Potássio
fluid.fluid.fluidsilicon=Silicone
fluid.fluid.fluidsodium=Sódio
fluid.fluid.fluidsodiumpersulfate=Persulfato de Sódio
fluid.fluid.fluidtritium=Tritio
fluid.fluid.fluidwolframium=Wolframium
fluid.fluid.electrolyzedwater=Água Eletrolizada
fluid.fluid.compresseair=Ar Comprimido
fluid.tile.techreborn:glyceryl=Glicerilo
fluid.tile.techreborn:berylium=Berílo
fluid.tile.techreborn:chlorite=Clorite
fluid.tile.techreborn:helium3=Hélio3
fluid.tile.techreborn:deuterium=Deutério
fluid.tile.techreborn:helium=Hélio
fluid.tile.techreborn:calciumcarbonate=Carbonato de Cálcio
fluid.titanium.name=Titânio Derretido
fluid.chrome.name=Crômo Derretido
fluid.platinum.name=Platina Derretido
fluid.iridium.name=Irídio Derretido
fluid.invar.name=Invar Derretido
fluid.tungsten.name=Tungstênio Derretido
#Dusts
item.techreborn.dust.almandine.name=Pó de Almandine
item.techreborn.dust.aluminumBrass.name=Pó de Alumínio-bronze
item.techreborn.dust.aluminum.name=Pó de Alumínio
item.techreborn.dust.alumite.name=Pó de Alumite
item.techreborn.dust.andradite.name=Pó de Andradite
item.techreborn.dust.antimony.name=Pó de Antimônio
item.techreborn.dust.ardite.name=Pó de Ardite
item.techreborn.dust.ashes.name=Cinzas
item.techreborn.dust.basalt.name=Pó de Basalto
item.techreborn.dust.bauxite.name=Pó de Bauxita
item.techreborn.dust.biotite.name=Pó de Biotite
item.techreborn.dust.brass.name=Pó de Latão
item.techreborn.dust.bronze.name=Pó de Bronze
item.techreborn.dust.cadmium.name=Pó de Cádmio
item.techreborn.dust.calcite.name=Pó de Calcita
item.techreborn.dust.charcoal.name=Pó de Carvão Vegetal
item.techreborn.dust.chrome.name=Pó de Crômo
item.techreborn.dust.cinnabar.name=Pó de Cinábrio
item.techreborn.dust.clay.name=Pó de Argila
item.techreborn.dust.coal.name=Pó de Carvão
item.techreborn.dust.cobalt.name=Pó de Cobalto
item.techreborn.dust.copper.name=Pó de Cobre
item.techreborn.dust.cupronickel.name=Pó de Cobre-níquel
item.techreborn.dust.dark_ashes.name=Cinzas Negras
item.techreborn.dust.darkIron.name=Pó de Aço Negro
item.techreborn.dust.diamond.name=Pó de Diamante
item.techreborn.dust.electrum.name=Pó de Electro
item.techreborn.dust.emerald.name=Pó de Esmeralda
item.techreborn.dust.ender_eye.name=Pó de Olho do End
item.techreborn.dust.ender_pearl.name=Pó de Pérola do End
item.techreborn.dust.endstone.name=Pó de Rocha do End
item.techreborn.dust.flint.name=Pó de Pederneira
item.techreborn.dust.gold.name=Pó de Ouro
item.techreborn.dust.graphite.name=Pó de Grafite
item.techreborn.dust.grossular.name=Pó de Grossular
item.techreborn.dust.indium.name=Pó de Índio
item.techreborn.dust.invar.name=Pó de Invar
item.techreborn.dust.iridium.name=Pó de Irídio
item.techreborn.dust.iron.name=Pó de Ferro
item.techreborn.dust.lazurite.name=Pó de Lazurita
item.techreborn.dust.lead.name=Pó de Chumbo
item.techreborn.dust.magnesium.name=Pó de Magnésio
item.techreborn.dust.manganese.name=Pó de Manganês
item.techreborn.dust.marble.name=Pó de Marble
item.techreborn.dust.netherrack.name=Pó de Rocha do Nether
item.techreborn.dust.nickel.name=Pó de Níquel
item.techreborn.dust.obsidian.name=Pó de Obsidiana
item.techreborn.dust.osmium.name=Pó de Ósmio
item.techreborn.dust.peridot.name=Pó de Peridoto
item.techreborn.dust.phosphorous.name=Pó de Fósforo
item.techreborn.dust.platinum.name=Pó de Platina
item.techreborn.dust.potassiumFeldspar.name=Pó de Feldspato de Potássio
item.techreborn.dust.pyrite.name=Pó de Pirita
item.techreborn.dust.pyrope.name=Pó de Piropa
item.techreborn.dust.red_garnet.name=Pó de Cristal Vermelho
item.techreborn.dust.ruby.name=Pó de Rubi
item.techreborn.dust.saltpeter.name=Pó de Salitre
item.techreborn.dust.sapphire.name=Pó de Safira
item.techreborn.dust.silicon.name=Pó de Silicone
item.techreborn.dust.silver.name=Pó de Prata
item.techreborn.dust.sodalite.name=Pó de Sodalite
item.techreborn.dust.spessartine.name=Pó de Espessartine
item.techreborn.dust.sphalerite.name=Pó de Esfalerita
item.techreborn.dust.steel.name=Pó de Aço
item.techreborn.dust.sulfur.name=Pó de Enxofre
item.techreborn.dust.tellurium.name=Pó de Telúrio
item.techreborn.dust.teslatite.name=Pó de Teslatita
item.techreborn.dust.tetrahedrite.name=Pó de Tetraedrita
item.techreborn.dust.tin.name=Pó de Estanho
item.techreborn.dust.titanium.name=Pó de Titânio
item.techreborn.dust.tungsten.name=Pó de Tungstênio
item.techreborn.dust.uvarovite.name=Pó de Uvarovite
item.techreborn.dust.vinteum.name=Pó de Vintênio
item.techreborn.dust.voidstone.name=Pó de Voidstone
item.techreborn.dust.yellow_garnet.name=Pó de Cristal Amarelo
item.techreborn.dust.zinc.name=Pó de Zinco
item.techreborn.dust.galena.name=Pó de Galena
item.techreborn.dust.saw_dust.name=Serragem
item.techreborn.dust.olivine.name=Pó de Olivine
item.techreborn.dust.andesite.name=Pó de Andesito
item.techreborn.dust.diorite.name=Pó de Diorito
item.techreborn.dust.granite.name=Pó de Granito
item.techreborn.wrench.name=Chave Inglesa
tile.techreborn:cable.copper.name=Cabo de Cobre
tile.techreborn:cable.tin.name=Cabo de Estanho
tile.techreborn:cable.gold.name=Cabo de Ouro
tile.techreborn:cable.hv.name=Cabo de Alta Voltagem
tile.techreborn:cable.glassfiber.name=Cabo de Fibra de Vidro
tile.techreborn:cable.insulatedcopper.name=Cabo de Cobre Isolado
tile.techreborn:cable.insulatedgold.name=Cabo de Ouro Isolado
tile.techreborn:cable.insulatedhv.name=Cabo de Alta Voltagem Isolado
item.techreborn.scrapbox.name=Caixa de Sucata
item.techreborn.part.carbon_mesh.name=Malha de Carbono
item.techreborn.part.carbon_fiber.name=Fibra de Carbono
#Small Dusts
item.techreborn.dustsmall.almandine.name=Um Pouco de Pó de Almandine
item.techreborn.dustsmall.aluminum.name=Um Pouco de Pó de Alumínio
item.techreborn.dustsmall.andradite.name=Um Pouco de Pó de Andradite
item.techreborn.dustsmall.ashes.name=Um Pouco de Cinzas
item.techreborn.dustsmall.basalt.name=Um Pouco de Pó de Basalto
item.techreborn.dustsmall.bauxite.name=Um Pouco de Pó de Bauxita
item.techreborn.dustsmall.brass.name=Um Pouco de Pó de Latão
item.techreborn.dustsmall.bronze.name=Um Pouco de Pó de Bronze
item.techreborn.dustsmall.calcite.name=Um Pouco de Pó de Calcita
item.techreborn.dustsmall.charcoal.name=Um Pouco de Pó de Carvão Vegetal
item.techreborn.dustsmall.chrome.name=Um Pouco de Pó de Crômo
item.techreborn.dustsmall.cinnabar.name=Um Pouco de Pó de Cinábrio
item.techreborn.dustsmall.clay.name=Um Pouco de Pó de Argila
item.techreborn.dustsmall.coal.name=Um Pouco de Pó de Carvão
item.techreborn.dustsmall.copper.name=Um Pouco de Pó de Cobre
item.techreborn.dustsmall.dark_ashes.name=Um Pouco de Cinzas Negras
item.techreborn.dustsmall.diamond.name=Um Pouco de Pó de Diamante
item.techreborn.dustsmall.electrum.name=Um Pouco de Pó de Electro
item.techreborn.dustsmall.emerald.name=Um Pouco de Pó de Esmeralda
item.techreborn.dustsmall.ender_eye.name=Um Pouco de Pó de Olho do End
item.techreborn.dustsmall.ender_pearl.name=Um Pouco de Pó de Pérola do End
item.techreborn.dustsmall.endstone.name=Um Pouco de Pó de Rocha do End
item.techreborn.dustsmall.flint.name=Um Pouco de Pó de Pederneira
item.techreborn.dustsmall.galena.name=Um Pouco de Pó de Galena
item.techreborn.dustsmall.glowstone.name=Um Pouco de Pó de Pedra Luminosa
item.techreborn.dustsmall.gold.name=Um Pouco de Pó de Ouro
item.techreborn.dustsmall.grossular.name=Um Pouco de Pó de Grossular
item.techreborn.dustsmall.invar.name=Um Pouco de Pó de Invar
item.techreborn.dustsmall.iron.name=Um Pouco de Pó de Ferro
item.techreborn.dustsmall.lazurite.name=Um Pouco de Pó de Lazurita
item.techreborn.dustsmall.lead.name=Um Pouco de Pó de Chumbo
item.techreborn.dustsmall.magnesium.name=Um Pouco de Pó de Magnésio
item.techreborn.dustsmall.manganese.name=Um Pouco de Pó de Manganês
item.techreborn.dustsmall.marble.name=Um Pouco de Pó de Marble
item.techreborn.dustsmall.netherrack.name=Um Pouco de Pó de Rocha do Nether
item.techreborn.dustsmall.nickel.name=Um Pouco de Pó de Níquel
item.techreborn.dustsmall.obsidian.name=Um Pouco de Pó de Obsidiana
item.techreborn.dustsmall.peridot.name=Um Pouco de Pó de Peridoto
item.techreborn.dustsmall.phosphorous.name=Um Pouco de Pó de Fósforo
item.techreborn.dustsmall.platinum.name=Um Pouco de Pó de Platina
item.techreborn.dustsmall.pyrite.name=Um Pouco de Pó de Pirita
item.techreborn.dustsmall.pyrope.name=Um Pouco de Pó de Piropa
item.techreborn.dustsmall.red_garnet.name=Um Pouco de Pó de Cristal Vermelho
item.techreborn.dustsmall.redstone.name=Um Pouco de Pó de Redstone
item.techreborn.dustsmall.ruby.name=Um Pouco de Pó de Rubi
item.techreborn.dustsmall.saltpeter.name=Um Pouco de Pó de Salitre
item.techreborn.dustsmall.sapphire.name=Um Pouco de Pó de Safira
item.techreborn.dustsmall.saw_dust.name=Um Pouco de Serragem
item.techreborn.dustsmall.silver.name=Um Pouco de Pó de Prata
item.techreborn.dustsmall.sodalite.name=Um Pouco de Pó de Sodalite
item.techreborn.dustsmall.spessartine.name=Um Pouco de Pó de Espessartine
item.techreborn.dustsmall.sphalerite.name=Um Pouco de Pó de Esfalerita
item.techreborn.dustsmall.steel.name=Um Pouco de Pó de Aço
item.techreborn.dustsmall.sulfur.name=Um Pouco de Pó de Enxofre
item.techreborn.dustsmall.tin.name=Um Pouco de Pó de Estanho
item.techreborn.dustsmall.titanium.name=Um Pouco de Pó de Titânio
item.techreborn.dustsmall.tungsten.name=Um Pouco de Pó de Tungstênio
item.techreborn.dustsmall.uvarovite.name=Um Pouco de Pó de Uvarovite
item.techreborn.dustsmall.voidstone.name=Um Pouco de Pó de Voidstone
item.techreborn.dustsmall.yellow_garnet.name=Um Pouco de Pó de Cristal Amarelo
item.techreborn.dustsmall.zinc.name=Um Pouco de Pó de Zinco
item.techreborn.dustsmall.olivine.name=Um Pouco de Pó de Olivine
item.techreborn.dustsmall.andesite.name=Um Pouco de Pó de Andesito
item.techreborn.dustsmall.diorite.name=Um Pouco de Pó de Diorito
item.techreborn.dustsmall.granite.name=Um Pouco de Pó de Granito
item.techreborn.cell.name=Célula Vazia
item.techreborn.cell.fluid.name=Célula com $fluid$
item.techreborn.rebattery.name=Bateria
item.techreborn.lithiumBattery.name=Bateria de Lítio
item.techreborn.energyCrystal.name=Cristal de Energia
item.techreborn.lapotronCrystal.name=Cristal Lapotron
item.techreborn.treetap.name=Drenador
item.techreborn.nanosaber.name=Nano-Sabre
item.techreborn.upgrade.overclock.name=Atualização (Overclock)
item.techreborn.upgrade.transformer.name=Atualização (Transformador Interno)
item.techreborn.upgrade.energy_storage.name=Atualização (Armazenamento de Energia)
item.techreborn.upgrade.ejection.name=Atualização (Ejetor)
item.techreborn.upgrade.injection.name=Atualização (Importador)
item.techreborn.electric_treetap.name=Atualização (Drenagem)
#Gems
item.techreborn.gem.ruby.name=Rubi
item.techreborn.gem.sapphire.name=Safira
item.techreborn.gem.peridot.name=Peridoto
item.techreborn.gem.red_garnet.name=Cristal Vermelho
item.techreborn.gem.yellow_garnet.name=Cristal Amarelo
#Ingots
item.techreborn.ingot.aluminum.name=Lingote de Alumínio
item.techreborn.ingot.brass.name=Lingote de Latão
item.techreborn.ingot.bronze.name=Lingote de Bronze
item.techreborn.ingot.chrome.name=Lingote de Crômo
item.techreborn.ingot.copper.name=Lingote de Cobre
item.techreborn.ingot.electrum.name=Lingote de Electro
item.techreborn.ingot.invar.name=Lingote de Invar
item.techreborn.ingot.iridium.name=Lingote de Irídio
item.techreborn.ingot.lead.name=Lingote de Chumbo
item.techreborn.ingot.nickel.name=Lingote de Níquel
item.techreborn.ingot.platinum.name=Lingote de Platina
item.techreborn.ingot.silver.name=Lingote de Prata
item.techreborn.ingot.steel.name=Lingote de Aço
item.techreborn.ingot.tin.name=Lingote de Estanho
item.techreborn.ingot.titanium.name=Lingote de Titânio
item.techreborn.ingot.tungsten.name=Lingote de Tungstênio
item.techreborn.ingot.hot_tungstensteel.name=Lingote de Aço de Tungstênio Quente
item.techreborn.ingot.tungstensteel.name=Lingote de Aço de Tungstênio
item.techreborn.ingot.zinc.name=Lingote de Zinco
item.techreborn.ingot.advanced_alloy.name=Lingote de Liga Avançada
item.techreborn.ingot.mixed_metal.name=Lingote de Metal Misturado
item.techreborn.ingot.iridium_alloy.name=Lingote de Liga de Irídio
item.techreborn.ingot.refined_iron.name=Lingote de Ferro Refinado
#Nuggets
item.techreborn.nuggets.aluminum.name=Pepita de Alumínio
item.techreborn.nuggets.antimony.name=Pepita de Antimônio
item.techreborn.nuggets.brass.name=Pepita de Latão
item.techreborn.nuggets.bronze.name=Pepita de Bronze
item.techreborn.nuggets.chrome.name=Pepita de Crômo
item.techreborn.nuggets.copper.name=Pepita de Cobre
item.techreborn.nuggets.electrum.name=Pepita de Electro
item.techreborn.nuggets.invar.name=Pepita de Invar
item.techreborn.nuggets.iridium.name=Pepita de Irídio
item.techreborn.nuggets.iron.name=Pepita de Ferro
item.techreborn.nuggets.lead.name=Pepita de Chumbo
item.techreborn.nuggets.nickel.name=Pepita de Níquel
item.techreborn.nuggets.osmium.name=Pepita de Ósmio
item.techreborn.nuggets.platinum.name=Pepita de Platina
item.techreborn.nuggets.silver.name=Pepita de Prata
item.techreborn.nuggets.steel.name=Pepita de Aço
item.techreborn.nuggets.tin.name=Pepita de Estanho
item.techreborn.nuggets.titanium.name=Pepita de Titânio
item.techreborn.nuggets.tungsten.name=Pepita de Tungstênio
item.techreborn.nuggets.tungstensteel.name=Pepita de Aço de Tungstênio
item.techreborn.nuggets.hot_tungstensteel.name=Pepita de Aço de Tungstênio Quente
item.techreborn.nuggets.zinc.name=Pepita de Zinco
item.techreborn.nuggets.refined_iron.name=Pepita de Ferro Refinado
item.techreborn.nuggets.diamond.name=Pepita de Diamante
#Plates
item.techreborn.plate.aluminum.name=Placa de Alumínio
item.techreborn.plate.brass.name=Placa de Latão
item.techreborn.plate.bronze.name=Placa de Bronze
item.techreborn.plate.carbon.name=Placa de Carbono
item.techreborn.plate.coal.name=Placa de Carvão
item.techreborn.plate.chrome.name=Placa de Crômo
item.techreborn.plate.copper.name=Placa de Cobre
item.techreborn.plate.diamond.name=Placa de Diamante
item.techreborn.plate.electrum.name=Placa de Electro
item.techreborn.plate.emerald.name=Placa de Esmeralda
item.techreborn.plate.gold.name=Placa de Ouro
item.techreborn.plate.invar.name=Placa de Invar
item.techreborn.plate.iridium.name=Placa de Irídio
item.techreborn.plate.iron.name=Placa de Ferro
item.techreborn.plate.lapis.name=Placa de Lápis-Lazuli
item.techreborn.plate.lead.name=Placa de Chumbo
item.techreborn.plate.nickel.name=Placa de Níquel
item.techreborn.plate.obsidian.name=Placa de Obsidiana
item.techreborn.plate.peridot.name=Placa de Peridoto
item.techreborn.plate.platinum.name=Placa de Platina
item.techreborn.plate.red_garnet.name=Placa de Cristal Vermelho
item.techreborn.plate.redstone.name=Placa de Redstone
item.techreborn.plate.ruby.name=Placa de Rubi
item.techreborn.plate.sapphire.name=Placa de Safira
item.techreborn.plate.silicon.name=Placa de Silicone
item.techreborn.plate.silver.name=Placa de Prata
item.techreborn.plate.steel.name=Placa de Aço
item.techreborn.plate.teslatite.name=Placa de Teslatite
item.techreborn.plate.tin.name=Placa de Estanho
item.techreborn.plate.titanium.name=Placa de Titânio
item.techreborn.plate.tungsten.name=Placa de Tungstênio
item.techreborn.plate.hot_tungstensteel.name=Placa de Aço de Tungstênio Quente
item.techreborn.plate.tungstensteel.name=Placa de Aço de Tungstênio
item.techreborn.plate.yellow_garnet.name=Placa de Cristal Amarelo
item.techreborn.plate.zinc.name=Placa de Zinco
item.techreborn.plate.refined_iron.name=Placa de Ferro Refinado
item.techreborn.plate.wood.name=Placa de Madeira
item.techreborn.plate.advanced_alloy.name=Placa de Liga Avançada
item.techreborn.plate.lazurite.name=Placa de Lazurita
item.techreborn.plate.magnalium.name=Placa de Magnálio
item.techreborn.plate.iridium_alloy.name=Placa de Liga de Irídio
#Parts
item.techreborn.part.energy_flow_circuit.name=Circuito de Fluxo de Energia
item.techreborn.part.data_control_circuit.name=Circuito de Controle de Dados
item.techreborn.part.data_orb.name=Orbe de Dados
item.techreborn.part.data_storage_circuit.name=Circuito de Armazenamento de Dados
item.techreborn.part.diamond_grinding_head.name=Cabeça de Trituração de Diamante
item.techreborn.part.diamond_saw_blade.name=Serra de Diamante
item.techreborn.part.tungsten_grinding_head.name=Cabeça de Trituração de Tungstênio
item.techreborn.part.helium_coolant_simple.name=Célula Refrigerante de Hélio de 60k
item.techreborn.part.helium_coolant_triple.name=Célula Refrigerante de Hélio de 180k
item.techreborn.part.helium_coolant_six.name=Célula Refrigerante de Hélio de 360k
item.techreborn.part.nak_coolant_simple.name=Célula Refrigerante de SPA de 60k
item.techreborn.part.nak_coolant_triple.name=Célula Refrigerante de SPA de 180k
item.techreborn.part.nak_coolant_six.name=Célula Refrigerante de SPA de 360k
item.techreborn.part.cupronickel_heating_coil.name=Bobina de Aquacimento de Cobre-níquel
item.techreborn.part.nichrome_heating_coil.name=Bobina de Aquacimento de Crômo-níquel
item.techreborn.part.kanthal_heating_coil.name=Bobina de Aquacimento de CromAFeR
item.techreborn.part.super_conductor.name=Supercondutor
item.techreborn.part.thorium_cell.name=Haste de Combustível (Tório)
item.techreborn.part.double_thorium_cell.name=Haste Dupla de Combustível (Tório)
item.techreborn.part.quad_thorium_cell.name=Haste Quadrupla de Combustível (Tório)
item.techreborn.part.plutonium_cell.name=Haste de Combustível (Plutônio)
item.techreborn.part.double_plutonium_cell.name=Haste Dupla de Combustível (Plutônio)
item.techreborn.part.quad_plutonium_cell.name=Haste Quadrupla de Combustível (Plutônio)
item.techreborn.part.iridium_neutron_reflector.name=Refletor de Neutrons de Irídio
item.techreborn.part.computer_monitor.name=Monitor de Computador
item.techreborn.part.machine_parts.name=Partes de Máquina
item.techreborn.part.neutron_reflector.name=Refletor de Neutrons
item.techreborn.part.thick_neutron_reflector.name=Refletor de Neutrons Grosso
item.techreborn.part.sap.name=Seiva
item.techreborn.part.rubber.name=Borracha
item.techreborn.part.scrap.name=Sucata
item.techreborn.part.electronic_circuit.name=Circuito Eletrônico
item.techreborn.part.advanced_circuit.name=Circuito Eletrônico Avançado
item.techreborn.part.coolant_simple.name=Célula Refrigerante de 10k
item.techreborn.part.coolant_triple.name=Célula Refrigerante de 30k
item.techreborn.part.coolant_six.name=Célula Refrigerante de 60k
item.techreborn.frequencyTransmitter.name=Transmissor de Frequências
#Tools
item.techreborn.rockcutter.name=Cortador de Rochas
item.techreborn.lithiumbatpack.name=Mochila-Bateria de Lítio
item.techreborn.lapotronpack.name=Mochila-Orbe Lapotrônica
item.techreborn.omniTool.name=Ferramenta Todo-Uso
item.techreborn.ironDrill.name=Broca de Aço
item.techreborn.diamondDrill.name=Broca de Diamante
item.techreborn.advancedDrill.name=Broca Avançada
item.techreborn.ironChainsaw.name=Motosserra de Aço
item.techreborn.diamondChainsaw.name=Motosserra de Diamante
item.techreborn.advancedChainsaw.name=Motosserra Avançada
item.techreborn.lapotronicorb.name=Orbe de Energia Lapotrônica
item.techreborn.cloakingdevice.name=Dispositivo de Camuflagem
item.techreborn.steelJackhammer.name=Martelo Hidráulico de Aço
item.techreborn.diamondJackhammer.name=Martelo Hidráulico de Diamante
item.techreborn.advancedJackhammer.name=Martelo Hidráulico Avançado
item.bronzeSword.name=Espada de Bronze
item.bronzePickaxe.name=Picareta de Bronze
item.bronzeSpade.name=Pá de Bronze
item.bronzeAxe.name=Machado de Bronze
item.bronzeHoe.name=Enxada de Bronze
item.bronzeHelmet.name=Elmo de Bronze
item.bronzeChestplate.name=Armadura de Bronze
item.bronzeLeggings.name=Calças de Bronze
item.bronzeBoots.name=Botas de Bronze
item.rubySword.name=Espada de Rubi
item.rubyPickaxe.name=Picareta de Rubi
item.rubySpade.name=Pá de Rubi
item.rubyAxe.name=Machado de Rubi
item.rubyHoe.name=Enxada de Rubi
item.rubyHelmet.name=Elmo de Rubi
item.rubyChestplate.name=Armadura de Rubi
item.rubyLeggings.name=Calças de Rubi
item.rubyBoots.name=Botas de Rubi
item.sapphireSword.name=Espada de Safira
item.sapphirePickaxe.name=Picareta de Safira
item.sapphireSpade.name=Pá de Safira
item.sapphireAxe.name=Machado de Safira
item.sapphireHoe.name=Enxada de Safira
item.sapphireHelmet.name=Elmo de Safira
item.sapphireChestplate.name=Armadura de Safira
item.sapphireLeggings.name=Calças de Safira
item.sapphireBoots.name=Botas de Safira
item.peridotSword.name=Espada de Peridoto
item.peridotPickaxe.name=Picareta de Peridoto
item.peridotSpade.name=Pá de Peridoto
item.peridotAxe.name=Machado de Peridoto
item.peridotHoe.name=Enxada de Peridoto
item.peridotHelmet.name=Elmo de Peridoto
item.peridotChestplate.name=Armadura de Peridoto
item.peridotLeggings.name=Calças de Peridoto
item.peridotBoots.name=Botas de Peridoto
#Fluid
fluid.fluidberylium=Berílo
fluid.fluidcalcium=Cálcio
fluid.fluidcalciumcarbonate=Carbonato de Cálcio
fluid.fluidcarbon=Carbono
fluid.fluidcarbonfiber=Fibra de Carbono
fluid.fluidchlorite=Clorite
fluid.fluiddeuterium=Deutério
fluid.fluiddiesel=Diesel
fluid.fluidglyceryl=Glicerilo
fluid.fluidhelium=Hélio
fluid.fluidhelium3=Hélio3
fluid.fluidheliumplasma=Plasma de Hélio
fluid.fluidhydrogen=Hidrogênio
fluid.fluidlithium=Lítio
fluid.fluidmercury=Mercúrio
fluid.fluidmethane=Metano
fluid.fluidnitrocarbon=Carbono Nitroso
fluid.fluidnitrocoalfuel=Combustível de Nitrogênio
fluid.fluidnitrodiesel=Diesel Nitroso
fluid.fluidnitrofuel=Combustível Nitroso
fluid.fluidnitrogen=Nitrogênio
fluid.fluidnitrogendioxide=Dióxido de Nitrogênio
fluid.fluidoil=Óleo
fluid.fluidpotassium=Potássio
fluid.fluidsilicon=Silicone
fluid.fluidsodium=Sódio
fluid.fluidsodiumSulfide=Sulfeto de Sódio
fluid.fluidSulfur=Enxofre
fluid.fluidsulfuricacid=Ácido Sulfúrico
fluid.fluidcompressedair=Ar Comprimido
fluid.fluidelectrolyzedwater=Água Eletrolizada
fluid.fluidsodiumpersulfate=Persulfato de Sódio
fluid.fluidtritium=Tritio
fluid.fluidwolframium=Wolframium
#Items
item.techreborn.uuMatter.name=Matéria UU
item.techreborn.manual.name=Manual Tech Reborn
item.techreborn.debug.name=Ferramenta de Debug
#Message
techreborn.message.missingmultiblock=Estrutura Incompleta
techreborn.message.setTo=Marcado em
techreborn.message.in=em
techreborn.message.noCoordsSet=Nenhuma Coordenada
techreborn.message.coordsHaveBeen=As coordenadas foram
techreborn.message.cleared=Limpas
techreborn.message.detects=Detecta
techreborn.message.allPlayers=Todos os Players
techreborn.message.onlyOtherPlayers=Apenas Outros Players
techreborn.message.onlyYou=Apenas Você
techreborn.message.nanosaberActive=Ativo
techreborn.message.nanosaberActivate=Ativar
techreborn.message.nanosaberDeactivating=Desativando
techreborn.message.nanosaberInactive=Inactivo
techreborn.message.nanosaberEnergyErrorTo=Sem energia suficiente para
techreborn.message.nanosaberEnergyError=Sem energia suficiente:
#Cables
Cable.copperCable.name=Cabo de Cobre
Cable.insulatedCopperCable.name=Cabo de Cobre Isolado
Cable.goldCable.name=Cabo de Ouro
Cable.insulatedGoldCable.name=Cabo de Ouro Isolado
Cable.doubleInsulatedGoldCable.name=Cabo de Ouro Duplamente Isolado
Cable.ironCable.name=Cabo de Ferro
Cable.copperCable.name=Cabo de Cobre
Cable.insulatedIronCable.name=Cabo de Ferro Isolado
Cable.doubleInsulatedIronCable.name=Cabo de de Ferro Duplamente Isolado
Cable.trippleInsulatedIronCable.name=Cabo de Ferro Triplamente Isolado
Cable.glassFiberCable.name=Cabo de Fibra de Vidro
Cable.tinCable.name=Cabo de Estanho
desc.uninsulatedCable=Danifica Entidades!
desc.transfer=Transferência de Energia:
desc.tier=Nível:
keys.techreborn.category=Categoria: TechReborn
keys.techreborn.config=Config
# JEI Integration
techreborn.jei.recipe.start.cost=Começa aos: %s
techreborn.jei.recipe.running.cost=%s/t: %s
techreborn.jei.recipe.processing.time.1=Tempo: %s ticks
techreborn.jei.recipe.processing.time.2=(%s segundos)
jei.techreborn.scrapbox.name=Abrindo Caixas de Sucata
techreborn.desc.rubberSap=Para obter seiva, você precisa encontrar uma seringueira, ou obter uma muda de seringueira e fazê-la crescer. Depois de obter uma seringueira, procure por pequenas manchas amareladas na árvore. Se você não vir nenhuma, espere um pouco e, eventualmente, estes pontos de seiva amarelada aparecerão. Para colher a seiva, use um drenador no tronco.
techreborn.desc.scrapBox=Caixas de Sucata podem ser abertas simplesmente com as mãos, ou por ejetores. Isso mesmo! Basta jogar suas caixas de sucata em ejetores e lhes dar um sinal redstone, e boom! Item aleatório!
techreborn.desc.scrapBoxNoDispenser=Caixas de Sucata podem ser abertas com as mãos!
techreborn.jei.category.alloy.furnace=Fundidora de Ligas
techreborn.jei.category.generator.gas=Gerador à Gás
techreborn.jei.category.generator.semifluid=Gerador à Semi-fluidos
techreborn.jei.category.generator.diesel=Gerador à Diesel
techreborn.jei.category.generator.thermal=Gerador Térmico
techreborn.jei.category.generator.plasma=Gerador à Plasma
#Death Messages
death.attack.shock=%s foi Eletrocutado
#Entitys
entity.nuke.name=Bomba Nuke
#Tooltips
tooltip.wip=WIP Em desenvolvimento
tooltip.upBroken=Atualizações NÃO funcionam!
tooltip.ingredient=Atualmente, apenas um ingrediente de fabricação
techreborn.tooltip.inventory=Inventário
techreborn.tooltip.upgrades=Melhorias
techreborn.tooltip.transferRate=Taxa de Tranferência
techreborn.tooltip.tier=Nível
#Advancements
advancements.techreborn.root.desc=Agora que você achou um minério do Tech Reborn, você pode achar um drenador muito útil.
advancements.techreborn.treetap=Drenador
advancements.techreborn.treetap.desc=Agora que você fez seu drenador, você vai querer usá-lo na seiva de uma seringueira.
advancements.techreborn.sap=Seiva de Borracha
advancements.techreborn.sap.desc=Muito bem. Você agora tem uma seiva de borracha. Você agora vai querer queimá-la numa fornalha para conseguir borracha.

View file

@ -1,718 +0,0 @@
#Часть переводов взята с Minecraft Wiki, большая же часть осталась от старого переводчика - просто адаптировал перевод под новые имена предметов
#Little part of translations was taken from wiki, all another - just adaptation of previous translations for new itemnames
item.missingRecipe.name=Missing Recipe Placeholder
itemGroup.techreborn=Tech Reborn
#machines
tile.techreborn:pump.name=Насос
tile.techreborn:gas_turbine.name=Газовая турбина
tile.techreborn:industrial_block.name=Промышленный
tile.techreborn:thermal_generator.name=Теплогенератор
tile.techreborn:quantum_tank.name=Квантовый бак
tile.techreborn:quantum_chest.name=Квантовый сундук
tile.techreborn:digital_chest.name=Цифровой сундук
tile.techreborn:industrial_centrifuge.name=Промышленная центрифуга
tile.techreborn:rolling_machine.name=Прокатный стан
tile.techreborn:machine_casing.standard.name=Стандартная обшивка машины
tile.techreborn:machine_casing.reinforced.name=Усиленная обшивка машины
tile.techreborn:machine_casing.advanced.name=Продвинутая обшивка машины
tile.techreborn:industrial_blast_furnace.name=Промышленная доменная печь
tile.techreborn:alloy_smelter.name=Электрическая плавильная печь
tile.techreborn:matter_fabricator.name=Завод материи
tile.techreborn:implosion_compressor.name=Компрессор внутреннего взрыва
tile.techreborn:industrial_grinder.name=Промышленная дробилка
tile.techreborn:chunk_loader.name=Промышленный загрузчик чанков
tile.techreborn:magic_energy_converter.name=Конвертер магической энергии
tile.techreborn:diesel_generator.name=Дизельный генератор
tile.techreborn:heat_generator.name=Тепловой генератор
tile.techreborn:industrial_electrolyzer.name=Промышленный электролизер
tile.techreborn:magic_energy_absorber.name=Абсорбер магической энергии
tile.techreborn:assembly_machine.name=Сборочная машина
tile.techreborn:semi_fluid_generator.name=Генератор полужидкости
tile.techreborn:iron_alloy_furnace.name=Железная плавильная печь
tile.techreborn:chemical_reactor.name=Химический реактор
tile.techreborn:dragon_egg_syphon.name=Сифон энергии драконьего яйца
tile.techreborn:interdimensional_su.name=Interdimensional SU
tile.techreborn:adjustable_su.name=Регулируемый SU
tile.techreborn:lapotronic_su.name=LESU контроллер
tile.techreborn:lsu_storage.name=LESU хранилще
tile.techreborn:distillation_tower.name=Дистилляционная колонна
tile.techreborn:electric_crafting_table.name=Электрический автоверстак
tile.techreborn:vacuum_freezer.name=Вакуумная морозилка
tile.techreborn:plasma_generator.name=Плазменный генератор
tile.techreborn:fusion_control_computer.name=Термоядерный реактор
tile.techreborn:computer_cube.name=Компьютерный куб TechReborn
tile.techreborn:fusion_coil.name=Термоядерные Катушки
tile.techreborn:lightning_rod.name=Молниеотвод
tile.techreborn:industrial_sawmill.name=Лесопилка
tile.techreborn:charge_o_mat.name=Зарядник
tile.techreborn:player_detector.all.name=Детектор игроков (Все)
tile.techreborn:player_detector.others.name=Детектор игроков (Другие)
tile.techreborn:player_detector.you.name=Детектор игроков (Вы)
tile.techreborn:solid_fuel_generator.name=Генератор
tile.techreborn:extractor.name=Экстрактор
tile.techreborn:grinder.name=Дробилка
tile.techreborn:compressor.name=Компрессор
tile.techreborn:electric_furnace.name=Электропечь
tile.techreborn:machine_frame.highly_advanced.name=Чрезвычайно продвинутый блок машины
tile.techreborn:machine_frame.advanced.name=Продвинутый блок машины
tile.techreborn:machine_frame.basic.name=Блок машины
tile.techreborn:ore2.copper.name=Медная руда
tile.techreborn:ore2.tin.name=Оловянная руда
tile.techreborn:solar_panel.name=Солнечная панель
tile.techreborn:creative_solar_panel.name=Читерская панель
tile.techreborn:water_mill.name=Водяная мельница
tile.techreborn:wind_mill.name=Ветряная мельница
tile.techreborn:iron_furnace.name=Железная печь
tile.techreborn:recycler.name=Переработчик
tile.techreborn:scrapboxinator.name=Шкатулка
tile.techreborn:low_voltage_su.name=Батбокс
tile.techreborn:medium_voltage_su.name=МФЭ
tile.techreborn:high_voltage_su.name=ЭХО
tile.techreborn:reinforced_glass.name=Укреплённое стекло
tile.techreborn:nuke.name=Ядерное оружие
tile.techreborn:lv_transformer.name=Трансформатор НН
tile.techreborn:mv_transformer.name=Трансформатор СН
tile.techreborn:hv_transformer.name=Трансформатор ВН
tile.techreborn:ev_transformer.name=Трансформатор ОВН
tile.techreborn:auto_crafting_table.name=Автоверстак
#Blocks
tile.techreborn:rubber_log.name=Древесина гевеи
tile.techreborn:rubber_planks.name=Доски из древесины гевеи
tile.techreborn:rubber_plank_slab.name=Плита из древесины гевеи
tile.techreborn:rubber_plank_stair.name=Ступеньки из древесины гевеи
tile.techreborn:rubber_leaves.name=Листва гевеи
tile.techreborn:rubber_sapling.name=Саженец гевеи
tile.techreborn:refined_iron_fence.name=Железный забор
tile.techreborn:alarm.name=Сирена
#Ores
tile.techreborn:ore.galena.name=Галенитовая руда
tile.techreborn:ore.iridium.name=Иридиевая руда
tile.techreborn:ore.ruby.name=Рубиновая руда
tile.techreborn:ore.sapphire.name=Сапфировая руда
tile.techreborn:ore.bauxite.name=Бокситовая руда
tile.techreborn:ore.pyrite.name=Пиритовая руда
tile.techreborn:ore.cinnabar.name=Киноварь
tile.techreborn:ore.sphalerite.name=Сфалеритовая руда
tile.techreborn:ore.tungsten.name=Вольфрамовая руда
tile.techreborn:ore.sheldonite.name=Шелдонитовая руда
tile.techreborn:ore.peridot.name=Перидотовая руда
tile.techreborn:ore.sodalite.name=Содалитовая руда
tile.techreborn:ore.tetrahedrite.name=Тетраэдритовая руда
tile.techreborn:ore.cassiterite.name=Касситеритовая руда
tile.techreborn:ore.lead.name=Свинцовая руда
tile.techreborn:ore.silver.name=Серебряная руда
#Storage
tile.techreborn:storage.silver.name=Серебряный блок
tile.techreborn:storage.aluminum.name=Алюминиевый блок
tile.techreborn:storage.titanium.name=Титановый блок
tile.techreborn:storage.chrome.name=Хромовый блок
tile.techreborn:storage.steel.name=Стальной блок
tile.techreborn:storage.brass.name=Латунный блок
tile.techreborn:storage.lead.name=Свинцовый блок
tile.techreborn:storage.electrum.name=Электрумовый блок
tile.techreborn:storage.zinc.name=Цинковый блок
tile.techreborn:storage.platinum.name=Платиновый блок
tile.techreborn:storage.tungsten.name=Вольфрамовый блок
tile.techreborn:storage.nickel.name=Никелевый блок
tile.techreborn:storage.invar.name=Инваровый блок
tile.techreborn:storage.osmium.name=Осмиевый блок
tile.techreborn:storage.iridium.name=Иридиевый блок
tile.techreborn:storage2.tungstensteel.name=Блок вольфрамовой стали
tile.techreborn:storage2.lodestone.name=Магнетитовый блок
tile.techreborn:storage2.tellurium.name=Блок теллура
tile.techreborn:storage2.iridium_reinforced_tungstensteel.name=Блок вольфрамовой стали, укреплённый иридием
tile.techreborn:storage2.iridium_reinforced_stone.name=Камень, укреплённый иридием
tile.techreborn:storage2.ruby.name=Рубиновый блок
tile.techreborn:storage2.sapphire.name=Сапфировый блок
tile.techreborn:storage2.peridot.name=Перидотовый блок
tile.techreborn:storage2.yellow_garnet.name=Блок жёлтого граната
tile.techreborn:storage2.red_garnet.name=Блок красного граната
tile.techreborn:storage2.refined_iron.name=Блок переработанного железа
tile.techreborn:storage2.copper.name=Медный блок
tile.techreborn:storage2.tin.name=Оловянный блок
tile.techreborn:farm.name=Ферма
#Fluids
tile.techreborn:berylium.name=Источник бериллия
tile.techreborn:calcium.name=Источник кальция
tile.techreborn:calciumcarbonate.name=Источник карбоната кальция
tile.techreborn:chlorite.name=Источник хлорита
tile.techreborn:deuterium.name=Источник дейтерия
tile.techreborn:glyceryl.name=Источник глицерина
tile.techreborn:helium.name=Источник гелия
tile.techreborn:helium3.name=Источник гелия-3
tile.techreborn:heliumplasma.name=Источник гелиевой плазмы
tile.techreborn:hydrogen.name=Источник водорода
tile.techreborn:lithium.name=Источник лития
tile.techreborn:mercury.name=Источник ртути
tile.techreborn:methane.name=Источник метана
tile.techreborn:nitrocoalfuel.name=Источник нитрокарбоната
tile.techreborn:nitrofuel.name=Источник нитротоплива
tile.techreborn:nitrogen.name=Источник азота
tile.techreborn:nitrogendioxide.name=Источник диоксида азота
tile.techreborn:potassium.name=Источник калия
tile.techreborn:silicon.name=Источник кремния
tile.techreborn:sodium.name=Источник натрия
tile.techreborn:sodiumpersulfate.name=Источник персульфата натрия
tile.techreborn:tritium.name=Источник трития
tile.techreborn:wolframium.name=Источник вольфрама
tile.techreborn:compressedair.name=Источник спрессованного воздуха
tile.techreborn:electrolyzedwater.name=Источник электризованной воды
tile.techreborn:supercondensator.name=Ионистор
fluid.fluid.fluidberylium=Бериллий
fluid.fluid.fluidcalcium=Кальций
fluid.fluid.fluidcalciumcarbonate=Карбонат кальция
fluid.fluid.fluidchlorite=Хлорит
fluid.fluid.fluiddeuterium=Дейтерий
fluid.fluid.fluidglyceryl=Глицерил
fluid.fluid.fluidhelium=Гелий
fluid.fluid.fluidhelium3=Гелий-3
fluid.fluid.fluidheliumplasma=Гелиевая плазма
fluid.fluid.fluidhydrogen=Водород
fluid.fluid.fluidlithium=Литий
fluid.fluid.fluidmercury=Ртуть
fluid.fluid.fluidmethane=Метан
fluid.fluid.fluidnitrocoalfuel=Нитрокарбонат
fluid.fluid.fluidnitrofuel=Нитрат топлива
fluid.fluid.fluidnitrogen=Азот
fluid.fluid.fluidnitrogendioxide=Диоксид азота
fluid.fluid.fluidpotassium=Калий
fluid.fluid.fluidsilicon=Кремний
fluid.fluid.fluidsodium=Натрий
fluid.fluid.fluidsodiumpersulfate=Персульфат натрия
fluid.fluid.fluidtritium=Тритий
fluid.fluid.fluidwolframium=Вольфрам
fluid.fluid.electrolyzedwater=Электризованная вода
fluid.fluid.compresseair=Сжатый воздух
fluid.tile.techreborn:glyceryl=Глицерил
fluid.tile.techreborn:berylium=Бериллий
fluid.tile.techreborn:chlorite=Хлорит
fluid.tile.techreborn:helium3=Гелий-3
fluid.tile.techreborn:deuterium=Дейтерий
fluid.tile.techreborn:helium=Гелий
fluid.tile.techreborn:calciumcarbonate=Карбонат кальция
fluid.titanium.name=Расплавленный титан
fluid.chrome.name=Расплавленный хром
fluid.platinum.name=Расплавленный платина
fluid.iridium.name=Расплавленный иридий
fluid.invar.name=Расплавленный инвар
fluid.tungsten.name=Расплавленный вольфрам
#Dusts
item.techreborn.dust.almandine.name=Алмадиновая пыль
item.techreborn.dust.aluminumBrass.name=Алюминиево-латунная пыль
item.techreborn.dust.aluminum.name=Алюминиевая пыль
item.techreborn.dust.alumite.name=Алюмитовая пыль
item.techreborn.dust.andradite.name=Андрадитовая пыль
item.techreborn.dust.antimony.name=Сурьмяновая пыль
item.techreborn.dust.ardite.name=Ардитовая пыль
item.techreborn.dust.ashes.name=Пепел
item.techreborn.dust.basalt.name=Базальтовая пыль
item.techreborn.dust.bauxite.name=Бокситовая пыль
item.techreborn.dust.biotite.name=Биотитовая пыль
item.techreborn.dust.brass.name=Латунная пыль
item.techreborn.dust.bronze.name=Бронзовая пыль
item.techreborn.dust.cadmium.name=Кадмиевая пыль
item.techreborn.dust.calcite.name=Кальцитовая пыль
item.techreborn.dust.charcoal.name=Древесноугольная пыль
item.techreborn.dust.chrome.name=Хромовая пыль
item.techreborn.dust.cinnabar.name=Киноварная пыль
item.techreborn.dust.clay.name=Глиняная пыль
item.techreborn.dust.coal.name=Угольная пыль
item.techreborn.dust.cobalt.name=Кобальтовая пыль
item.techreborn.dust.copper.name=Медная пыль
item.techreborn.dust.cupronickel.name=Купроникилевая пыль
item.techreborn.dust.dark_ashes.name=Тёмная пыль
item.techreborn.dust.darkIron.name=пыль Темного железа
item.techreborn.dust.diamond.name=Алмазная пыль
item.techreborn.dust.electrum.name=Электрумовая пыль
item.techreborn.dust.emerald.name=Изумрудная пыль
item.techreborn.dust.ender_eye.name=Пыль глаза Края
item.techreborn.dust.ender_pearl.name=пыль жемчуга Края
item.techreborn.dust.endstone.name=пыль из камня Края
item.techreborn.dust.flint.name=Кременевая пыль
item.techreborn.dust.gold.name=Золотая пыль
item.techreborn.dust.graphite.name=Графитовая пыль
item.techreborn.dust.grossular.name=Гроссуляровая пыль
item.techreborn.dust.indium.name=Индиевая пыль
item.techreborn.dust.invar.name=Инваровая пыль
item.techreborn.dust.iridium.name=Иридиевая пыль
item.techreborn.dust.iron.name=Железная пыль
item.techreborn.dust.lazurite.name=Лазуритовая пыль
item.techreborn.dust.lead.name=Свинцовая пыль
item.techreborn.dust.magnesium.name=Магниевая пыль
item.techreborn.dust.manganese.name=Марганцовая пыль
item.techreborn.dust.marble.name=Мраморная пыль
item.techreborn.dust.netherrack.name=Пыль адского камня
item.techreborn.dust.nickel.name=Никелевая пыль
item.techreborn.dust.obsidian.name=Обсидиановая пыль
item.techreborn.dust.osmium.name=Осмиевая пыль
item.techreborn.dust.peridot.name=Хризолитовая пыль
item.techreborn.dust.phosphorous.name=Фосфорная пыль
item.techreborn.dust.platinum.name=Платиновая пыль
item.techreborn.dust.potassiumFeldspar.name=Ортоклазовая пыль
item.techreborn.dust.pyrite.name=Пиритовая пыль
item.techreborn.dust.pyrope.name=Пироповая пыль
item.techreborn.dust.red_garnet.name=Пыль красного граната
item.techreborn.dust.ruby.name=Рубиновая пыль
item.techreborn.dust.saltpeter.name=Селитровая пыль
item.techreborn.dust.sapphire.name=Сапфировая пыль
item.techreborn.dust.silicon.name=Кремнивая пыль
item.techreborn.dust.silver.name=Серебреная пыль
item.techreborn.dust.sodalite.name=Содалитовая пыль
item.techreborn.dust.spessartine.name=Спессартиновая пыль
item.techreborn.dust.sphalerite.name=Сфалеритовая пыль
item.techreborn.dust.steel.name=Стальная пыль
item.techreborn.dust.sulfur.name=Серная пыль
item.techreborn.dust.tellurium.name=Теллуровая пыль
item.techreborn.dust.teslatite.name=Теслатитовая пыль
item.techreborn.dust.tetrahedrite.name=Тетраэдритовая пыль
item.techreborn.dust.tin.name=Оловянная пыль
item.techreborn.dust.titanium.name=Титановая пыль
item.techreborn.dust.tungsten.name=Вольфрамовая пыль
item.techreborn.dust.uvarovite.name=Уваровитовая пыль
item.techreborn.dust.vinteum.name=Винтеумная пыль
item.techreborn.dust.voidstone.name=Пыль камня пустоты
item.techreborn.dust.yellow_garnet.name=пыль жёлтого граната
item.techreborn.dust.zinc.name=Цинковая пыль
item.techreborn.dust.galena.name=Галенитовая пыль
item.techreborn.dust.saw_dust.name=Опилки
item.techreborn.dust.olivine.name=Оливиновая пыль
item.techreborn.dust.andesite.name=Андезитовая пыль
item.techreborn.dust.diorite.name=Диоритовая пыль
item.techreborn.dust.granite.name=Гранитовая пыль
item.techreborn.wrench.name=Гаечный ключ
tile.techreborn:cable.copper.name=Медный кабель
tile.techreborn:cable.tin.name=Оловянный кабель
tile.techreborn:cable.gold.name=Золотой кабель
tile.techreborn:cable.hv.name=Кабель высокого напряжения
tile.techreborn:cable.glassfiber.name=Оптоволоконный кабель
tile.techreborn:cable.insulatedcopper.name=Изолированный медный кабель
tile.techreborn:cable.insulatedgold.name=Изолированный золотая кабель
tile.techreborn:cable.insulatedhv.name=Изолированный кабель высокого напряжения
item.techreborn.scrapbox.name=Коробка утильсырья
item.techreborn.part.carbon_mesh.name=Углеродная ткань
item.techreborn.part.carbon_fiber.name=Углеродное волокно
#Small Dusts
item.techreborn.dustsmall.almandine.name=Маленькая кучка Алмадиновой пыли
item.techreborn.dustsmall.aluminumBrass.name=Маленькая кучка Алюминиево-латунной пыли
item.techreborn.dustsmall.aluminum.name=Маленькая кучка Алюминиевой пыли
item.techreborn.dustsmall.alumite.name=Маленькая кучка Алюмитовой пыли
item.techreborn.dustsmall.andradite.name=Маленькая кучка Андрадитовой пыли
item.techreborn.dustsmall.antimony.name=Маленькая кучка Сурьмяновой пыли
item.techreborn.dustsmall.ardite.name=Маленькая кучка Ардитовой пыли
item.techreborn.dustsmall.ashes.name=Маленькая кучка Пепла
item.techreborn.dustsmall.basalt.name=Маленькая кучка Базальтовой пыли
item.techreborn.dustsmall.bauxite.name=Маленькая кучка Бокситовой пыли
item.techreborn.dustsmall.biotite.name=Маленькая кучка Биотитовой пыли
item.techreborn.dustsmall.brass.name=Маленькая кучка Латунной пыли
item.techreborn.dustsmall.bronze.name=Маленькая кучка Бронзовой пыли
item.techreborn.dustsmall.cadmium.name=Маленькая кучка Кадмиевой пыли
item.techreborn.dustsmall.calcite.name=Маленькая кучка Кальцитовой пыли
item.techreborn.dustsmall.charcoal.name=Маленькая кучка Древесноугольной пыли
item.techreborn.dustsmall.chrome.name=Маленькая кучка Хромовой пыли
item.techreborn.dustsmall.cinnabar.name=Маленькая кучка Киноварной пыли
item.techreborn.dustsmall.clay.name=Маленькая кучка Глиняной пыли
item.techreborn.dustsmall.coal.name=Маленькая кучка Угольной пыли
item.techreborn.dustsmall.cobalt.name=Маленькая кучка Кобальтовой пыли
item.techreborn.dustsmall.copper.name=Маленькая кучка Медной пыли
item.techreborn.dustsmall.cupronickel.name=Маленькая кучка Купроникелевой пыли
item.techreborn.dustsmall.dark_ashes.name=Маленькая кучка Тёмной пыли
item.techreborn.dustsmall.darkIron.name=Маленькая кучка пыли Темного железа
item.techreborn.dustsmall.diamond.name=Маленькая кучка Алмазной пыли
item.techreborn.dustsmall.electrum.name=Маленькая кучка Электрумовой пыли
item.techreborn.dustsmall.emerald.name=Маленькая кучка Изумрудной пыли
item.techreborn.dustsmall.ender_eye.name=Маленькая кучка пыли глаза Края
item.techreborn.dustsmall.ender_pearl.name=Маленькая кучка пыли жемчуга Края
item.techreborn.dustsmall.endstone.name=Маленькая кучка пыли из камня Края
item.techreborn.dustsmall.flint.name=Маленькая кучка Кременевой пыли
item.techreborn.dustsmall.gold.name=Маленькая кучка Золотой пыли
item.techreborn.dustsmall.graphite.name=Маленькая кучка Графитовой пыли
item.techreborn.dustsmall.grossular.name=Маленькая кучка Гроссуляровой пыли
item.techreborn.dustsmall.indium.name=Маленькая кучка Индиевой пыли
item.techreborn.dustsmall.invar.name=Маленькая кучка Инваровой пыли
item.techreborn.dustsmall.iridium.name=Маленькая кучка Иридиевой пыли
item.techreborn.dustsmall.iron.name=Маленькая кучка Железной пыли
item.techreborn.dustsmall.lazurite.name=Маленькая кучка Лазуритовой пыли
item.techreborn.dustsmall.lead.name=Маленькая кучка Свинцовой пыли
item.techreborn.dustsmall.magnesium.name=Маленькая кучка Магниевой пыли
item.techreborn.dustsmall.manganese.name=Маленькая кучка Марганцовой пыли
item.techreborn.dustsmall.marble.name=Маленькая кучка Мраморной пыли
item.techreborn.dustsmall.netherrack.name=Маленькая кучка Пыли адского камня
item.techreborn.dustsmall.nickel.name=Маленькая кучка Никелевой пыли
item.techreborn.dustsmall.obsidian.name=Маленькая кучка Обсидиановой пыли
item.techreborn.dustsmall.osmium.name=Маленькая кучка Осмиевой пыли
item.techreborn.dustsmall.peridot.name=Маленькая кучка Хризолитовой пыли
item.techreborn.dustsmall.phosphorous.name=Маленькая кучка Фосфорной пыли
item.techreborn.dustsmall.platinum.name=Маленькая кучка Платиновой пыли
item.techreborn.dustsmall.potassiumFeldspar.name=Маленькая кучка Ортоклазовой пыли
item.techreborn.dustsmall.pyrite.name=Маленькая кучка Пиритовой пыли
item.techreborn.dustsmall.pyrope.name=Маленькая кучка Пироповой пыли
item.techreborn.dustsmall.red_garnet.name=Маленькая кучка Пыли красного граната
item.techreborn.dustsmall.ruby.name=Маленькая кучка Рубиновой пыли
item.techreborn.dustsmall.saltpeter.name=Маленькая кучка Селитровой пыли
item.techreborn.dustsmall.sapphire.name=Маленькая кучка Сапфировой пыли
item.techreborn.dustsmall.silicon.name=Маленькая кучка Кремнивой пыли
item.techreborn.dustsmall.silver.name=Маленькая кучка Серебреной пыли
item.techreborn.dustsmall.sodalite.name=Маленькая кучка Содалитовой пыли
item.techreborn.dustsmall.spessartine.name=Маленькая кучка Спессартиновой пыли
item.techreborn.dustsmall.sphalerite.name=Маленькая кучка Сфалеритовой пыли
item.techreborn.dustsmall.steel.name=Маленькая кучка Стальной пыли
item.techreborn.dustsmall.sulfur.name=Маленькая кучка Серной пыли
item.techreborn.dustsmall.tellurium.name=Маленькая кучка Теллуровой пыли
item.techreborn.dustsmall.teslatite.name=Маленькая кучка Теслатитовой пыли
item.techreborn.dustsmall.tetrahedrite.name=Маленькая кучка Тетраэдритовой пыли
item.techreborn.dustsmall.tin.name=Маленькая кучка Оловянной пыли
item.techreborn.dustsmall.titanium.name=Маленькая кучка Титановой пыли
item.techreborn.dustsmall.tungsten.name=Маленькая кучка Вольфрамовой пыли
item.techreborn.dustsmall.uvarovite.name=Маленькая кучка Уваровитовой пыли
item.techreborn.dustsmall.vinteum.name=Маленькая кучка Винтеумной пыли
item.techreborn.dustsmall.voidstone.name=Маленькая кучка Пыли камня пустоты
item.techreborn.dustsmall.yellow_garnet.name=Маленькая кучка Пыли жёлтого граната
item.techreborn.dustsmall.zinc.name=Маленькая кучка Цинковой пыли
item.techreborn.dustsmall.galena.name=Маленькая кучка Галенитовой пыли
item.techreborn.dustsmall.saw_dust.name=Маленькая кучка Опилок
item.techreborn.dustsmall.olivine.name=Маленькая кучка Оливиновой пыли
item.techreborn.dustsmall.andesite.name=Маленькая кучка Андезитовой пыли
item.techreborn.dustsmall.diorite.name=Маленькая кучка Диоритовой пыли
item.techreborn.dustsmall.granite.name=Маленькая кучка Гранитовой пыли
item.techreborn.cell.name=Пустая капсула
item.techreborn.rebattery.name=Аккумулятор
item.techreborn.lithiumBattery.name=Литиевый аккумулятор
item.techreborn.energyCrystal.name=Энергетический кристалл
item.techreborn.lapotronCrystal.name=Лазуротроновый кристалл
item.techreborn.treetap.name=Краник
item.techreborn.nanosaber.name=Наносабля
item.techreborn.upgrade.overclock.name=Улучшение «Ускоритель»
item.techreborn.upgrade.transformer.name=Улучшение «Трансформатор»
item.techreborn.upgrade.energy_storage.name=Улучшение «Энергохранитель»
item.techreborn.upgrade.ejection.name=Улучшение «Инъектор»
item.techreborn.upgrade.injection.name=Улучшение «Инжектор»
item.techreborn.electric_treetap.name=Электрокраник
#Gems
item.techreborn.gem.ruby.name=Рубин
item.techreborn.gem.sapphire.name=Сапфир
item.techreborn.gem.peridot.name=Хризолит
item.techreborn.gem.red_garnet.name=Красный гранат
item.techreborn.gem.yellow_garnet.name=Жёлтый гранат
#Ingots
item.techreborn.ingot.aluminum.name=Алюминиевый слиток
item.techreborn.ingot.brass.name=Латунный слиток
item.techreborn.ingot.bronze.name=Бронзовый слиток
item.techreborn.ingot.chrome.name=Хромовый слиток
item.techreborn.ingot.copper.name=Медный слиток
item.techreborn.ingot.electrum.name=Электрумовый слиток
item.techreborn.ingot.invar.name=Инваровый слиток
item.techreborn.ingot.iridium.name=Иридиевый слиток
item.techreborn.ingot.lead.name=Свинцовый слиток
item.techreborn.ingot.nickel.name=Никилиевый слиток
item.techreborn.ingot.platinum.name=Платиновый слиток
item.techreborn.ingot.silver.name=Серебряный слиток
item.techreborn.ingot.steel.name=Стальный слиток
item.techreborn.ingot.tin.name=Оловянный слиток
item.techreborn.ingot.titanium.name=Титановый слиток
item.techreborn.ingot.tungsten.name=Вольфрамовый слиток
item.techreborn.ingot.hot_tungstensteel.name=Горячий слиток из вольфрамовой стали
item.techreborn.ingot.tungstensteel.name=Слиток из вольфрамовой стали
item.techreborn.ingot.zinc.name=Цинковый слиток
item.techreborn.ingot.advanced_alloy.name=Слиток продвинутого сплава
item.techreborn.ingot.mixed_metal.name=Смешанный металлический слиток
item.techreborn.ingot.iridium_alloy.name=Слиток иридиевого сплава
item.techreborn.ingot.refined_iron.name=Слиток обработанного железа
#Nuggets
item.techreborn.nuggets.aluminum.name=Алюминиевый самородок
item.techreborn.nuggets.antimony.name=Сурьмяной самородок
item.techreborn.nuggets.brass.name=Латунный самородок
item.techreborn.nuggets.bronze.name=Бронзовый самородок
item.techreborn.nuggets.chrome.name=Хромовый самородок
item.techreborn.nuggets.copper.name=Медный самородок
item.techreborn.nuggets.electrum.name=Электрумовый самородок
item.techreborn.nuggets.invar.name=Инваровый самородок
item.techreborn.nuggets.iridium.name=Иридиевый самородок
item.techreborn.nuggets.iron.name=Железный самородок
item.techreborn.nuggets.lead.name=Свинцовый самородок
item.techreborn.nuggets.nickel.name=Никелевый самородок
item.techreborn.nuggets.osmium.name=Осмиевый самородок
item.techreborn.nuggets.platinum.name=Платиновый самородок
item.techreborn.nuggets.silver.name=Серебряный самородок
item.techreborn.nuggets.steel.name=Стальная самородок
item.techreborn.nuggets.tin.name=Оловянный самородок
item.techreborn.nuggets.titanium.name=Титановый самородок
item.techreborn.nuggets.tungsten.name=Вольфрамовый самородок
item.techreborn.nuggets.tungstensteel.name=Самородок из вольфрамовой стали
item.techreborn.nuggets.hot_tungstensteel.name=Горячий самородок из вольфрамовой стали
item.techreborn.nuggets.zinc.name=Цинковый самородок
item.techreborn.nuggets.refined_iron.name=Самородок из переработанного железа
item.techreborn.nuggets.diamond.name=Алмазный самородок
#Plates
item.techreborn.plate.aluminum.name=Алюминиевая пластина
item.techreborn.plate.brass.name=Латунная пластина
item.techreborn.plate.bronze.name=Бронзовая пластина
item.techreborn.plate.carbon.name=Карбоновая пластина
item.techreborn.plate.coal.name=Угольная пластина
item.techreborn.plate.chrome.name=Хромовая пластина
item.techreborn.plate.copper.name=Медная пластина
item.techreborn.plate.diamond.name=Алмазная пластина
item.techreborn.plate.electrum.name=Электрумовая пластина
item.techreborn.plate.emerald.name=Изумрудная пластина
item.techreborn.plate.gold.name=Золотая пластина
item.techreborn.plate.invar.name=Инваровая пластина
item.techreborn.plate.iridium.name=Иридиумовая пластина
item.techreborn.plate.iron.name=Железная пластина
item.techreborn.plate.lapis.name=Лазуритная пластина
item.techreborn.plate.lead.name=Свинцовая пластина
item.techreborn.plate.nickel.name=Никелевая пластина
item.techreborn.plate.obsidian.name=Обсидиановая пластина
item.techreborn.plate.peridot.name=Перидитовая пластина
item.techreborn.plate.platinum.name=Платиновая пластина
item.techreborn.plate.red_garnet.name=Пластина из красного граната
item.techreborn.plate.redstone.name=Редстоуновая пластина
item.techreborn.plate.ruby.name=Рубиновая пластина
item.techreborn.plate.sapphire.name=Сапфировая пластина
item.techreborn.plate.silicon.name=Кремниевая пластина
item.techreborn.plate.silver.name=Серебряная пластина
item.techreborn.plate.steel.name=Стальная пластина
item.techreborn.plate.teslatite.name=Теслатитовая пластина
item.techreborn.plate.tin.name=Оловянная пластина
item.techreborn.plate.titanium.name=Титановая пластина
item.techreborn.plate.tungsten.name=Вольфрамовая пластина
item.techreborn.plate.hot_tungstensteel.name=Горячая вольфрамово-стальная пластина
item.techreborn.plate.tungstensteel.name=Вольфрамово-стальная пластина
item.techreborn.plate.yellow_garnet.name=Пластина из желтого граната
item.techreborn.plate.zinc.name=Цинковая пластина
item.techreborn.plate.refined_iron.name=Пластина из переработанного железа
item.techreborn.plate.wood.name=Деревянная пластина
item.techreborn.plate.advanced_alloy.name=Продвинутый сплав
item.techreborn.plate.lazurite.name=Лазуритовая пластина
item.techreborn.plate.magnalium.name=Магналиевая пластина
item.techreborn.plate.iridium_alloy.name=Пластина иридиевого сплава
#Parts
item.techreborn.part.energy_flow_circuit.name=Микросхема потока энергии
item.techreborn.part.data_control_circuit.name=Микросхема контролирования данных
item.techreborn.part.data_orb.name=Сфера данных
item.techreborn.part.data_storage_circuit.name=Микросхема хранения данных
item.techreborn.part.diamond_grinding_head.name=Алмазная шлифовальная головка
item.techreborn.part.diamond_saw_blade.name=Алмазное лезвие пилы
item.techreborn.part.tungsten_grinding_head.name=Вольфрамовая шлифовальная головка
item.techreborn.part.helium_coolant_simple.name=60k Гелиевая охлаждающая ячейка
item.techreborn.part.helium_coolant_triple.name=180k Гелиевая охлаждающая ячейка
item.techreborn.part.helium_coolant_six.name=360k Гелиевая охлаждающая ячейка
item.techreborn.part.nak_coolant_simple.name=60k NaK охлаждающая ячейка
item.techreborn.part.nak_coolant_triple.name=180k NaK охлаждающая ячейка
item.techreborn.part.nak_coolant_six.name=360k NaK охлаждающая ячейка
item.techreborn.part.cupronickel_heating_coil.name=Купроникелевая нагревающая катушка
item.techreborn.part.nichrome_heating_coil.name=Нихромовая нагревающая катушка
item.techreborn.part.kanthal_heating_coil.name=Канталовая нагревающая катушка
item.techreborn.part.super_conductor.name=Сверхпроводник
item.techreborn.part.thorium_cell.name=Топливный стержень (Торий)
item.techreborn.part.double_thorium_cell.name=Двойной Топливный стержень (Торий)
item.techreborn.part.quad_thorium_cell.name=Учетверенный Топливный стержень (Торий)
item.techreborn.part.plutonium_cell.name=Топливный стержень (Плутоний)
item.techreborn.part.double_plutonium_cell.name=Двойной Топливный стержень (Плутоний)
item.techreborn.part.quad_plutonium_cell.name=Учетверенный Топливный стержень (Плутоний)
item.techreborn.part.iridium_neutron_reflector.name=Иридиевый отражатель нейтронов
item.techreborn.part.computer_monitor.name=Монитор компьютера
item.techreborn.part.machine_parts.name=Части машины
item.techreborn.part.neutron_reflector.name=Нейтронный отражатель
item.techreborn.part.thick_neutron_reflector.name=Толстый нейтронный отражатель
item.techreborn.part.sap.name=Каучук
item.techreborn.part.rubber.name=Резина
item.techreborn.part.scrap.name=Утильсырье
item.techreborn.part.electronic_circuit.name=Электронная схема
item.techreborn.part.advanced_circuit.name=Продвинутая Электронная схема
item.techreborn.part.coolant_simple.name=10k Охлаждающая ячейка
item.techreborn.part.coolant_triple.name=30k Охлаждающая ячейка
item.techreborn.part.coolant_six.name=60k Охлаждающая ячейка
item.techreborn.frequencyTransmitter.name=Частотный преобразователь
#Tools
item.techreborn.rockcutter.name=Резак
item.techreborn.lithiumbatpack.name=Литий-Батпак
item.techreborn.lapotronpack.name=Лапотронный пак
item.techreborn.omniTool.name=Мульти-инструмент
item.techreborn.ironDrill.name=Стальной бур
item.techreborn.diamondDrill.name=Алмазный бур
item.techreborn.advancedDrill.name=Продвинутый бур
item.techreborn.ironChainsaw.name=Стальная электропила
item.techreborn.diamondChainsaw.name=Алмазная электропила
item.techreborn.advancedChainsaw.name=Продвинутая электропила
item.techreborn.lapotronicorb.name=Лапотронный энергитический шар
item.techreborn.cloakingdevice.name=Устройство маскировки
item.techreborn.steelJackhammer.name=Стальной молот
item.techreborn.diamondJackhammer.name=Алмазный молот
item.techreborn.advancedJackhammer.name=Продвинутый молот
item.bronzeSword.name=Бронзовый меч
item.bronzePickaxe.name=Бронзовая кирка
item.bronzeSpade.name=Бронзовая лопата
item.bronzeAxe.name=Бронзовый топор
item.bronzeHoe.name=Бронзовая мотыга
item.bronzeHelmet.name=Бронзовый шлем
item.bronzeChestplate.name=Бронзовый нагрудник
item.bronzeLeggings.name=Бронзовые штаны
item.bronzeBoots.name=Бронзовые ботинки
item.rubySword.name=Рубиновый меч
item.rubyPickaxe.name=Рубиновая кирка
item.rubySpade.name=Рубиновая лопата
item.rubyAxe.name=Рубиновый топор
item.rubyHoe.name=Рубиновая кирка
item.rubyHelmet.name=Рубиновый шлем
item.rubyChestplate.name=Рубиновый нагрудник
item.rubyLeggings.name=Рубиновые штаны
item.rubyBoots.name=Рубиновые сапоги
item.sapphireSword.name=Меч из Сапфира
item.sapphirePickaxe.name=Кирка из Сапфира
item.sapphireSpade.name=Лопата из Сапфира
item.sapphireAxe.name=Топор из Сапфира
item.sapphireHoe.name=Мотыга из Сапфира
item.sapphireHelmet.name=Шлем из Сапфира
item.sapphireChestplate.name=Нагрудник из Сапфира
item.sapphireLeggings.name=Штаны из Сапфира
item.sapphireBoots.name=Сапоги из Сапфира
item.peridotSword.name=Меч из перидота
item.peridotPickaxe.name=Кирка из перидота
item.peridotSpade.name=Лопата из перидота
item.peridotAxe.name=Топор из перидота
item.peridotHoe.name=Мотыга из перидота
item.peridotHelmet.name=Шлем из перидота
item.peridotChestplate.name=Нагрудник из перидота
item.peridotLeggings.name=Штаны из перидота
item.peridotBoots.name=Сапоги из перидота
#Fluid
fluid.fluidberylium=Бериллий
fluid.fluidcalcium=Кальций
fluid.fluidcalciumcarbonate=Карбонат кальция
fluid.fluidcarbon=Карбон
fluid.fluidcarbonfiber=Углеродное волокно
fluid.fluidchlorite=Хлорит
fluid.fluiddeuterium=Дейтерий
fluid.fluiddiesel=Дизель
fluid.fluidglyceryl=Глицерил
fluid.fluidhelium=Гелий
fluid.fluidhelium3=Гелий-3
fluid.fluidheliumplasma=Гелиевая плазма
fluid.fluidhydrogen=Водород
fluid.fluidlithium=Литий
fluid.fluidmercury=Ртуть
fluid.fluidmethane=Метан
fluid.fluidnitrocarbon=Нитрокарбон
fluid.fluidnitrocoalfuel=Нитроугольное топливо
fluid.fluidnitrodiesel=Нитродизель
fluid.fluidnitrofuel=Нитротопливо
fluid.fluidnitrogen=Нитроген
fluid.fluidnitrogendioxide=Нитрогеноксид
fluid.fluidoil=Нефть
fluid.fluidpotassium=Калий
fluid.fluidsilicon=Кремний
fluid.fluidsodium=Натрий
fluid.fluidsodiumSulfide=Сульфид натрия
fluid.fluidSulfur=Сера
fluid.fluidsulfuricacid=Серная кислота
fluid.fluidcompressedair=Сжатый воздух
fluid.fluidelectrolyzedwater=Электризованная вода
fluid.fluidsodiumpersulfate=Персульфат натрия
fluid.fluidtritium=Тритий
fluid.fluidwolframium=Вольфрам
#Items
item.techreborn.uuMatter.name=Материя
item.techreborn.manual.name=Техническое руководство
item.techreborn.debug.name=Инструмент отладки
#Message
techreborn.message.missingmultiblock=Мультиблочная структура не закончена
techreborn.message.setTo=Set to
techreborn.message.in=in
techreborn.message.noCoordsSet=Координаты не установлены
techreborn.message.coordsHaveBeen=Координаты были
techreborn.message.cleared=Очищены
techreborn.message.detects=Обнаружены
techreborn.message.allPlayers=Все игроки
techreborn.message.onlyOtherPlayers=Только другие игроки
techreborn.message.onlyYou=Только Вы
techreborn.message.nanosaberActive=Включена
techreborn.message.nanosaberActivate=Активация
techreborn.message.nanosaberDeactivating=Деактивация
techreborn.message.nanosaberInactive=Выключена
techreborn.message.nanosaberEnergyErrorTo=Недостаточно энергии для
techreborn.message.nanosaberEnergyError=Недостаточно энергии:
#Cables
Cable.copperCable.name=Медный кабель
Cable.insulatedCopperCable.name=Изолированный медный кабель
Cable.goldCable.name=Золотой кабель
Cable.insulatedGoldCable.name=Изолированный золотой кабель
Cable.doubleInsulatedGoldCable.name=Золотой кабель двойной изоляции
Cable.ironCable.name=Железный кабель
Cable.copperCable.name=Медный кабель
Cable.insulatedIronCable.name=Изолированный железный кабель
Cable.doubleInsulatedIronCable.name=Железный кабель двойной изоляции
Cable.trippleInsulatedIronCable.name=Железный кабель тройной изоляции
Cable.glassFiberCable.name=Стекловолоконный кабель
Cable.tinCable.name=Оловянный кабель
desc.uninsulatedCable=Наносит урон существам!
desc.transfer=Трансфер еЭ:
desc.tier=Уровень:
keys.techreborn.category=Раздел TechReborn
keys.techreborn.config=Config
# JEI Integration
techreborn.jei.recipe.start.cost=Начало: %sеЭ
techreborn.jei.recipe.running.cost=еЭ/т: %s
techreborn.jei.recipe.processing.time.1=Время: %s тиков
techreborn.jei.recipe.processing.time.2=(%s сек.)
jei.techreborn.scrapbox.name=Открытие коробок с утильсырьем
techreborn.desc.rubberSap=Чтобы добыть каучук, нужно найти специальное дерево - гевею, или же раздобыть ее саженец и вырастить у себя. После того, как у вас появится гевея, поищите на ней небольшие желтые пятна. Если никаких пятен не видно, просто подождите некоторое время, пока они не появятся. Чтобы собрать каучук, используйте на пятнышке краник.
techreborn.desc.scrapBox=Коробки с утильсырьем можно как открывать вручную, так и помещать в раздатчики, чтобы выпадала рандомная вещь! Класс!
techreborn.desc.scrapBoxNoDispenser=Открыть ящик с утильсырьем можно просто кликнув правую кнопку мыши!
techreborn.jei.category.alloy.furnace=Плавильная печь
techreborn.jei.category.generator.gas=Газовый генератор
techreborn.jei.category.generator.semifluid=Полужидкостный генератор
techreborn.jei.category.generator.diesel=Дизельный генератор
techreborn.jei.category.generator.thermal=Тепловая генератор
techreborn.jei.category.generator.plasma=Плазменный генератор
#Death Messages
death.attack.shock=%s был просто шокирован! (умер от удара током)
#Entitys
entity.nuke.name=Nuke
#Tooltips
tooltip.wip=WIP Coming Soon
tooltip.upBroken=Upgrades DO NOT function!
tooltip.ingredient=В данный момент - только компонент для крафтов
#Advancements
advancements.techreborn.root.desc=Ну что, пора искать каучук! Неплохо было бы обзавестись краником.
advancements.techreborn.treetap=Краник
advancements.techreborn.treetap.desc=Теперь, когда Вы скрафтили краник, пора бы найти гевею, чтобы собрать немного каучука.
advancements.techreborn.sap=Каучук
advancements.techreborn.sap.desc=Шикарно, у вас теперь есть каучук. У Вас не появилось желания положить его в разогретую печку?

View file

@ -0,0 +1 @@
If you want to help out with translations please vist: https://translate.techreborn.ovh/

View file

@ -1,722 +0,0 @@
item.missingRecipe.name=Missing Recipe Placeholder
itemGroup.techreborn=科技复兴
#machines
tile.techreborn:pump.name=泵
tile.techreborn:gas_turbine.name=燃气轮机
tile.techreborn:industrial_block.name=工业
tile.techreborn:thermal_generator.name=热敏发电机
tile.techreborn:quantum_tank.name=量子缸
tile.techreborn:quantum_chest.name=量子箱
tile.techreborn:digital_chest.name=数码箱
tile.techreborn:industrial_centrifuge.name=工业离心机
tile.techreborn:rolling_machine.name=辊压机
tile.techreborn:machine_casing.standard.name=基础机械外壳
tile.techreborn:machine_casing.reinforced.name=进阶机械外壳
tile.techreborn:machine_casing.advanced.name=高级机械外壳
tile.techreborn:industrial_blast_furnace.name=工业高炉
tile.techreborn:alloy_smelter.name=合金炉
tile.techreborn:matter_fabricator.name=物质机
tile.techreborn:implosion_compressor.name=聚爆压缩机
tile.techreborn:industrial_grinder.name=工业磨粉机
tile.techreborn:chunk_loader.name=区块加载器
tile.techreborn:magic_energy_converter.name=魔法能源转化器
tile.techreborn:diesel_generator.name=柴油发电机
tile.techreborn:heat_generator.name=加热器
tile.techreborn:industrial_electrolyzer.name=工业电解器
tile.techreborn:magic_energy_absorber.name=魔法能源吸收器
tile.techreborn:assembly_machine.name=装配机
tile.techreborn:semi_fluid_generator.name=半流质发电机
tile.techreborn:iron_alloy_furnace.name=铁质合金炉
tile.techreborn:chemical_reactor.name=化学反应器
tile.techreborn:dragon_egg_syphon.name=龙蛋能源吸取器
tile.techreborn:interdimensional_su.name=IDSU
tile.techreborn:adjustable_su.name=AESU
tile.techreborn:lapotronic_su.name=LESU控制器
tile.techreborn:lsu_storage.name=LESU存储器
tile.techreborn:distillation_tower.name=蒸馏塔
tile.techreborn:electric_crafting_table.name=电动工作台
tile.techreborn:vacuum_freezer.name=真空冷凝器
tile.techreborn:plasma_generator.name=等离子体发电机
tile.techreborn:fusion_control_computer.name=聚变控制计算机
tile.techreborn:computer_cube.name=电脑主机
tile.techreborn:fusion_coil.name=核聚变线圈
tile.techreborn:lightning_rod.name=避雷针
tile.techreborn:industrial_sawmill.name=锯木机
tile.techreborn:charge_o_mat.name=充能台
tile.techreborn:player_detector.all.name=玩家检测器(全局)
tile.techreborn:player_detector.others.name=玩家检测器(局部)
tile.techreborn:player_detector.you.name=玩家检测器(私有)
tile.techreborn:solid_fuel_generator.name=火力发电机
tile.techreborn:extractor.name=提取机
tile.techreborn:grinder.name=磨粉机
tile.techreborn:compressor.name=压缩机
tile.techreborn:electric_furnace.name=电炉
tile.techreborn:machine_frame.highly_advanced.name=高级机械框架
tile.techreborn:machine_frame.advanced.name=进阶机械框架
tile.techreborn:machine_frame.basic.name=基础机械框架
tile.techreborn:ore2.copper.name=铜矿石
tile.techreborn:ore2.tin.name=锡矿石
tile.techreborn:solar_panel.basic.name=基础太阳能电池板
tile.techreborn:solar_panel.hybrid.name=混合太阳能电池板
tile.techreborn:solar_panel.advanced.name=高级太阳能电池板
tile.techreborn:solar_panel.ultimate.name=终极太阳能电池板
tile.techreborn:solar_panel.quantum.name=量子太阳能电池板
tile.techreborn:creative_solar_panel.name=创造模式太阳能电池板
tile.techreborn:water_mill.name=水力发电机
tile.techreborn:wind_mill.name=风力发电机
tile.techreborn:iron_furnace.name=铁炉
tile.techreborn:recycler.name=回收机
tile.techreborn:scrapboxinator.name=废料拆包机
tile.techreborn:low_voltage_su.name=储电盒
tile.techreborn:medium_voltage_su.name=MFE
tile.techreborn:high_voltage_su.name=MFSU
tile.techreborn:reinforced_glass.name=防爆玻璃
tile.techreborn:nuke.name=核弹
tile.techreborn:lv_transformer.name=低压变压器
tile.techreborn:mv_transformer.name=中压变压器
tile.techreborn:hv_transformer.name=高压变压器
tile.techreborn:ev_transformer.name=超高压变压器
tile.techreborn:auto_crafting_table.name=自动工作台
tile.techreborn:fluid_replicator.name=流体复制机
#Blocks
tile.techreborn:rubber_log.name=橡胶木
tile.techreborn:rubber_planks.name=橡胶木板
tile.techreborn:rubber_plank_slab.name=橡胶木台阶
tile.techreborn:rubber_plank_stair.name=橡胶木楼梯
tile.techreborn:rubber_leaves.name=橡胶树叶
tile.techreborn:rubber_sapling.name=橡胶树苗
tile.techreborn:refined_iron_fence.name=铁栅栏
tile.techreborn:lamp_incandescent.name=白炽灯
tile.techreborn:lamp_led.name=LED灯
tile.techreborn:alarm.name=报警器
#Ores
tile.techreborn:ore.galena.name=方铅矿石
tile.techreborn:ore.iridium.name=铱矿石
tile.techreborn:ore.ruby.name=红宝石矿石
tile.techreborn:ore.sapphire.name=蓝宝石矿石
tile.techreborn:ore.bauxite.name=铝土矿石
tile.techreborn:ore.pyrite.name=黄铁矿石
tile.techreborn:ore.cinnabar.name=朱砂矿石
tile.techreborn:ore.sphalerite.name=闪锌矿石
tile.techreborn:ore.tungsten.name=钨矿石
tile.techreborn:ore.sheldonite.name=铂矿石
tile.techreborn:ore.peridot.name=橄榄石矿石
tile.techreborn:ore.sodalite.name=方钠石矿石
tile.techreborn:ore.tetrahedrite.name=黝铜矿石
tile.techreborn:ore.cassiterite.name=锡石矿石
tile.techreborn:ore.lead.name=铅矿石
tile.techreborn:ore.silver.name=银矿石
#Storage
tile.techreborn:storage.silver.name=银块
tile.techreborn:storage.aluminum.name=铝块
tile.techreborn:storage.titanium.name=钛块
tile.techreborn:storage.chrome.name=铬块
tile.techreborn:storage.steel.name=钢块
tile.techreborn:storage.brass.name=黄铜块
tile.techreborn:storage.lead.name=铅块
tile.techreborn:storage.electrum.name=琥珀金块
tile.techreborn:storage.zinc.name=锌块
tile.techreborn:storage.platinum.name=铂块
tile.techreborn:storage.tungsten.name=钨块
tile.techreborn:storage.nickel.name=镍块
tile.techreborn:storage.invar.name=殷钢块
tile.techreborn:storage.osmium.name=锇块
tile.techreborn:storage.iridium.name=铱块
tile.techreborn:storage.bronze.name=青铜块
tile.techreborn:storage2.tungstensteel.name=钨钢块
tile.techreborn:storage2.lodestone.name=磁石块
tile.techreborn:storage2.tellurium.name=碲块
tile.techreborn:storage2.iridium_reinforced_tungstensteel.name=强化铱钨钢混合块
tile.techreborn:storage2.iridium_reinforced_stone.name=铱强化石
tile.techreborn:storage2.ruby.name=红宝石块
tile.techreborn:storage2.sapphire.name=蓝宝石块
tile.techreborn:storage2.peridot.name=橄榄石块
tile.techreborn:storage2.yellow_garnet.name=黄色石榴石块
tile.techreborn:storage2.red_garnet.name=红色石榴石块
tile.techreborn:storage2.refined_iron.name=精炼铁块
tile.techreborn:storage2.copper.name=铜块
tile.techreborn:storage2.tin.name=锡块
tile.techreborn:farm.name=农场
#Fluids
tile.techreborn:berylium.name=液态铍
tile.techreborn:calcium.name=液态钙
tile.techreborn:calciumcarbonate.name=熔融碳酸钙
tile.techreborn:chlorite.name=亚氯酸盐
tile.techreborn:deuterium.name=氘
tile.techreborn:glyceryl.name=硝化甘油
tile.techreborn:helium.name=氦
tile.techreborn:helium3.name=氦-3
tile.techreborn:heliumplasma.name=等离子氦
tile.techreborn:hydrogen.name=氢
tile.techreborn:lithium.name=液态锂
tile.techreborn:mercury.name=汞
tile.techreborn:methane.name=甲烷
tile.techreborn:nitrocoalfuel.name=硝基煤油
tile.techreborn:nitrofuel.name=硝基燃油
tile.techreborn:nitrogen.name=氮
tile.techreborn:nitrogendioxide.name=二氧化氮
tile.techreborn:potassium.name=液态钾
tile.techreborn:silicon.name=液态硅
tile.techreborn:sodium.name=液态钠
tile.techreborn:sodiumpersulfate.name=过硫酸钠
tile.techreborn:tritium.name=氚
tile.techreborn:wolframium.name=液态钨
tile.techreborn:compressedair.name=压缩空气
tile.techreborn:electrolyzedwater.name=电解水
tile.techreborn:supercondensator.name=超级电容
fluid.fluid.fluidberylium=铍
fluid.fluid.fluidcalcium=钙
fluid.fluid.fluidcalciumcarbonate=碳酸钙
fluid.fluid.fluidchlorite=亚氯酸盐
fluid.fluid.fluiddeuterium=氘
fluid.fluid.fluidglyceryl=硝化甘油
fluid.fluid.fluidhelium=氦
fluid.fluid.fluidhelium3=氦-3
fluid.fluid.fluidheliumplasma=等离子氦
fluid.fluid.fluidhydrogen=氢
fluid.fluid.fluidlithium=锂
fluid.fluid.fluidmercury=汞
fluid.fluid.fluidmethane=甲烷
fluid.fluid.fluidnitrocoalfuel=硝基煤燃料
fluid.fluid.fluidnitrofuel=硝基燃油
fluid.fluid.fluidnitrogen=氮
fluid.fluid.fluidnitrogendioxide=二氧化氮
fluid.fluid.fluidpotassium=钾
fluid.fluid.fluidsilicon=硅
fluid.fluid.fluidsodium=钠
fluid.fluid.fluidsodiumpersulfate=过硫酸钠
fluid.fluid.fluidtritium=氚
fluid.fluid.fluidwolframium=钨
fluid.fluid.electrolyzedwater=硝化甘油
fluid.fluid.compresseair=压缩空气
fluid.tile.techreborn:glyceryl=甘油基
fluid.tile.techreborn:berylium=铍
fluid.tile.techreborn:chlorite=绿泥石
fluid.tile.techreborn:helium3=氦-3
fluid.tile.techreborn:deuterium=氘
fluid.tile.techreborn:helium=氦
fluid.tile.techreborn:calciumcarbonate=碳酸钙
fluid.titanium.name=熔融钛
fluid.chrome.name=熔融铬
fluid.platinum.name=熔融铂
fluid.iridium.name=熔融铱
fluid.invar.name=熔融殷钢
fluid.tungsten.name=熔融钨
#Dusts
item.techreborn.dust.almandine.name=铁铝榴石粉
item.techreborn.dust.aluminumBrass.name=铝黄铜粉
item.techreborn.dust.aluminum.name=铝粉
item.techreborn.dust.alumite.name=耐酸铝粉
item.techreborn.dust.andradite.name=钙铁榴石粉
item.techreborn.dust.antimony.name=锑粉
item.techreborn.dust.ardite.name=阿迪特粉
item.techreborn.dust.ashes.name=灰烬
item.techreborn.dust.basalt.name=玄武岩粉
item.techreborn.dust.bauxite.name=铝土矿粉
item.techreborn.dust.biotite.name=黑云母粉
item.techreborn.dust.brass.name=黄铜粉
item.techreborn.dust.bronze.name=青铜粉
item.techreborn.dust.cadmium.name=镉粉
item.techreborn.dust.calcite.name=方解石粉
item.techreborn.dust.charcoal.name=木炭粉
item.techreborn.dust.chrome.name=铬粉
item.techreborn.dust.cinnabar.name=朱砂粉
item.techreborn.dust.clay.name=粘土粉
item.techreborn.dust.coal.name=煤粉
item.techreborn.dust.cobalt.name=钴粉
item.techreborn.dust.copper.name=铜粉
item.techreborn.dust.cupronickel.name=白铜粉
item.techreborn.dust.dark_ashes.name=黑色灰烬
item.techreborn.dust.darkIron.name=玄铁粉
item.techreborn.dust.diamond.name=钻石粉
item.techreborn.dust.electrum.name=琥珀金粉
item.techreborn.dust.emerald.name=绿宝石粉
item.techreborn.dust.ender_eye.name=末影之眼粉
item.techreborn.dust.ender_pearl.name=末影珍珠粉
item.techreborn.dust.endstone.name=末地石粉
item.techreborn.dust.flint.name=燧石粉
item.techreborn.dust.gold.name=金粉
item.techreborn.dust.graphite.name=石墨粉
item.techreborn.dust.grossular.name=钙铝榴石粉
item.techreborn.dust.indium.name=铟粉
item.techreborn.dust.invar.name=殷钢粉
item.techreborn.dust.iridium.name=铱粉
item.techreborn.dust.iron.name=铁粉
item.techreborn.dust.lazurite.name=青金石粉
item.techreborn.dust.lead.name=铅粉
item.techreborn.dust.magnesium.name=镁粉
item.techreborn.dust.manganese.name=锰粉
item.techreborn.dust.marble.name=大理石粉
item.techreborn.dust.netherrack.name=地狱岩粉
item.techreborn.dust.nickel.name=镍粉
item.techreborn.dust.obsidian.name=黑曜石粉
item.techreborn.dust.osmium.name=锇粉
item.techreborn.dust.peridot.name=橄榄石粉
item.techreborn.dust.phosphorous.name=磷粉
item.techreborn.dust.platinum.name=铂粉
item.techreborn.dust.potassiumFeldspar.name=钾长石粉
item.techreborn.dust.pyrite.name=黄铁矿粉
item.techreborn.dust.pyrope.name=镁铝榴石粉
item.techreborn.dust.red_garnet.name=红色石榴石粉
item.techreborn.dust.ruby.name=红宝石粉
item.techreborn.dust.saltpeter.name=硝石粉
item.techreborn.dust.sapphire.name=蓝宝石粉
item.techreborn.dust.silicon.name=硅粉
item.techreborn.dust.silver.name=银粉
item.techreborn.dust.sodalite.name=方钠石粉
item.techreborn.dust.spessartine.name=锰铝榴石粉
item.techreborn.dust.sphalerite.name=闪锌矿粉
item.techreborn.dust.steel.name=钢粉
item.techreborn.dust.sulfur.name=硫粉
item.techreborn.dust.tellurium.name=碲粉
item.techreborn.dust.teslatite.name=蓝石粉
item.techreborn.dust.tetrahedrite.name=黝铜矿粉
item.techreborn.dust.tin.name=锡粉
item.techreborn.dust.titanium.name=钛粉
item.techreborn.dust.tungsten.name=钨粉
item.techreborn.dust.uvarovite.name=钙铬榴石粉
item.techreborn.dust.vinteum.name=古蓝石粉
item.techreborn.dust.voidstone.name=虚空石粉
item.techreborn.dust.yellow_garnet.name=黄色石榴石粉
item.techreborn.dust.zinc.name=锌粉
item.techreborn.dust.galena.name=方铅矿粉
item.techreborn.dust.saw_dust.name=锯末
item.techreborn.dust.olivine.name=橄榄石粉
item.techreborn.dust.andesite.name=安山岩粉
item.techreborn.dust.diorite.name=闪长岩粉
item.techreborn.dust.granite.name=花岗岩粉
item.techreborn.wrench.name=扳手
tile.techreborn:cable.copper.name=铜质导线
tile.techreborn:cable.tin.name=锡质导线
tile.techreborn:cable.gold.name=金质导线
tile.techreborn:cable.hv.name=高压导线
tile.techreborn:cable.glassfiber.name=玻璃纤维导线
tile.techreborn:cable.insulatedcopper.name=绝缘铜质导线
tile.techreborn:cable.insulatedgold.name=绝缘金质导线
tile.techreborn:cable.insulatedhv.name=绝缘高压导线
item.techreborn.scrapbox.name=废料盒
item.techreborn.part.carbon_mesh.name=碳网
item.techreborn.part.carbon_fiber.name=碳纤维
#Small Dusts
item.techreborn.dustsmall.almandine.name=小堆铁铝榴石粉
item.techreborn.dustsmall.aluminum.name=小堆铝粉
item.techreborn.dustsmall.andradite.name=小堆钙铁榴石粉
item.techreborn.dustsmall.ashes.name=小堆灰烬
item.techreborn.dustsmall.basalt.name=小堆玄武岩粉
item.techreborn.dustsmall.bauxite.name=小堆铝土矿粉
item.techreborn.dustsmall.brass.name=小堆黄铜粉
item.techreborn.dustsmall.bronze.name=小堆青铜粉
item.techreborn.dustsmall.calcite.name=小堆方解石粉
item.techreborn.dustsmall.charcoal.name=小堆木炭粉
item.techreborn.dustsmall.chrome.name=小堆铬粉
item.techreborn.dustsmall.cinnabar.name=小堆朱砂粉
item.techreborn.dustsmall.clay.name=小堆粘土粉
item.techreborn.dustsmall.coal.name=小堆煤粉
item.techreborn.dustsmall.copper.name=小堆铜粉
item.techreborn.dustsmall.dark_ashes.name=小堆黑色灰烬
item.techreborn.dustsmall.diamond.name=小堆钻石粉
item.techreborn.dustsmall.electrum.name=小堆琥珀金粉
item.techreborn.dustsmall.emerald.name=小堆绿宝石粉
item.techreborn.dustsmall.ender_eye.name=小堆末影之眼粉
item.techreborn.dustsmall.ender_pearl.name=小堆末影珍珠粉
item.techreborn.dustsmall.endstone.name=小堆末地石粉
item.techreborn.dustsmall.flint.name=小堆燧石粉
item.techreborn.dustsmall.galena.name=小堆方铅矿粉
item.techreborn.dustsmall.glowstone.name=小堆萤石粉
item.techreborn.dustsmall.gold.name=小堆金粉
item.techreborn.dustsmall.grossular.name=小堆钙铝榴石粉
item.techreborn.dustsmall.invar.name=小堆殷钢粉
item.techreborn.dustsmall.iron.name=小堆铁粉
item.techreborn.dustsmall.lazurite.name=小堆青金石粉
item.techreborn.dustsmall.lead.name=小堆铅粉
item.techreborn.dustsmall.magnesium.name=小堆镁粉
item.techreborn.dustsmall.manganese.name=小堆锰粉
item.techreborn.dustsmall.marble.name=小堆大理石粉
item.techreborn.dustsmall.netherrack.name=小堆地狱岩粉
item.techreborn.dustsmall.nickel.name=小堆镍粉
item.techreborn.dustsmall.obsidian.name=小堆黑曜石粉
item.techreborn.dustsmall.peridot.name=小堆橄榄石粉
item.techreborn.dustsmall.phosphorous.name=小堆磷粉
item.techreborn.dustsmall.platinum.name=小堆铂粉
item.techreborn.dustsmall.pyrite.name=小堆黄铁矿粉
item.techreborn.dustsmall.pyrope.name=小堆镁铝榴石粉
item.techreborn.dustsmall.red_garnet.name=小堆红色石榴石粉
item.techreborn.dustsmall.redstone.name=小堆红石粉
item.techreborn.dustsmall.ruby.name=小堆红宝石粉
item.techreborn.dustsmall.saltpeter.name=小堆硝石粉
item.techreborn.dustsmall.sapphire.name=小堆蓝宝石粉
item.techreborn.dustsmall.saw_dust.name=小堆锯末
item.techreborn.dustsmall.silver.name=小堆银粉
item.techreborn.dustsmall.sodalite.name=小堆方钠石粉
item.techreborn.dustsmall.spessartine.name=小堆锰铝榴石粉
item.techreborn.dustsmall.sphalerite.name=小堆闪锌矿粉
item.techreborn.dustsmall.steel.name=小堆钢粉
item.techreborn.dustsmall.sulfur.name=小堆硫粉
item.techreborn.dustsmall.tin.name=小堆锡粉
item.techreborn.dustsmall.titanium.name=小堆钛粉
item.techreborn.dustsmall.tungsten.name=小堆钨粉
item.techreborn.dustsmall.uvarovite.name=小堆钙铬榴石粉
item.techreborn.dustsmall.voidstone.name=小堆虚空石粉
item.techreborn.dustsmall.yellow_garnet.name=小堆黄色石榴石粉
item.techreborn.dustsmall.zinc.name=小堆锌粉
item.techreborn.dustsmall.olivine.name=小堆橄榄石粉
item.techreborn.dustsmall.andesite.name=小堆安山岩粉
item.techreborn.dustsmall.diorite.name=小堆闪长岩粉
item.techreborn.dustsmall.granite.name=小堆花岗岩粉
item.techreborn.cell.name=空单元
item.techreborn.cell.fluid.name=$fluid$单元
item.techreborn.rebattery.name=充电电池
item.techreborn.lithiumBattery.name=锂电池
item.techreborn.energyCrystal.name=能量水晶
item.techreborn.lapotronCrystal.name=兰波顿水晶
item.techreborn.treetap.name=木龙头
item.techreborn.nanosaber.name=纳米剑
item.techreborn.upgrade.overclock.name=超频升级
item.techreborn.upgrade.transformer.name=高压升级
item.techreborn.upgrade.energy_storage.name=储能升级
item.techreborn.upgrade.ejection.name=弹出升级
item.techreborn.upgrade.injection.name=输入升级
item.techreborn.electric_treetap.name=电动树脂提取器
#Gems
item.techreborn.gem.ruby.name=红宝石
item.techreborn.gem.sapphire.name=蓝宝石
item.techreborn.gem.peridot.name=橄榄石
item.techreborn.gem.red_garnet.name=红色石榴石
item.techreborn.gem.yellow_garnet.name=黄色石榴石
#Ingots
item.techreborn.ingot.aluminum.name=铝锭
item.techreborn.ingot.brass.name=黄铜锭
item.techreborn.ingot.bronze.name=青铜锭
item.techreborn.ingot.chrome.name=铬锭
item.techreborn.ingot.copper.name=铜锭
item.techreborn.ingot.electrum.name=琥珀金锭
item.techreborn.ingot.invar.name=殷钢锭
item.techreborn.ingot.iridium.name=铱锭
item.techreborn.ingot.lead.name=铅锭
item.techreborn.ingot.nickel.name=镍锭
item.techreborn.ingot.platinum.name=铂锭
item.techreborn.ingot.silver.name=银锭
item.techreborn.ingot.steel.name=钢锭
item.techreborn.ingot.tin.name=锡锭
item.techreborn.ingot.titanium.name=钛锭
item.techreborn.ingot.tungsten.name=钨锭
item.techreborn.ingot.hot_tungstensteel.name=热钨钢锭
item.techreborn.ingot.tungstensteel.name=钨钢锭
item.techreborn.ingot.zinc.name=锌锭
item.techreborn.ingot.advanced_alloy.name=高级合金锭
item.techreborn.ingot.mixed_metal.name=合金锭
item.techreborn.ingot.iridium_alloy.name=铱合金锭
item.techreborn.ingot.refined_iron.name=精炼铁锭
#Nuggets
item.techreborn.nuggets.aluminum.name=铝粒
item.techreborn.nuggets.antimony.name=锑粒
item.techreborn.nuggets.brass.name=黄铜粒
item.techreborn.nuggets.bronze.name=青铜粒
item.techreborn.nuggets.chrome.name=铬粒
item.techreborn.nuggets.copper.name=铜粒
item.techreborn.nuggets.electrum.name=琥珀金粒
item.techreborn.nuggets.invar.name=殷钢粒
item.techreborn.nuggets.iridium.name=铱粒
item.techreborn.nuggets.iron.name=铁粒
item.techreborn.nuggets.lead.name=铅粒
item.techreborn.nuggets.nickel.name=镍粒
item.techreborn.nuggets.osmium.name=锇粒
item.techreborn.nuggets.platinum.name=铂粒
item.techreborn.nuggets.silver.name=银粒
item.techreborn.nuggets.steel.name=钢粒
item.techreborn.nuggets.tin.name=锡粒
item.techreborn.nuggets.titanium.name=钛粒
item.techreborn.nuggets.tungsten.name=钨粒
item.techreborn.nuggets.tungstensteel.name=钨钢粒
item.techreborn.nuggets.hot_tungstensteel.name=热钨钢粒
item.techreborn.nuggets.zinc.name=锌粒
item.techreborn.nuggets.refined_iron.name=精炼铁粒
item.techreborn.nuggets.diamond.name=钻石粒
#Plates
item.techreborn.plate.aluminum.name=铝板
item.techreborn.plate.brass.name=黄铜板
item.techreborn.plate.bronze.name=青铜板
item.techreborn.plate.carbon.name=碳板
item.techreborn.plate.coal.name=煤板
item.techreborn.plate.chrome.name=铬板
item.techreborn.plate.copper.name=铜板
item.techreborn.plate.diamond.name=钻石板
item.techreborn.plate.electrum.name=琥珀金板
item.techreborn.plate.emerald.name=绿宝石板
item.techreborn.plate.gold.name=金板
item.techreborn.plate.invar.name=殷钢板
item.techreborn.plate.iridium.name=铱板
item.techreborn.plate.iron.name=铁板
item.techreborn.plate.lapis.name=青金石板
item.techreborn.plate.lead.name=铅板
item.techreborn.plate.nickel.name=镍板
item.techreborn.plate.obsidian.name=黑曜石板
item.techreborn.plate.peridot.name=橄榄石板
item.techreborn.plate.platinum.name=铂板
item.techreborn.plate.red_garnet.name=红色石榴石板
item.techreborn.plate.redstone.name=红石板
item.techreborn.plate.ruby.name=红宝石板
item.techreborn.plate.sapphire.name=蓝宝石板
item.techreborn.plate.silicon.name=硅板
item.techreborn.plate.silver.name=银板
item.techreborn.plate.steel.name=钢板
item.techreborn.plate.teslatite.name=蓝石板
item.techreborn.plate.tin.name=锡板
item.techreborn.plate.titanium.name=钛板
item.techreborn.plate.tungsten.name=钨板
item.techreborn.plate.hot_tungstensteel.name=热钨钢板
item.techreborn.plate.tungstensteel.name=钨钢板
item.techreborn.plate.yellow_garnet.name=黄色石榴石板
item.techreborn.plate.zinc.name=锌板
item.techreborn.plate.refined_iron.name=精炼铁板
item.techreborn.plate.wood.name=木板
item.techreborn.plate.advanced_alloy.name=高级合金板
item.techreborn.plate.lazurite.name=青金石板
item.techreborn.plate.magnalium.name=镁铝合金板
item.techreborn.plate.iridium_alloy.name=铱合金板
#Parts
item.techreborn.part.energy_flow_circuit.name=能量流电路
item.techreborn.part.data_control_circuit.name=数据控制电路
item.techreborn.part.data_orb.name=数据球
item.techreborn.part.data_storage_circuit.name=数据存储电路
item.techreborn.part.diamond_grinding_head.name=钻石研磨头
item.techreborn.part.diamond_saw_blade.name=钻石锯片
item.techreborn.part.tungsten_grinding_head.name=钨研磨头
item.techreborn.part.helium_coolant_simple.name=60k氦冷却单元
item.techreborn.part.helium_coolant_triple.name=180k氦冷却单元
item.techreborn.part.helium_coolant_six.name=360k氦冷却单元
item.techreborn.part.nak_coolant_simple.name=60k钠钾冷却单元
item.techreborn.part.nak_coolant_triple.name=180k钠钾冷却单元
item.techreborn.part.nak_coolant_six.name=360k钠钾冷却单元
item.techreborn.part.cupronickel_heating_coil.name=白铜加热线圈
item.techreborn.part.nichrome_heating_coil.name=镍铬合金加热线圈
item.techreborn.part.kanthal_heating_coil.name=坝塔尔合金加热线圈
item.techreborn.part.super_conductor.name=超导体
item.techreborn.part.thorium_cell.name=燃料棒(钍)
item.techreborn.part.double_thorium_cell.name=双联燃料棒(钍)
item.techreborn.part.quad_thorium_cell.name=四联燃料棒(钍)
item.techreborn.part.plutonium_cell.name=燃料棒(钚)
item.techreborn.part.double_plutonium_cell.name=双联燃料棒(钚)
item.techreborn.part.quad_plutonium_cell.name=四联燃料棒(钚)
item.techreborn.part.iridium_neutron_reflector.name=铱中子反射板
item.techreborn.part.computer_monitor.name=电脑显示器
item.techreborn.part.machine_parts.name=机械零件
item.techreborn.part.neutron_reflector.name=中子反射板
item.techreborn.part.thick_neutron_reflector.name=加厚中子反射板
item.techreborn.part.sap.name=粘性树脂
item.techreborn.part.rubber.name=橡胶
item.techreborn.part.scrap.name=废料
item.techreborn.part.electronic_circuit.name=电路板
item.techreborn.part.advanced_circuit.name=高级电路板
item.techreborn.part.coolant_simple.name=10k冷却单元
item.techreborn.part.coolant_triple.name=30k冷却单元
item.techreborn.part.coolant_six.name=60k冷却单元
item.techreborn.frequencyTransmitter.name=频率转换器
#Tools
item.techreborn.rockcutter.name=岩石切割机
item.techreborn.lithiumbatpack.name=锂充电背包
item.techreborn.lapotronpack.name=兰波顿充电背包
item.techreborn.omniTool.name=万能工具
item.techreborn.ironDrill.name=钢电钻
item.techreborn.diamondDrill.name=钻石电钻
item.techreborn.advancedDrill.name=高级电钻
item.techreborn.ironChainsaw.name=钢电锯
item.techreborn.diamondChainsaw.name=钻石电锯
item.techreborn.advancedChainsaw.name=高级电锯
item.techreborn.lapotronicorb.name=蓝波顿能量球
item.techreborn.cloakingdevice.name=隐形装置
item.techreborn.steelJackhammer.name=钢凿岩锤
item.techreborn.diamondJackhammer.name=钻石凿岩锤
item.techreborn.advancedJackhammer.name=高级凿岩锤
item.bronzeSword.name=青铜剑
item.bronzePickaxe.name=青铜镐
item.bronzeSpade.name=青铜铲
item.bronzeAxe.name=青铜斧
item.bronzeHoe.name=青铜锄
item.bronzeHelmet.name=青铜头盔
item.bronzeChestplate.name=青铜胸甲
item.bronzeLeggings.name=青铜护腿
item.bronzeBoots.name=青铜靴子
item.rubySword.name=红宝石剑
item.rubyPickaxe.name=红宝石镐
item.rubySpade.name=红宝石铲
item.rubyAxe.name=红宝石斧
item.rubyHoe.name=红宝石锄
item.rubyHelmet.name=红宝石头盔
item.rubyChestplate.name=红宝石胸甲
item.rubyLeggings.name=红宝石护腿
item.rubyBoots.name=红宝石靴子
item.sapphireSword.name=蓝宝石剑
item.sapphirePickaxe.name=蓝宝石镐
item.sapphireSpade.name=蓝宝石铲
item.sapphireAxe.name=蓝宝石斧
item.sapphireHoe.name=蓝宝石锄
item.sapphireHelmet.name=蓝宝石头盔
item.sapphireChestplate.name=蓝宝石胸甲
item.sapphireLeggings.name=蓝宝石护腿
item.sapphireBoots.name=蓝宝石靴子
item.peridotSword.name=橄榄石剑
item.peridotPickaxe.name=橄榄石镐
item.peridotSpade.name=橄榄石铲
item.peridotAxe.name=橄榄石斧
item.peridotHoe.name=橄榄石锄
item.peridotHelmet.name=橄榄石头盔
item.peridotChestplate.name=橄榄石胸甲
item.peridotLeggings.name=橄榄石护腿
item.peridotBoots.name=橄榄石靴子
#Fluid
fluid.fluidberylium=铍
fluid.fluidcalcium=钙
fluid.fluidcalciumcarbonate=碳酸钙
fluid.fluidcarbon=碳
fluid.fluidcarbonfiber=液态碳纤维
fluid.fluidchlorite=绿泥石
fluid.fluiddeuterium=氘
fluid.fluiddiesel=柴油
fluid.fluidglyceryl=硝化甘油
fluid.fluidhelium=氦
fluid.fluidhelium3=氦-3
fluid.fluidheliumplasma=等离子氦
fluid.fluidhydrogen=氢
fluid.fluidlithium=锂
fluid.fluidmercury=汞
fluid.fluidmethane=甲烷
fluid.fluidnitrocarbon=硝基煤油
fluid.fluidnitrocoalfuel=硝基燃油
fluid.fluidnitrodiesel=硝基柴油
fluid.fluidnitrofuel=硝基燃料
fluid.fluidnitrogen=氮
fluid.fluidnitrogendioxide=二氧化氮
fluid.fluidoil=油
fluid.fluidpotassium=钾
fluid.fluidsilicon=硅
fluid.fluidsodium=钠
fluid.fluidsodiumSulfide=过硫酸钠
fluid.fluidSulfur=硫
fluid.fluidsulfuricacid=硫酸
fluid.fluidcompressedair=压缩空气
fluid.fluidelectrolyzedwater=电解水
fluid.fluidsodiumpersulfate=过硫酸钠
fluid.fluidtritium=氚
fluid.fluidwolframium=钨
#Items
item.techreborn.uuMatter.name=UU-物质
item.techreborn.manual.name=科技手册
item.techreborn.debug.name=调试工具
#Message
techreborn.message.missingmultiblock=多方块结构缺失
techreborn.message.setTo=设置为
techreborn.message.in=在
techreborn.message.noCoordsSet=没有设置坐标
techreborn.message.coordsHaveBeen=坐标以设置为
techreborn.message.cleared=清楚
techreborn.message.detects=检测
techreborn.message.alarm=切换到:
techreborn.message.allPlayers=所有玩家
techreborn.message.onlyOtherPlayers=仅其他玩家
techreborn.message.onlyYou=仅自己
techreborn.message.nanosaberActive=有效
techreborn.message.nanosaberActivate=激活
techreborn.message.nanosaberDeactivating=禁止
techreborn.message.nanosaberInactive=无效
techreborn.message.nanosaberEnergyErrorTo=没有足够的能量来
techreborn.message.nanosaberEnergyError=没有足够的能量:
#Cables
Cable.copperCable.name=铜质导线
Cable.insulatedCopperCable.name=绝缘铜质导线
Cable.goldCable.name=金质导线
Cable.insulatedGoldCable.name=绝缘金质导线
Cable.doubleInsulatedGoldCable.name=双重绝缘金质导线
Cable.ironCable.name=铁质导线
Cable.copperCable.name=铜质导线
Cable.insulatedIronCable.name=绝缘铁质导线
Cable.doubleInsulatedIronCable.name=双重绝缘铁质导线
Cable.trippleInsulatedIronCable.name=三重绝缘铁质导线
Cable.glassFiberCable.name=玻璃纤维导线
Cable.tinCable.name=锡质导线
desc.uninsulatedCable=损耗实体!
desc.transfer=能量转移:
desc.tier=层:
keys.techreborn.category=TechReborn Category
keys.techreborn.config=配置
# JEI Integration
techreborn.jei.recipe.start.cost=Start%s
techreborn.jei.recipe.running.cost=%s/t%s
techreborn.jei.recipe.processing.time.1=时间:%s ticks
techreborn.jei.recipe.processing.time.2=%s 秒)
jei.techreborn.scrapbox.name=开启废料盒
techreborn.desc.rubberSap=为了获得粘性树脂,你需要找一颗橡胶树或者找到一棵橡胶树苗并且进行种植。当你找到了一个橡胶树后,看看树干有没有黄点。如果没有,过一会就会出现了。为了收获粘性树脂,你需要用一个木龙头对着黄点右击。
techreborn.desc.scrapBox=废料盒可以简单的用手打开也可以用拆包器打开。这是很直接的只要把你的废料盒扔进拆包器并且提供一个红石信号然后boom的一声随机的物品就出现了
techreborn.desc.scrapBoxNoDispenser=废料盒可以很简单的用手打开。
techreborn.jei.category.alloy.furnace=合金炉
techreborn.jei.category.generator.gas=燃气轮机
techreborn.jei.category.generator.semifluid=半流质发电机
techreborn.jei.category.generator.diesel=柴油发电机
techreborn.jei.category.generator.thermal=加热器
techreborn.jei.category.generator.plasma=等离子体发电机
#Death Messages
death.attack.shock=%s因触电而死
#Entitys
entity.nuke.name=核弹
#Tooltips
tooltip.wip=未完成,即将开放
tooltip.upBroken=升级插件还未完成!
tooltip.ingredient=目前只完成了一部分
techreborn.tooltip.inventory=物品栏
techreborn.tooltip.upgrades=升级
techreborn.tooltip.transferRate=传输效率
techreborn.tooltip.tier=层
techreborn.tooltip.alarm=按住 Shift 右击改变声音
#ManualUI
techreborn.manual.wiki=在线wiki
techreborn.manual.discord=Discord频道
techreborn.manual.wikibtn=打开
techreborn.manual.discordbtn=加入
#Advancements
advancements.techreborn.root.desc=通过下矿的探索想必你已经挖掘出了许多TechReborn科技复兴的矿石了。那么现在就试着制作一个木龙头。相信它会给你带来更大的收获。
advancements.techreborn.treetap=木龙头
advancements.techreborn.treetap.desc=试着用它提取橡胶树上的树脂吧。
advancements.techreborn.sap=橡胶
advancements.techreborn.sap.desc=干得好,你现在已经拥有了一些粘性树脂。现在,就试着烧制下它们吧,你将会取得攀登科技线最重要的材料——橡胶。

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -109,6 +106,29 @@
"min": 1, "min": 1,
"max": 2 "max": 2
} }
},
{
"function": "set_data",
"data": 20
}
]
},
{
"type": "item",
"name": "techreborn:ingot",
"entryName": "mixed_metal_ingot",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "set_data",
"data": 21
} }
] ]
}, },
@ -116,7 +136,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +146,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +158,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -109,6 +106,29 @@
"min": 1, "min": 1,
"max": 2 "max": 2
} }
},
{
"function": "set_data",
"data": 20
}
]
},
{
"type": "item",
"name": "techreborn:ingot",
"entryName": "mixed_metal_ingot",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "set_data",
"data": 21
} }
] ]
}, },
@ -116,7 +136,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +146,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +158,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -111,7 +111,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "energy_flow_circuit", "entryName": "energy_flow_circuit",
"weight": 30, "weight": 30,
"functions": [ "functions": [

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -109,6 +106,29 @@
"min": 1, "min": 1,
"max": 2 "max": 2
} }
},
{
"function": "set_data",
"data": 20
}
]
},
{
"type": "item",
"name": "techreborn:ingot",
"entryName": "mixed_metal_ingot",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "set_data",
"data": 21
} }
] ]
}, },
@ -116,7 +136,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +146,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +158,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -116,7 +113,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +123,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +135,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -138,7 +138,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "data_storage_circuit", "entryName": "data_storage_circuit",
"weight": 15, "weight": 15,
"functions": [ "functions": [

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -109,6 +106,29 @@
"min": 1, "min": 1,
"max": 2 "max": 2
} }
},
{
"function": "set_data",
"data": 20
}
]
},
{
"type": "item",
"name": "techreborn:ingot",
"entryName": "mixed_metal_ingot",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "set_data",
"data": 21
} }
] ]
}, },
@ -116,7 +136,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +146,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +158,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -138,7 +138,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "data_storage_circuit", "entryName": "data_storage_circuit",
"weight": 15, "weight": 15,
"functions": [ "functions": [

View file

@ -138,7 +138,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "data_storage_circuit", "entryName": "data_storage_circuit",
"weight": 15, "weight": 15,
"functions": [ "functions": [

View file

@ -138,7 +138,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "data_storage_circuit", "entryName": "data_storage_circuit",
"weight": 15, "weight": 15,
"functions": [ "functions": [

View file

@ -2,16 +2,13 @@
"pools": [ "pools": [
{ {
"name": "techreborn", "name": "techreborn",
"rolls": { "rolls": 1,
"min": 1,
"max": 3
},
"entries": [ "entries": [
{ {
"type": "item", "type": "item",
"name": "techreborn:ingotbronze", "name": "techreborn:ingotbronze",
"entryName": "bronze_ingot", "entryName": "bronze_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -26,7 +23,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotcopper", "name": "techreborn:ingotcopper",
"entryName": "copper_ingot", "entryName": "copper_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -41,7 +38,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotlead", "name": "techreborn:ingotlead",
"entryName": "lead_ingot", "entryName": "lead_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -56,7 +53,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotsilver", "name": "techreborn:ingotsilver",
"entryName": "silver_ingot", "entryName": "silver_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -71,7 +68,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingottin", "name": "techreborn:ingottin",
"entryName": "tin_ingot", "entryName": "tin_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -86,7 +83,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotrefinediron", "name": "techreborn:ingotrefinediron",
"entryName": "refined_iron_ingot", "entryName": "refined_iron_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -101,7 +98,7 @@
"type": "item", "type": "item",
"name": "techreborn:ingotadvancedalloy", "name": "techreborn:ingotadvancedalloy",
"entryName": "advanced_alloy_ingot", "entryName": "advanced_alloy_ingot",
"weight": 10, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_count", "function": "set_count",
@ -109,6 +106,29 @@
"min": 1, "min": 1,
"max": 2 "max": 2
} }
},
{
"function": "set_data",
"data": 20
}
]
},
{
"type": "item",
"name": "techreborn:ingot",
"entryName": "mixed_metal_ingot",
"weight": 5,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
},
{
"function": "set_data",
"data": 21
} }
] ]
}, },
@ -116,7 +136,7 @@
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:machine_frame",
"entryName": "basic_frame", "entryName": "basic_frame",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -126,9 +146,9 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "basic_circuit", "entryName": "basic_circuit",
"weight": 30, "weight": 5,
"functions": [ "functions": [
{ {
"function": "set_data", "function": "set_data",
@ -138,7 +158,7 @@
}, },
{ {
"type": "empty", "type": "empty",
"weight": 20 "weight": 50
} }
] ]
} }

View file

@ -111,7 +111,7 @@
}, },
{ {
"type": "item", "type": "item",
"name": "techreborn:machine_frame", "name": "techreborn:part",
"entryName": "energy_flow_circuit", "entryName": "energy_flow_circuit",
"weight": 30, "weight": 30,
"functions": [ "functions": [

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 490 B