Merge remote-tracking branch 'origin/1.12' into 1.12

This commit is contained in:
Modmuss50 2018-08-14 01:09:18 +01:00
commit 1d7ff39ccf
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
2 changed files with 4 additions and 0 deletions

View file

@ -29,6 +29,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Enchantments;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.OreUtil;
import reborncore.common.util.RebornCraftingHelper;
@ -203,6 +204,7 @@ public class CraftingTableRecipes extends RecipeMethods {
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("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', getCell("water"));
registerShaped(getMaterial("coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART));
registerShaped(getMaterial("coolant_six", Type.PART), "TCT", "TPT", "TCT", 'T', "ingotTin", 'C', getMaterial("coolant_triple", Type.PART), 'P', "plateCopper");
registerShaped(getMaterial("helium_coolant_simple", Type.PART), " T ", "TCT", " T ", 'T', "ingotTin", 'C', getCell("helium"));

View file

@ -9,7 +9,9 @@ tile.techreborn:gas_turbine.name=燃气轮机
tile.techreborn:industrial_block.name=工业
tile.techreborn:thermal_generator.name=热敏发电机
tile.techreborn:quantum_tank.name=量子缸
tile.techreborn:creative_quantum_tank.name=创造模式量子缸
tile.techreborn:quantum_chest.name=量子箱
tile.techreborn:creative_quantum_chest.name=创造模式量子箱
tile.techreborn:digital_chest.name=数码箱
tile.techreborn:industrial_centrifuge.name=工业离心机
tile.techreborn:rolling_machine.name=辊压机