Merge remote-tracking branch 'origin/master'

src/main/java/com/hbm/blocks/generic/BlockBobble.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.items.ModItems;
+import com.hbm.items.special.ItemPlasticScrap.ScrapType;
 import com.hbm.main.MainRegistry;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
@@ -154,43 +155,42 @@ public class BlockBobble extends BlockContainer {
 	
 	public static enum BobbleType {
 		
-		NONE("null", "null", null, null, false),
-		//vault tec bobbleheads
-		STRENGTH("Strength", "Strength", null, "It's essential to give your arguments impact.", false),
-		PERCEPTION("Perception", "Perception", null, "Only through observation will you perceive weakness.", false),
-		ENDURANCE("Endurance", "Endurance", null, "Always be ready to take one for the team.", false),
-		CHARISMA("Charisma", "Charisma", null, "Nothing says pizzaz like a winning smile.", false),
-		INTELLIGENCE("Intelligence", "Intelligence", null, "It takes the smartest individuals to realize$there's always more to learn.", false),
-		AGILITY("Agility", "Agility", null, "Never be afraid to dodge the sensitive issues.", false),
-		LUCK("Luck", "Luck", null, "There's only one way to give 110%.", false),
-		//contributor bobbles
-		BOB("Robert \"The Bobcat\" Katzinsky", "HbMinecraft", "Hbm's Nuclear Tech Mod", "I know where you live, " + System.getProperty("user.name"), false),
-		FRIZZLE("Frooz", "Frooz", "Weapon models", "BLOOD IS FUEL", true),
-		PU238("Pu-238", "Pu-238", "Improved Tom impact mechanics", null, false),
-		VT("VT-6/24", "VT-6/24", "Balefire warhead model and general texturework", "You cannot unfuck a horse.", true),
-		DOC("The Doctor", "Doctor17PH", "Russian localization, lunar miner", "Perhaps the moon rocks were too expensive", true),
-		BLUEHAT("The Blue Hat", "The Blue Hat", "Textures", "there's a listening device in this bobblehead$don't touch it thanks", true),
-		PHEO("Pheo", "Pheonix", "Deuterium machines, tantalium textures, Reliant Rocket", "RUN TO THE BEDROOM, ON THE SUITCASE ON THE LEFT,$YOU'LL FIND MY FAVORITE AXE", true),
-		ADAM29("Adam29", "Adam29", "Ethanol, liquid petroleum gas", "You know, nukes are really quite beatiful.$It's like watching a star be born for a split second.", true),
-		UFFR("UFFR", "UFFR", "All sorts of things from his PR", "fried shrimp", false),
-		VAER("vaer", "vaer", "ZIRNOX", "taken de family out to the weekend cigarette festival", true),
-		NOS("Dr Nostalgia", "Dr Nostalgia", "SSG and Vortex models", "Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie", true),
-		DRILLGON("Drillgon200", "Drillgon200", "1.12 Port", null, false),
-		//testing garbage. why is she so dumb?
-		CIRNO("Cirno", "Cirno", "being a dumb ice fairy", "No brain. Head empty.", true);
+		NONE(			"null",								"null",			null,														null,																								false,	ScrapType.BOARD_BLANK),
+		STRENGTH(		"Strength",							"Strength",		null,														"It's essential to give your arguments impact.",													false,	ScrapType.BRIDGE_BIOS),
+		PERCEPTION(		"Perception",						"Perception",	null,														"Only through observation will you perceive weakness.",												false,	ScrapType.BRIDGE_NORTH),
+		ENDURANCE(		"Endurance",						"Endurance",	null,														"Always be ready to take one for the team.",														false,	ScrapType.BRIDGE_SOUTH),
+		CHARISMA(		"Charisma",							"Charisma",		null,														"Nothing says pizzaz like a winning smile.",														false,	ScrapType.BRIDGE_IO),
+		INTELLIGENCE(	"Intelligence",						"Intelligence",	null,														"It takes the smartest individuals to realize$there's always more to learn.",						false,	ScrapType.BRIDGE_BUS),
+		AGILITY(		"Agility",							"Agility",		null,														"Never be afraid to dodge the sensitive issues.",													false,	ScrapType.BRIDGE_CHIPSET),
+		LUCK(			"Luck",								"Luck",			null,														"There's only one way to give 110%.",																false,	ScrapType.BRIDGE_CMOS),
+		BOB(			"Robert \"The Bobcat\" Katzinsky",	"HbMinecraft",	"Hbm's Nuclear Tech Mod",									"I know where you live, " + System.getProperty("user.name"),										false,	ScrapType.CPU_SOCKET),
+		FRIZZLE(		"Frooz",							"Frooz",		"Weapon models",											"BLOOD IS FUEL",																					true,	ScrapType.CPU_CLOCK),
+		PU238(			"Pu-238",							"Pu-238",		"Improved Tom impact mechanics",							null,																								false,	ScrapType.CPU_REGISTER),
+		VT(				"VT-6/24",							"VT-6/24",		"Balefire warhead model and general texturework",			"You cannot unfuck a horse.",																		true,	ScrapType.CPU_EXT),
+		DOC(			"The Doctor",						"Doctor17PH",	"Russian localization, lunar miner",						"Perhaps the moon rocks were too expensive",														true,	ScrapType.CPU_CACHE),
+		BLUEHAT(		"The Blue Hat",						"The Blue Hat",	"Textures",													"there's a listening device in this bobblehead$don't touch it thanks",								true,	ScrapType.MEM_16K_A),
+		PHEO(			"Pheo",								"Pheonix",		"Deuterium machines, tantalium textures, Reliant Rocket",	"RUN TO THE BEDROOM, ON THE SUITCASE ON THE LEFT,$YOU'LL FIND MY FAVORITE AXE",						true,	ScrapType.MEM_16K_B),
+		ADAM29(			"Adam29",							"Adam29",		"Ethanol, liquid petroleum gas",							"You know, nukes are really quite beatiful.$It's like watching a star be born for a split second.",	true,	ScrapType.MEM_16K_C),
+		UFFR(			"UFFR",								"UFFR",			"All sorts of things from his PR",							"fried shrimp",																						false,	ScrapType.MEM_SOCKET),
+		VAER(			"vaer",								"vaer",			"ZIRNOX",													"taken de family out to the weekend cigarette festival",											true,	ScrapType.MEM_16K_D),
+		NOS(			"Dr Nostalgia",						"Dr Nostalgia",	"SSG and Vortex models",									"Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie",					true,	ScrapType.BOARD_TRANSISTOR),
+		DRILLGON(		"Drillgon200",						"Drillgon200",	"1.12 Port",												null,																								false,	ScrapType.CPU_LOGIC),
+		CIRNO(			"Cirno",							"Cirno",		"being a dumb ice fairy",									"No brain. Head empty.",																			true,	ScrapType.BOARD_BLANK);
 
 		public String name;			//the title of the tooltip
 		public String label;		//the name engraved in the socket
 		public String contribution;	//what contributions this person has made, if applicable
 		public String inscription;	//the flavor text
 		public boolean skinLayers;
+		public ScrapType scrap;
 		
-		private BobbleType(String name, String label, String contribution, String inscription, boolean layers) {
+		private BobbleType(String name, String label, String contribution, String inscription, boolean layers, ScrapType scrap) {
 			this.name = name;
 			this.label = label;
 			this.contribution = contribution;
 			this.inscription = inscription;
 			this.skinLayers = layers;
+			this.scrap = scrap;
 		}
 	}
 }

src/main/java/com/hbm/blocks/machine/DummyOldBase.java

@@ -68,6 +68,6 @@ public abstract class DummyOldBase extends BlockContainer implements IDummy, IEn
 
 	@Override
 	public boolean canConnect(IBlockAccess world, int x, int y, int z, ForgeDirection dir) {
-		return true;
+		return port;
 	}
 }

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -216,7 +216,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_calamity, 12), new Object[] { " I ", "GCG", " P ", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_actionexpress, 12), new Object[] { " I", "GC", " P", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_nuke, 1), new Object[] { " WP", "SEP", " WP", 'W', ModItems.wire_aluminium, 'P', STEEL.plate(), 'S', ModItems.hull_small_steel, 'E', ModItems.ingot_semtex });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATZ.ordinal()) });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_lead_full, 1, FluidType.WATZ.ordinal()) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart_nerf, 16), new Object[] { "I", "I", 'I', ModItems.plate_polymer });
 		
 		//Folly shells

src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java

@@ -10,6 +10,7 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.imc.IMCCrystallizer;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
+import com.hbm.items.special.ItemPlasticScrap.ScrapType;
 import com.hbm.main.MainRegistry;
 
 import net.minecraft.init.Blocks;
@@ -79,6 +80,10 @@ public class CrystallizerRecipes {
 		
 		recipes.put(new ComparableStack(ModItems.powder_impure_osmiridium), new ItemStack(ModItems.crystal_osmiridium));
 		
+		for(int i = 0; i < ScrapType.values().length; i++) {
+			recipes.put(new ComparableStack(ModItems.scrap_plastic, 1, i), new ItemStack(ModItems.circuit_star_piece, 1, i));
+		}
+		
 		List<ItemStack> quartz = OreDictionary.getOres("crystalCertusQuartz");
 		
 		if(quartz != null && !quartz.isEmpty()) {

src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java

@@ -5,11 +5,13 @@ import java.util.List;
 import java.util.Map;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.blocks.generic.BlockBobble.BobbleType;
 import com.hbm.interfaces.Untested;
 import com.hbm.inventory.RecipesCommon;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;
+import com.hbm.util.Compat;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -108,6 +110,9 @@ public class ShredderRecipes {
 	
 	public static void registerOverrides() {
 
+		/*
+		 * Primary recipes
+		 */
 		ShredderRecipes.setRecipe(ModItems.scrap, new ItemStack(ModItems.dust));
 		ShredderRecipes.setRecipe(ModItems.dust, new ItemStack(ModItems.dust));
 		ShredderRecipes.setRecipe(Blocks.glowstone, new ItemStack(Items.glowstone_dust, 4));
@@ -177,6 +182,9 @@ public class ShredderRecipes {
 		
 		for(int i = 0; i < 5; i++) ShredderRecipes.setRecipe(new ItemStack(Items.skull, 1, i), new ItemStack(ModItems.biomass));
 
+		/*
+		 * Crstaly processing
+		 */
 		ShredderRecipes.setRecipe(ModItems.ingot_schraranium, new ItemStack(ModItems.nugget_schrabidium, 2));
 		ShredderRecipes.setRecipe(ModItems.crystal_coal, new ItemStack(ModItems.powder_coal, 3));
 		ShredderRecipes.setRecipe(ModItems.crystal_iron, new ItemStack(ModItems.powder_iron, 3));
@@ -205,6 +213,9 @@ public class ShredderRecipes {
 		ShredderRecipes.setRecipe(ModItems.crystal_starmetal, new ItemStack(ModItems.powder_dura_steel, 6));
 		ShredderRecipes.setRecipe(ModItems.crystal_cobalt, new ItemStack(ModItems.powder_cobalt, 3));
 
+		/*
+		 * Misc recycling
+		 */
 		ShredderRecipes.setRecipe(ModBlocks.steel_poles, new ItemStack(ModItems.powder_steel_tiny, 3));
 		ShredderRecipes.setRecipe(ModBlocks.pole_top, new ItemStack(ModItems.powder_tungsten, 4));
 		ShredderRecipes.setRecipe(ModBlocks.tape_recorder, new ItemStack(ModItems.powder_steel, 1));
@@ -230,6 +241,9 @@ public class ShredderRecipes {
 		ShredderRecipes.setRecipe(ModBlocks.steel_grate, new ItemStack(ModItems.powder_steel_tiny, 3));
 		ShredderRecipes.setRecipe(ModItems.pipes_steel, new ItemStack(ModItems.powder_steel, 27));
 
+		/*
+		 * Sellafite scrapping
+		 */
 		ShredderRecipes.setRecipe(ModBlocks.sellafield_0, new ItemStack(ModItems.scrap_nuclear, 1));
 		ShredderRecipes.setRecipe(ModBlocks.sellafield_1, new ItemStack(ModItems.scrap_nuclear, 2));
 		ShredderRecipes.setRecipe(ModBlocks.sellafield_2, new ItemStack(ModItems.scrap_nuclear, 3));
@@ -237,6 +251,9 @@ public class ShredderRecipes {
 		ShredderRecipes.setRecipe(ModBlocks.sellafield_4, new ItemStack(ModItems.scrap_nuclear, 7));
 		ShredderRecipes.setRecipe(ModBlocks.sellafield_core, new ItemStack(ModItems.scrap_nuclear, 15));
 
+		/*
+		 * Deco pipe recycling
+		 */
 		ShredderRecipes.setRecipe(ModBlocks.deco_pipe, new ItemStack(ModItems.powder_steel, 1));
 		ShredderRecipes.setRecipe(ModBlocks.deco_pipe_rusted, new ItemStack(ModItems.powder_steel, 1));
 		ShredderRecipes.setRecipe(ModBlocks.deco_pipe_green, new ItemStack(ModItems.powder_steel, 1));
@@ -262,6 +279,9 @@ public class ShredderRecipes {
 		ShredderRecipes.setRecipe(ModBlocks.deco_pipe_framed_red, new ItemStack(ModItems.powder_steel, 1));
 		ShredderRecipes.setRecipe(ModBlocks.deco_pipe_framed_marked, new ItemStack(ModItems.powder_steel, 1));
 
+		/*
+		 * Turret and ammo recycling
+		 */
 		ShredderRecipes.setRecipe(ModBlocks.turret_light, new ItemStack(ModItems.powder_steel, 16));
 		ShredderRecipes.setRecipe(ModBlocks.turret_heavy, new ItemStack(ModItems.powder_steel, 16));
 		ShredderRecipes.setRecipe(ModBlocks.turret_flamer, new ItemStack(ModItems.powder_steel, 16));
@@ -275,10 +295,38 @@ public class ShredderRecipes {
 		ShredderRecipes.setRecipe(ModItems.turret_cwis_ammo, new ItemStack(Items.gunpowder, 4));
 		ShredderRecipes.setRecipe(ModItems.turret_tau_ammo, new ItemStack(ModItems.powder_uranium, 4));
 
+		/*
+		 * Wool and clay scrapping
+		 */
 		for(int i = 0; i < 16; i++) {
 			ShredderRecipes.setRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, i), new ItemStack(Items.clay_ball, 4));
 			ShredderRecipes.setRecipe(new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.string, 4));
 		}
+		
+		/*
+		 * Shredding bobbleheads
+		 */
+		for(int i = 0; i < BobbleType.values().length; i++) {
+			BobbleType type = BobbleType.values()[i];
+			ShredderRecipes.setRecipe(new ItemStack(ModBlocks.bobblehead, 1, i), new ItemStack(ModItems.scrap_plastic, 1, type.scrap.ordinal()));
+		}
+		
+		/*
+		 * GC COMPAT
+		 */
+		Item gcMoonBlock = Compat.tryLoadItem("GalacticraftCore", "moonBlock");
+		if(gcMoonBlock != null) {
+			ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 3), new ItemStack(ModBlocks.moon_turf)); //Moon dirt
+			ShredderRecipes.setRecipe(new ItemStack(gcMoonBlock, 1, 5), new ItemStack(ModBlocks.moon_turf)); //Moon topsoil
+		}
+		
+		/*
+		 * AR COMPAT
+		 */
+		Item arMoonTurf = Compat.tryLoadItem("advancedrocketry", "turf");
+		if(arMoonTurf != null) ShredderRecipes.setRecipe(arMoonTurf, new ItemStack(ModBlocks.moon_turf)); //i assume it's moon turf
+		Item arMoonTurfDark = Compat.tryLoadItem("advancedrocketry", "turfDark");
+		if(arMoonTurfDark != null) ShredderRecipes.setRecipe(arMoonTurfDark, new ItemStack(ModBlocks.moon_turf)); //probably moon dirt? would have helped if i had ever played AR for more than 5 seconds
 	}
 	
 	/**

src/main/java/com/hbm/items/ItemEnumMulti.java

@@ -0,0 +1,88 @@
+package com.hbm.items;
+
+import java.util.List;
+
+import com.hbm.lib.RefStrings;
+import com.hbm.util.EnumUtil;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+
+public class ItemEnumMulti extends Item {
+	
+	//hell yes, now we're thinking with enums!
+	private Class<? extends Enum> theEnum;
+	private boolean multiTexture;
+
+	public ItemEnumMulti(Class<? extends Enum> theEnum, boolean multiTexture) {
+		this.setHasSubtypes(true);
+		this.theEnum = theEnum;
+		this.multiTexture = multiTexture;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		for(int i = 0; i < theEnum.getEnumConstants().length; i++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+	
+	@Override
+	public Item setUnlocalizedName(String unlocalizedName) {
+		super.setUnlocalizedName(unlocalizedName);
+		this.setTextureName(RefStrings.MODID + ":"+ unlocalizedName);
+		return this;
+	}
+	
+	private IIcon[] icons;
+
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister reg) {
+		
+		if(multiTexture) {
+			Enum[] enums = theEnum.getEnumConstants();
+			this.icons = new IIcon[enums.length];
+			
+			for(int i = 0; i < icons.length; i++) {
+				Enum num = enums[i];
+				this.icons[i] = reg.registerIcon(this.getIconString() + "." + num.name().toLowerCase());
+			}
+		} else {
+			this.itemIcon = reg.registerIcon(this.getIconString());
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(int meta) {
+		
+		if(multiTexture) {
+			Enum[] enums = theEnum.getEnumConstants();
+			Enum num = EnumUtil.grabEnumSafely(theEnum, meta);
+			return this.icons[num.ordinal()];
+		} else {
+			return this.itemIcon;
+		}
+	}
+	
+	/*
+	 * Returns null when the wrong enum is passed. Only really used for recipes anyway so it's good.
+	 */
+	public ItemStack stackFromEnum(int count, Enum num) {
+		
+		if(num.getClass() != this.theEnum)
+			return null;
+		
+		return new ItemStack(this, count, num.ordinal());
+	}
+	
+	public ItemStack stackFromEnum(Enum num) {
+		return stackFromEnum(1, num);
+	}
+}

src/main/java/com/hbm/items/ModItems.java

@@ -15,6 +15,7 @@ import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
 import com.hbm.items.machine.ItemRBMKRod.EnumBurnFunc;
 import com.hbm.items.machine.ItemStamp.StampType;
 import com.hbm.items.special.*;
+import com.hbm.items.special.ItemPlasticScrap.ScrapType;
 import com.hbm.items.tool.*;
 import com.hbm.items.tool.ItemToolAbility.EnumToolType;
 import com.hbm.items.weapon.*;
@@ -506,6 +507,9 @@ public class ModItems {
 	public static Item circuit_bismuth;
 	public static Item circuit_tantalium_raw;
 	public static Item circuit_tantalium;
+	public static ItemEnumMulti circuit_star_piece;
+	public static ItemEnumMulti circuit_star_component;
+	public static Item circuit_star;
 
 	public static Item mechanism_revolver_1;
 	public static Item mechanism_revolver_2;
@@ -1137,6 +1141,7 @@ public class ModItems {
 	public static ItemRBMKPellet rbmk_pellet_zfb_am_mix;
 	public static ItemRBMKPellet rbmk_pellet_drx;
 
+	public static Item scrap_plastic;
 	public static Item scrap;
 	public static Item scrap_nuclear;
 	public static Item trinitite;
@@ -3058,6 +3063,9 @@ public class ModItems {
 		circuit_bismuth = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_bismuth");
 		circuit_tantalium_raw = new Item().setUnlocalizedName("circuit_tantalium_raw").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_tantalium_raw");
 		circuit_tantalium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_tantalium");
+		circuit_star_piece = (ItemEnumMulti) new ItemEnumMulti(ScrapType.class, true).setUnlocalizedName("circuit_star_piece").setCreativeTab(null);
+		circuit_star_component = (ItemEnumMulti) new ItemCircuitStarComponent().setUnlocalizedName("circuit_star_component").setCreativeTab(null);
+		circuit_star = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_star").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_star");
 		circuit_targeting_tier1 = new Item().setUnlocalizedName("circuit_targeting_tier1").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier1");
 		circuit_targeting_tier2 = new Item().setUnlocalizedName("circuit_targeting_tier2").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier2");
 		circuit_targeting_tier3 = new Item().setUnlocalizedName("circuit_targeting_tier3").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier3");
@@ -3862,6 +3870,7 @@ public class ModItems {
 		nuclear_waste_tiny = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_tiny");
 		nuclear_waste_vitrified = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_vitrified").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified");
 		nuclear_waste_vitrified_tiny = new ItemNuclearWaste().setUnlocalizedName("nuclear_waste_vitrified_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_vitrified_tiny");
+		scrap_plastic = new ItemPlasticScrap().setUnlocalizedName("scrap_plastic").setTextureName(RefStrings.MODID + ":scrap_plastic");
 		scrap = new Item().setUnlocalizedName("scrap").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap");
 		scrap_nuclear = new Item().setUnlocalizedName("scrap_nuclear").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":scrap_nuclear");
 		containment_box = new ItemLeadBox().setUnlocalizedName("containment_box").setCreativeTab(null).setTextureName(RefStrings.MODID + ":containment_box");
@@ -6121,6 +6130,9 @@ public class ModItems {
 		GameRegistry.registerItem(circuit_bismuth, circuit_bismuth.getUnlocalizedName());
 		GameRegistry.registerItem(circuit_tantalium_raw, circuit_tantalium_raw.getUnlocalizedName());
 		GameRegistry.registerItem(circuit_tantalium, circuit_tantalium.getUnlocalizedName());
+		GameRegistry.registerItem(circuit_star_piece, circuit_star_piece.getUnlocalizedName());
+		GameRegistry.registerItem(circuit_star_component, circuit_star_component.getUnlocalizedName());
+		GameRegistry.registerItem(circuit_star, circuit_star.getUnlocalizedName());
 		
 		//Military Circuits
 		GameRegistry.registerItem(circuit_targeting_tier1, circuit_targeting_tier1.getUnlocalizedName());
@@ -6805,6 +6817,7 @@ public class ModItems {
 		GameRegistry.registerItem(debris_element, debris_element.getUnlocalizedName());
 		GameRegistry.registerItem(undefined, undefined.getUnlocalizedName());
 		
+		GameRegistry.registerItem(scrap_plastic, scrap_plastic.getUnlocalizedName());
 		GameRegistry.registerItem(scrap, scrap.getUnlocalizedName());
 		GameRegistry.registerItem(scrap_nuclear, scrap_nuclear.getUnlocalizedName());
 		GameRegistry.registerItem(trinitite, trinitite.getUnlocalizedName());

src/main/java/com/hbm/items/special/ItemCircuitStarComponent.java

@@ -0,0 +1,16 @@
+package com.hbm.items.special;
+
+import com.hbm.items.ItemEnumMulti;
+
+public class ItemCircuitStarComponent extends ItemEnumMulti {
+
+	public ItemCircuitStarComponent() {
+		super(CircuitComponentType.class, true);
+	}
+	
+	public static enum CircuitComponentType {
+		CHIPSET,
+		CPU,
+		RAM
+	}
+}

src/main/java/com/hbm/items/special/ItemHot.java

@@ -12,77 +12,76 @@ import net.minecraft.world.World;
 
 public class ItemHot extends Item {
 
-    @SideOnly(Side.CLIENT)
-    public IIcon hotIcon;
+	@SideOnly(Side.CLIENT)
+	public IIcon hotIcon;
 	protected static int heat;
-	
+
 	public ItemHot(int heat) {
-		
 		this.heat = heat;
 	}
 
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister reg) {
-        super.registerIcons(reg);
-        this.hotIcon = reg.registerIcon(this.getIconString() + "_hot");
-    }
-    
-    @SideOnly(Side.CLIENT)
-    public IIcon getIconFromDamage(int meta) {
-        return this.itemIcon;
-    }
-	
-    public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean bool) {
-    	
-    	if(!world.isRemote && stack.hasTagCompound()) {
-    		
-    		int h = stack.stackTagCompound.getInteger("heat");
-    		
-    		if(h > 0) {
-    			stack.stackTagCompound.setInteger("heat", h - 1);
-    		} else {
-    			stack.stackTagCompound = null;
-    		}
-    	}
-    }
-	
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister reg) {
+		super.registerIcons(reg);
+		this.hotIcon = reg.registerIcon(this.getIconString() + "_hot");
+	}
+
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(int meta) {
+		return this.itemIcon;
+	}
+
+	public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean bool) {
+
+		if(!world.isRemote && stack.hasTagCompound()) {
+
+			int h = stack.stackTagCompound.getInteger("heat");
+
+			if(h > 0) {
+				stack.stackTagCompound.setInteger("heat", h - 1);
+			} else {
+				stack.stackTagCompound = null;
+			}
+		}
+	}
+
 	public static ItemStack heatUp(ItemStack stack) {
-		
+
 		if(!(stack.getItem() instanceof ItemHot))
 			return stack;
-		
+
 		if(!stack.hasTagCompound())
 			stack.stackTagCompound = new NBTTagCompound();
-		
+
 		stack.stackTagCompound.setInteger("heat", getMaxHeat(stack));
 		return stack;
 	}
-	
+
 	public static ItemStack heatUp(ItemStack stack, double d) {
-		
+
 		if(!(stack.getItem() instanceof ItemHot))
 			return stack;
-		
+
 		if(!stack.hasTagCompound())
 			stack.stackTagCompound = new NBTTagCompound();
-		
-		stack.stackTagCompound.setInteger("heat", (int)(d * getMaxHeat(stack)));
+
+		stack.stackTagCompound.setInteger("heat", (int) (d * getMaxHeat(stack)));
 		return stack;
 	}
-	
+
 	public static double getHeat(ItemStack stack) {
-		
+
 		if(!(stack.getItem() instanceof ItemHot))
 			return 0;
-		
+
 		if(!stack.hasTagCompound())
 			return 0;
-		
+
 		int h = stack.stackTagCompound.getInteger("heat");
-		
-		return (double)h / (double)heat;
+
+		return (double) h / (double) heat;
 	}
-	
+
 	public static int getMaxHeat(ItemStack stack) {
 		return heat;
 	}

src/main/java/com/hbm/items/special/ItemPlasticScrap.java

@@ -0,0 +1,43 @@
+package com.hbm.items.special;
+
+import com.hbm.items.ItemEnumMulti;
+
+import net.minecraft.item.Item;
+
+public class ItemPlasticScrap extends ItemEnumMulti {
+
+	public ItemPlasticScrap() {
+		super(ScrapType.class, false);
+		this.setCreativeTab(null);
+	}
+	
+	public static enum ScrapType {
+		//GENERAL BOARD
+		BOARD_BLANK,
+		BOARD_TRANSISTOR,
+		
+		//CHIPSET
+		BRIDGE_NORTH,
+		BRIDGE_SOUTH,
+		BRIDGE_IO,
+		BRIDGE_BUS,
+		BRIDGE_CHIPSET,
+		BRIDGE_CMOS,
+		BRIDGE_BIOS,
+		
+		//CPU
+		CPU_REGISTER,
+		CPU_CLOCK,
+		CPU_LOGIC,
+		CPU_CACHE,
+		CPU_EXT,
+		CPU_SOCKET,
+		
+		//RAM
+		MEM_SOCKET,
+		MEM_16K_A,
+		MEM_16K_B,
+		MEM_16K_C,
+		MEM_16K_D
+	}
+}

src/main/java/com/hbm/main/CraftingManager.java

@@ -13,6 +13,8 @@ import com.hbm.inventory.OreDictManager;
 import static com.hbm.inventory.OreDictManager.*;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemBattery;
+import com.hbm.items.special.ItemCircuitStarComponent.CircuitComponentType;
+import com.hbm.items.special.ItemPlasticScrap.ScrapType;
 import com.hbm.util.EnchantmentUtil;
 
 import net.minecraft.block.Block;
@@ -49,6 +51,7 @@ public class CraftingManager {
 		
 		//TODO: find out what this actually did
 		RecipeSorter.register("hbm:rbmk", RBMKFuelCraftingHandler.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless");
+		RecipeSorter.register("hbm:mku", MKUCraftingHandler.class, RecipeSorter.Category.SHAPED, "after:minecraft:shaped before:minecraft:shapeless");
 	}
 
 	public static void AddCraftingRec() {
@@ -880,6 +883,41 @@ public class CraftingManager {
 			addRecipeAuto(new ItemStack(ModBlocks.rbmk_boiler, 1), new Object[] { "CPC", "CRC", "CPC", 'C', ModItems.board_copper, 'P', ModItems.pipes_steel, 'R', ModBlocks.rbmk_blank });
 			addRecipeAuto(new ItemStack(ModBlocks.rbmk_cooler, 1), new Object[] { "IGI", "GCG", "IGI", 'C', ModBlocks.rbmk_blank, 'I', ModItems.plate_polymer, 'G', ModBlocks.steel_grate });
 		}
+		
+		addShapelessAuto(ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.CHIPSET), new Object[] {
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_BIOS),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_BUS),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_CHIPSET),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_CMOS),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_IO),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_NORTH),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BRIDGE_SOUTH)
+		});
+		
+		addShapelessAuto(ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.CPU), new Object[] {
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_CACHE),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_CLOCK),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_EXT),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_LOGIC),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_REGISTER),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.CPU_SOCKET)
+		});
+		
+		addShapelessAuto(ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.RAM), new Object[] {
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.MEM_SOCKET),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.MEM_16K_A),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.MEM_16K_B),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.MEM_16K_C),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.MEM_16K_D)
+		});
+		
+		addShapelessAuto(new ItemStack(ModItems.circuit_star), new Object[] {
+				ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.CHIPSET),
+				ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.CPU),
+				ModItems.circuit_star_component.stackFromEnum(CircuitComponentType.RAM),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_TRANSISTOR),
+				ModItems.circuit_star_piece.stackFromEnum(ScrapType.BOARD_BLANK)
+		});
 	}
 	
 	public static void crumple() {

src/main/java/com/hbm/main/ResourceManager.java

@@ -11,7 +11,7 @@ import net.minecraftforge.client.model.IModelCustom;
 
 public class ResourceManager {
 	
-	public static final Shader test_shader = ShaderManager.loadShader(new ResourceLocation(RefStrings.MODID, "shaders/test_shader"));
+	//public static final Shader test_shader = ShaderManager.loadShader(new ResourceLocation(RefStrings.MODID, "shaders/test_shader"));
 
 	//God
 	public static final IModelCustom error = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/error.obj"));

src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java

@@ -15,6 +15,7 @@ import com.hbm.util.Tuple.Quartet;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
@@ -162,10 +163,10 @@ public class TileEntityMachineCatalyticCracker extends TileEntity implements IFl
 		fillFluid(xCoord - dir.offsetX * 4 + rot.offsetX * 1, yCoord, zCoord - dir.offsetZ * 4 + rot.offsetZ * 1, this.getTact(), type);
 		fillFluid(xCoord - dir.offsetX * 4 - rot.offsetX * 2, yCoord, zCoord - dir.offsetZ * 4 - rot.offsetZ * 2, this.getTact(), type);
 
-		fillFluid(xCoord + dir.offsetX * 3 + rot.offsetX * 3, yCoord, zCoord + dir.offsetZ * 2 + rot.offsetZ * 3, this.getTact(), type);
-		fillFluid(xCoord + dir.offsetX * 3 - rot.offsetX * 4, yCoord, zCoord + dir.offsetZ * 2 - rot.offsetZ * 4, this.getTact(), type);
-		fillFluid(xCoord - dir.offsetX * 3 + rot.offsetX * 3, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ * 3, this.getTact(), type);
-		fillFluid(xCoord - dir.offsetX * 3 - rot.offsetX * 4, yCoord, zCoord - dir.offsetZ * 2 - rot.offsetZ * 4, this.getTact(), type);
+		fillFluid(xCoord + dir.offsetX * 2 + rot.offsetX * 3, yCoord, zCoord + dir.offsetZ * 2 + rot.offsetZ * 3, this.getTact(), type);
+		fillFluid(xCoord + dir.offsetX * 2 - rot.offsetX * 4, yCoord, zCoord + dir.offsetZ * 2 - rot.offsetZ * 4, this.getTact(), type);
+		fillFluid(xCoord - dir.offsetX * 2 + rot.offsetX * 3, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ * 3, this.getTact(), type);
+		fillFluid(xCoord - dir.offsetX * 2 - rot.offsetX * 4, yCoord, zCoord - dir.offsetZ * 2 - rot.offsetZ * 4, this.getTact(), type);
 	}
 
 	@Override

src/main/java/com/hbm/util/EnumUtil.java

@@ -0,0 +1,10 @@
+package com.hbm.util;
+
+public class EnumUtil {
+
+	public static <T extends Enum> T grabEnumSafely(Class<? extends Enum> theEnum, int index) {
+		Enum[] values = theEnum.getEnumConstants();
+		index = Math.abs(index % values.length);
+		return (T)values[index];
+	}
+}

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -469,6 +469,7 @@ hbmfluid.pain=Pandemonium(III)tantalit-Lösung
 hbmfluid.petroil=Gemisch
 hbmfluid.petroleum=Petroleumgas
 hbmfluid.plasma_bf=Balefire-Plasma
+hbmfluid.plasma_dh3=Deuterium-Helium-3-Plasma
 hbmfluid.plasma_dt=Deuterium-Tritium-Plasma
 hbmfluid.plasma_hd=Wasserstoff-Deuterium-Plasma
 hbmfluid.plasma_ht=Wasserstoff-Tritium-Plasma

src/main/resources/assets/hbm/lang/en_US.lang

@@ -543,6 +543,7 @@ hbmfluid.pain=Pandemonium(III)tantalite Solution
 hbmfluid.petroil=Petroil
 hbmfluid.petroleum=Petroleum Gas
 hbmfluid.plasma_bf=Balefire Plasma
+hbmfluid.plasma_dh3=Deuterium-Helium-3 Plasma
 hbmfluid.plasma_dt=Deuterium-Tritium Plasma
 hbmfluid.plasma_hd=Hydrogen-Deuterium Plasma
 hbmfluid.plasma_ht=Hydrogen-Tritium Plasma

src/main/resources/assets/hbm/lang/zh_CN.lang

@@ -1,4 +1,4 @@
-achievement.FOEQ.desc=向火星传送信号！...其实我是说Duna
+achievement.FOEQ.desc=向火星传送信号！...其实我是说Duna
 achievement.FOEQ=飞马座运载火箭和发射架
 achievement.assembly.desc=Bobmazon 2级 (装配机)
 achievement.assembly=制作
@@ -186,10 +186,12 @@ chem.CORDITE=无烟火药生产
 chem.CRYOGEL=冷凝胶混合
 chem.DESH=Desh生产
 chem.DEUTERIUM=氘萃取
+chem.DUCRETE=贫铀混凝土生产
 chem.DYN_DNT=双聚中子态素合成
 chem.DYN_EUPH=Ep合成
 chem.DYN_SCHRAB=Sa326合成
 chem.ELECTROLYSIS=低温电解水
+chem.ETHANOL=乙醇生产
 chem.FC_BITUMEN=沥青裂化
 chem.FC_DIESEL_KEROSENE=柴油裂化
 chem.FC_GAS_PETROLEUM=天然气裂化
@@ -202,9 +204,13 @@ chem.FP_SMEAR=工业油加工
 chem.FR_PETROIL=汽油混合
 chem.FR_REOIL=原油再加工
 chem.GASOLINE=含铅汽油生产
+chem.HEAVY_ELECTROLYSIS=低温电解重水
+chem.HELIUM3=使用月球草皮提取氦-3
 chem.KEVLAR=凯夫拉生产
-chem.NITAN=NITAN超级燃料混合
+chem.LPG=石油天然气液化
+chem.NITAN=NITAN牌超级燃料混合
 chem.OIL_SAND=沥青砂提取
+chem.OSMIRIDIUM_DEATH=锇酸溶液生产
 chem.PEROXIDE=过氧化氢生产
 chem.POLYMER=聚合物合成
 chem.PUF6=六氟化钚生产
@@ -262,12 +268,14 @@ container.dfcInjector=DFC燃料喷射器
 container.dfcReceiver=DFC接收器
 container.dfcStabilizer=DFC稳定器
 container.diFurnace=高炉
+container.diFurnaceRTG=核高炉
 container.electricFurnace=电炉
 container.epress=电动锻压机
 container.factoryAdvanced=高级工厂
 container.factoryTitanium=工厂
 container.fluidtank=储罐
 container.forceField=力场发生器
+container.frackingTower=水力压裂塔
 container.fusionMultiblock=大型聚变反应堆
 container.fusionaryWatzPlant=Watz聚变反应堆
 container.gasCentrifuge=气体离心机
@@ -291,7 +299,6 @@ container.machineShredder=粉碎机
 container.machineSILEX=SILEX激光同位素分离室
 container.machineTurbine=汽轮机
 container.machineTurbofan=涡扇发动机
-container.machine_deuterium=氘提取器
 container.machine_schrabidium_transmutator=Sa326嬗变装置
 container.microwave=微波炉
 container.miningDrill=自动采矿钻机
@@ -326,6 +333,7 @@ container.rbmkControlAuto=RBMK石墨式反应堆自动控制棒
 container.rbmkOutgasser=RBMK石墨式反应堆辐照通道
 container.rbmkReaSim=RBMK石墨式反应堆燃料棒 (ReaSim)
 container.rbmkRod=RBMK石墨式反应堆燃料棒
+container.rbmkStorage=RBMK 燃料存储棒
 container.reactor=增殖反应堆
 container.reactorControl=反应堆遥控模块
 container.reactorLarge=大型核反应堆
@@ -353,6 +361,7 @@ container.turretTauon=陶子发射器炮塔“陶恩”
 container.uf6_tank=六氟化铀储罐
 container.wasteDrum=乏燃料池
 container.watzPowerplant=Watz发电厂
+container.zirnox=锆诺克斯核反应堆
 death.attack.acid=%1$s 掉进了酸里
 death.attack.ams=%1$s 沐浴在尚未被人类科学命名的致命粒子中
 death.attack.amsCore=%1$s 在奇点之火中蒸发
@@ -405,6 +414,11 @@ death.attack.taint=%1$s 死于恶性肿瘤
 death.attack.tau=%1$s 被 %2$s 用带负电荷的陶子射穿
 death.attack.tauBlast=%1$s 对XVL1456充能时间过长，被炸成碎片
 death.attack.teleporter=%1$s 被传送到虚空
+desc.item.rtgHeat=功率级别：%s
+desc.gui.rtgBFurnace.desc=处理$金-198需要至少15热量。此外，热量越多，运行速度越快$金-198可能会衰变为水银
+desc.gui.rtgBFurnace.heat=§e当前热级别：%s
+desc.gui.rtgBFurnace.pellets=接受的靶丸：
+desc.gui.rtgBFurnace.pellet=%s（%s热量）
 digamma.playerDigamma=玩家F-迪伽马辐照水平:
 digamma.playerHealth=玩家所受F-迪伽马辐照影响:
 digamma.playerRes=玩家F-迪伽马防护水平:
@@ -462,6 +476,11 @@ hazard.particleCoarse=空气微粒
 hazard.particleFine=微粒
 hazard.sand=眼睛刺激物
 hbm.key=HBM的核科技mod 热键
+hbm.key.craneLoad=装卸起重机
+hbm.key.craneMoveDown=向后移动起重机
+hbm.key.craneMoveLeft=向左移动起重机
+hbm.key.craneMoveRight=向右移动起重机
+hbm.key.craneMoveUp=向前移动起重机
 hbm.key.toggleBack=开关 喷气背包
 hbm.key.toggleHUD=开关 HUD
 hbm.key.reload=装弹
@@ -472,24 +491,31 @@ hbmfluid.balefire=野火火箭燃料
 hbmfluid.biofuel=生物燃料
 hbmfluid.biogas=沼气
 hbmfluid.bitumen=沥青
+hbmfluid.carbondioxide=二氧化碳
 hbmfluid.coolant=冷却液
 hbmfluid.cryogel=冷凝胶
+hbmfluid.death=锇酸溶液
 hbmfluid.deuterium=氘
 hbmfluid.diesel=柴油
+hbmfluid.ethanol=乙醇
+hbmfluid.fracksol=压裂液
 hbmfluid.gas=天然气
 hbmfluid.gasoline=含铅汽油
 hbmfluid.heatingoil=燃油
 hbmfluid.heavyoil=重油
+hbmfluid.heavywater=重水
+hbmfluid.helium3=氦-3
 hbmfluid.hotoil=热原油
 hbmfluid.hotsteam=热蒸汽
 hbmfluid.hydrogen=液氢
 hbmfluid.kerosene=煤油
 hbmfluid.lava=岩浆
 hbmfluid.lightoil=轻油
+hbmfluid.lpg=液化石油气
 hbmfluid.lubricant=润滑油
 hbmfluid.mercury=水银
 hbmfluid.naphtha=石脑油
-hbmfluid.nitan=NITAN©100号超级燃料
+hbmfluid.nitan=NITAN牌100号超级燃料
 hbmfluid.none=无
 hbmfluid.oil=原油
 hbmfluid.oxygen=液氧
@@ -616,7 +642,7 @@ item.ammo_556_k.name=5.56mm空包弹
 item.ammo_556_phosphorus.name=5.56mm子弹[白磷]
 item.ammo_556_sleek.name=5.56mm子弹[IF-R&D]
 item.ammo_556_star.name=5.56mm子弹 [星辉]
-item.ammo_556_tracer.name=5.56mm Round[曳光弹]
+item.ammo_556_tracer.name=5.56mm 子弹[曳光弹]
 item.ammo_5mm.name=5mm子弹
 item.ammo_5mm_chlorophyte.name=5mm子弹[叶绿]
 item.ammo_5mm_du.name=5mm子弹[贫铀]
@@ -720,7 +746,7 @@ item.apple_schrabidium.name=Sa326苹果
 item.arc_electrode.name=石墨电极
 item.arc_electrode_burnt.name=熔化电极
 item.arc_electrode_desh.name=Desh电极
-item.armor_polish.name=亮甲?装甲抛光剂
+item.armor_polish.name=亮甲牌装甲抛光剂
 item.asbestos_boots.name=防火靴
 item.asbestos_cloth.name=防火布
 item.asbestos_helmet.name=防火头盔
@@ -806,12 +832,15 @@ item.billet_australium.name=奥斯坯料
 item.billet_australium_greater.name=富集奥斯坯料
 item.billet_australium_lesser.name=贫化奥斯坯料
 item.billet_balefire_gold.name=激活态金-198坯料
+item.billet_beryllium.name=铍坯料
+item.billet_bismuth.name=铋坯料
 item.billet_co60.name=钴-60坯料
 item.billet_hes.name=高浓缩度Sa326燃料坯料
 item.billet_les.name=低浓缩度Sa326燃料坯料
 item.billet_mox_fuel.name=MOX燃料坯料
 item.billet_neptunium.name=镎坯料
 item.billet_neptunium_fuel.name=镎核燃料坯料
+item.billet_nuclear_waste.name=核废料坯料
 item.billet_po210be.name=钋210-铍坯料
 item.billet_polonium.name=钋坯料
 item.billet_pu_mix.name=反应堆级钋坯料
@@ -822,6 +851,7 @@ item.billet_pu240.name=钚240坯料
 item.billet_pu241.name=钚-241坯料
 item.billet_plutonium.name=钚坯料
 item.billet_plutonium_fuel.name=钚燃料坯料
+item.billet_ra226.name=镭-226坯料
 item.billet_ra226be.name=镭226-铍坯料
 item.billet_schrabidium.name=Sa326坯料
 item.billet_schrabidium_fuel.name= Sa326燃料坯料
@@ -834,7 +864,11 @@ item.billet_u235.name=铀235坯料
 item.billet_u238.name=铀238坯料
 item.billet_uranium.name=铀坯料
 item.billet_uranium_fuel.name=铀燃料坯料
-item.billet_yharonite.name=Yharonite坯料
+item.billet_yharonite.name=犽戎龙素坯料
+item.billet_zfb_am_mix.name=反应器级镅 ZFB坯料
+item.billet_zfb_bismuth.name=铋 ZFB坯料
+item.billet_zfb_pu241.name=钚-241 ZFB坯料
+item.billet_zirconium.name=锆坯料
 item.biomass.name=生物质
 item.biomass_compressed.name=压缩生物质
 item.bismuth_pickaxe.name=铋镐
@@ -913,6 +947,8 @@ item.canister_biofuel.name=桶装生物燃料
 item.canister_bitumen.name=桶装沥青
 item.canister_canola.name=桶装润滑油
 item.canister_empty.name=空油桶
+item.canister_ethanol.name=桶装乙醇
+item.canister_fracksol.name=桶装压裂液
 item.canister_fuel.name=桶装柴油
 item.canister_gasoline.name=桶装含铅汽油
 item.canister_gasoline.desc=铅就是朋友$让朋友进入你的血液$*上膛声*现在就做
@@ -937,7 +973,7 @@ item.canned_diesel.name=柴油
 item.canned_fist.name=拳头罐头
 item.canned_fried.name=炸鸡罐头
 item.canned_hotdogs.name=热狗罐头
-item.canned_jizz.name=FlimFlam工业™ 马奶罐头
+item.canned_jizz.name=FlimFlam工业牌 马奶罐头
 item.canned_kerosene.name=煤油罐头
 item.canned_leftovers.name=剩菜罐头
 item.canned_milk.name=罐装炼乳
@@ -1000,6 +1036,7 @@ item.chemistry_template.name=化工厂模板:
 item.chernobylsign.name=辐射警告标志战斧
 item.chlorine_pinwheel.name=氯气转轮
 item.chlorophyte_pickaxe.name=叶绿镐
+item.chocolate.name=“我是-镭牌”巧克力
 item.chocolate_milk.name=巧克力牛奶
 item.chopper.name=猎人直升机
 item.chopper_blades.name=猎人直升机旋翼
@@ -1008,6 +1045,7 @@ item.chopper_head.name=猎人直升机驾驶舱
 item.chopper_tail.name=猎人直升机尾部
 item.chopper_torso.name=猎人直升机主体
 item.chopper_wing.name=猎人直升机翼片
+item.cigarette.name=FFI牌香烟
 item.cinnebar.name=朱砂
 item.circuit_aluminium.name=基础电路
 item.circuit_bismuth.name=多功能芯片组
@@ -1129,6 +1167,7 @@ item.crystal_lead.name=铅晶体
 item.crystal_lapis.name=青金石晶体
 item.crystal_lithium.name=锂晶体
 item.crystal_niter.name=硝石晶体
+item.crystal_osmiridium.name=锇晶体
 item.crystal_phosphorus.name=磷晶体
 item.crystal_plutonium.name=钚晶体
 item.crystal_rare.name=稀土晶体
@@ -1153,9 +1192,13 @@ item.custom_nuke.name=自定义核弹-铀棒
 item.custom_schrab.name=自定义核弹-Sa326棒
 item.custom_tnt.name=自定义核弹-炸药
 item.cyclotron_tower.name=回旋加速器塔
+item.debris_concrete.name=碎混凝土
+item.debris_element.name=断裂的锆诺克斯燃料元件
+item.debris_exchanger.name=换热器片
 item.debris_fuel.name=RBMK石墨式反应堆燃料块
 item.debris_graphite.name=热石墨块
 item.debris_metal.name=断裂金属棒
+item.debris_shrapnel.name=走道碎片
 item.definitelyfood.name=完全不脏牌军粮
 item.defuser.name=高科技拆弹装置
 item.demon_core_closed.name=封闭的恶魔核心
@@ -1173,6 +1216,7 @@ item.detonator_de.name=死亡炸弹
 item.detonator_deadman.name=死亡雷管
 item.detonator_laser.name=激光起爆器
 item.detonator_multi.name=多发起爆器
+item.deuterium_filter.name=氘过滤器
 item.diamond_gavel.name=钻石槌
 item.digamma_diagnostic.name=玩家F-迪伽马辐射自检器
 item.dns_boots.name=DNT双聚中子态素高科技全环境作战服靴子
@@ -1245,8 +1289,14 @@ item.fluid_barrel_full.name=流体桶:
 item.fluid_barrel_infinite.name=无限流体桶
 item.fluid_duct.name=流体管道:
 item.fluid_identifier.name=流体识别码
+item.fluid_identifier.info=流体标识码用于：
+item.fluid_identifier.usage0=在流体管道上单击右键，为该管道指定运输的流体。
+item.fluid_identifier.usage1=按住Shift键并流体管道上单击右键以指定相邻管道
+item.fluid_identifier.usage2=最大范围为64格管道。
 item.fluid_tank_empty.name=空通用流体罐
 item.fluid_tank_full.name=通用流体罐:
+item.fluid_tank_lead_empty.name=空危险品罐
+item.fluid_tank_lead_full.name=危险品罐：
 item.fluorite.name=氟石粉
 item.flywheel_beryllium.name=铍制飞轮
 item.fmn.name=氟硝西泮片
@@ -1282,6 +1332,7 @@ item.gadget_wireing.name=线路
 item.gas_biogas.name=沼气罐
 item.gas_empty.name=空气罐
 item.gas_full.name=天然气罐
+item.gas_lpg.name=液化石油气罐
 item.gas_mask.name=防毒面具
 item.gas_mask_filter.name=防毒面具过滤器
 item.gas_mask_filter_combo.name=防毒面具组合式过滤器
@@ -1290,7 +1341,7 @@ item.gas_mask_filter_piss.name=先进的简易防毒面具过滤器
 item.gas_mask_filter_rag.name=临时防毒面具过滤器
 item.gas_mask_m65.name=M65-Z防毒面具
 item.gas_mask_mono.name=防一氧化碳面罩
-item.gas_mask_olde.name=Leather Gas Mask
+item.gas_mask_olde.name=皮革防毒面具
 item.gas_petroleum.name=石油气罐
 item.geiger_counter.name=手持盖革计数器
 item.gem_tantalium.name=钽晶体
@@ -1513,6 +1564,7 @@ item.ingot_americium_fuel.name=镅燃料锭
 item.ingot_asbestos.name=石棉板
 item.ingot_au198.name=金-198锭
 item.ingot_australium.name=奥斯锭
+item.ingot_bakelite.name=电木锭
 item.ingot_beryllium.name=铍锭
 item.ingot_bismuth.name=铋锭
 item.ingot_boron.name=硼锭
@@ -1540,6 +1592,7 @@ item.ingot_mox_fuel.name=MOX燃料锭
 item.ingot_neptunium.name=镎锭
 item.ingot_neptunium_fuel.name=白磷锭
 item.ingot_niobium.name=铌锭
+item.ingot_osmiridium.name=锇锭
 item.ingot_phosphorus.name=白磷锭
 item.ingot_plutonium.name=钚锭
 item.ingot_plutonium_fuel.name=钚燃料锭
@@ -1550,6 +1603,7 @@ item.ingot_pu238.name=钚238锭
 item.ingot_pu239.name=钚239锭
 item.ingot_pu240.name=钚240锭
 item.ingot_pu241.name=钚-241锭
+item.ingot_ra226.name=镭-226锭
 item.ingot_red_copper.name=紫铜
 item.ingot_reiium.name=雷恩锭
 item.ingot_saturnite.name=土星锭
@@ -1592,7 +1646,11 @@ item.insert_sapi.name=SAPI插板
 item.insert_polonium.name=钋插板
 item.insert_steel.name=重型钢插板
 item.insert_xsapi.name=XSAPI插板
-item.insert_yharonite.name=Yharonite插板
+item.insert_yharonite.name=犽戎龙素插板
+item.iv_blood.name=血袋
+item.iv_empty.name=静脉输液袋
+item.iv_xp.name=经验包
+item.iv_xp_empty.name=空的经验包
 item.jackt.name=时尚防弹夹克
 item.jackt2.name=时尚防弹夹克2：东京漂移
 item.jetpack_boost.name=弹跳背包
@@ -1656,6 +1714,7 @@ item.memespoon.name=§ee花园园丁
 item.memory.name=item.null.name
 item.mese_gavel.name=Mese槌
 item.mese_pickaxe.name=Mese镐
+item.meteor_charm.name=陨石项链
 item.meteor_remote.name=陨石召唤器
 item.meteorite_sword.name=陨石剑
 item.meteorite_sword_seared.name=陨石剑(烧焦)
@@ -1702,6 +1761,7 @@ item.missile_nuclear.name=核导弹
 item.missile_nuclear_cluster.name=热核导弹
 item.missile_rain.name=炸弹雨
 item.missile_schrabidium.name=Sa326导弹
+item.missile_shuttle.name=万金罗宾航天飞机
 item.missile_skin_camo.name=导弹外壳:迷彩
 item.missile_skin_desert.name=导弹外壳:沙漠迷彩
 item.missile_skin_flames.name=导弹外壳:火焰
@@ -1839,6 +1899,7 @@ item.mp_warhead_15_n2.name=15号N2炸弹
 item.mp_warhead_15_nuclear.name=15号核弹头
 item.mp_warhead_15_nuclear_shark.name=15号核弹头
 item.mp_warhead_15_turbine.name=15号喷气发动机弹头
+item.mucho_mango.name=亚利桑那芒果味饮料
 item.multi_kit.name=多用途炸弹 套件
 item.multitool_beam.name=动力拳套[热射线]
 item.multitool_decon.name=动力拳套[净化]
@@ -1892,6 +1953,7 @@ item.nugget_mercury.name=一滴水银
 item.nugget_mox_fuel.name=MOX燃料粒
 item.nugget_neptunium.name=镎粒
 item.nugget_neptunium_fuel.name=镎燃料粒
+item.nugget_osmiridium.name=锇粒
 item.nugget_plutonium.name=钚粒
 item.nugget_plutonium_fuel.name=钚燃料粒
 item.nugget_polonium.name=钋粒
@@ -1987,9 +2049,12 @@ item.pellet_mes.name=MES Watz靶丸
 item.pellet_meteorite.name=陨石弹丸
 item.pellet_neptunium.name=镎Watz靶丸
 item.pellet_rtg.name=钚238放射性同位素燃料靶丸
+item.pellet_rtg_actinium.name=锕放射性同位素燃料靶丸
 item.pellet_rtg_americium.name=镅-241放射性同位素燃料靶丸
+item.pellet_rtg_berkelium.name=锫放射性同位素燃料靶丸
 item.pellet_rtg_gold.name=金-198放射性同位素燃料靶丸
 item.pellet_rtg_polonium.name=钋210放射性同位素燃料靶丸
+item.pellet_rtg_strontium.name=锶-90放射性同位素燃料靶丸
 item.pellet_rtg_weak.name=贫铀放射性同位素燃料靶丸
 item.pellet_schrabidium.name=纯Sa326Watz靶丸
 item.photo_panel.name=光伏板
@@ -2001,6 +2066,7 @@ item.pill_iodine.name=碘丸
 item.pin.name=发夹
 item.pipes_steel.name=钢管
 item.pipes_steel.desc=为了避免合成冲突,所以造价如此高昂
+item.pirfenidone.name=吡咯菲酮
 item.piston_selenium.name=星型发动机活塞
 item.plan_c.name=C计划
 item.plate_advanced_alloy.name=高级合金板
@@ -2062,7 +2128,7 @@ item.powder_cs137_tiny.name=小撮铯-137粉
 item.powder_daffergon.name=达夫贡粉
 item.powder_desh.name=Desh粉
 item.powder_desh_mix.name=Desh混合物
-item.powder_desh_ready.name=DeshReady™混合物
+item.powder_desh_ready.name=DeshReady混合物
 item.powder_diamond.name=钻石粉
 item.powder_dineutronium.name=双聚中子态素粉
 item.powder_dura_steel.name=高速钢粉
@@ -2073,6 +2139,7 @@ item.powder_gold.name=金粉
 item.powder_i131.name=碘-131粉
 item.powder_i131_tiny.name=小撮碘-131粉
 item.powder_ice.name=冷冻粉
+item.powder_impure_osmiridium.name=不纯锇粉
 item.powder_iodine.name=碘粉
 item.powder_iron.name=铁粉
 item.powder_lanthanium.name=镧粉
@@ -2092,12 +2159,15 @@ item.powder_neptunium.name=镎粉
 item.powder_niobium.name=铌粉
 item.powder_niobium_tiny.name=小撮铌粉
 item.powder_nitan_mix.name=Nitan混合物
+item.powder_paleogenite.name=古近纪岩石粉末
+item.powder_paleogenite_tiny.name=小撮古近纪岩石粉末
 item.powder_plutonium.name=钚粉
 item.powder_poison.name=剧毒粉
 item.powder_polonium.name=钋粉
 item.powder_polymer.name=聚合物粉
 item.powder_power.name=能量粉
 item.powder_quartz.name=石英粉
+item.powder_ra226.name=镭-226粉
 item.powder_red_copper.name=紫铜粉
 item.powder_reiium.name=雷恩粉
 item.powder_schrabidate.name=Sa酸铁粉
@@ -2109,6 +2179,7 @@ item.powder_steel_tiny.name=小撮钢粉
 item.powder_strontium.name=锶粉
 item.powder_tantalium.name=钽粉
 item.powder_tcalloy.name=锝-钢粉
+item.powder_tektite.name=熔融石粉
 item.powder_tennessine.name=Ts粉
 item.powder_thermite.name=铝热剂
 item.powder_thorium.name=钍粉
@@ -2127,6 +2198,7 @@ item.primer_44.name=.44马格南底火[x24]
 item.primer_50.name=大口径底火[x12]
 item.primer_9.name=小口径底火[x32]
 item.primer_buckshot.name=鹿弹底火[x12]
+item.protection_charm.name=守护项链
 item.prototype_kit.name=原型 套件
 item.pudding.name=布丁
 item.quartz_plutonium.name=深成石英
@@ -2165,6 +2237,9 @@ item.rbmk_fuel_pu238be.name=钚238-铍 RBMK反应堆中子源
 item.rbmk_fuel_ra226be.name=镭226-铍 RBMK反应堆中子源
 item.rbmk_fuel_thmeu.name=ThMEU RBMK反应堆中浓缩度铀-235导向钍燃料棒
 item.rbmk_fuel_ueu.name=NU RBMK反应堆未浓缩铀燃料棒
+item.rbmk_fuel_zfb_am_mix.name=ZFB 燃料级镅RBMK反应堆燃料棒
+item.rbmk_fuel_zfb_bismuth.name=ZFB 铋RBMK反应堆燃料棒
+item.rbmk_fuel_zfb_pu241.name=ZFB Pu-241RBMK反应堆燃料棒
 item.rbmk_lid.name=RBMK反应堆覆盖层
 item.rbmk_lid_glass.name=RBMK反应堆玻璃覆盖层
 item.rbmk_pellet_balefire.name=野火燃料芯块
@@ -2194,6 +2269,9 @@ item.rbmk_pellet_pu238be.name=钚238-铍 中子源芯块
 item.rbmk_pellet_ra226be.name=镭226-铍 中子源芯块
 item.rbmk_pellet_thmeu.name=ThMEU 浓缩度铀-235导向钍燃料芯块
 item.rbmk_pellet_ueu.name=未浓缩铀燃料芯块
+item.rbmk_pellet_zfb_am_mix.name=ZFB 燃料级镅燃料芯块
+item.rbmk_pellet_zfb_bismuth.name=ZFB 铋燃料芯块
+item.rbmk_pellet_zfb_pu241.name=ZFB 钚-241燃料芯块
 item.rbmk_tool.name=RBMK石墨式反应堆控制台连接装置
 item.rbmk_tool.desc=按住Shift右击RBMK石墨式反应堆保存其坐标,$按住Shift右击控制台以连接反应堆!
 item.rbmk_tool.linked=反应堆坐标已记录!
@@ -2228,18 +2306,18 @@ item.rod_dual_coolant.name=双联燃料棒[冷却液]
 item.rod_dual_empty.name=空双联燃料棒
 item.rod_dual_lead.name=双联铅棒
 item.rod_dual_lithium.name=双联锂棒
-item.rod_dual_mox_fuel.name=双联MOX燃料棒
-item.rod_dual_mox_fuel_depleted.name=枯竭MOX燃料棒
+item.rod_dual_mox_fuel.name=核反应堆 双联MOX燃料棒
+item.rod_dual_mox_fuel_depleted.name=核反应堆 枯竭MOX燃料棒
 item.rod_dual_neptunium.name=双联镎燃料棒
 item.rod_dual_plutonium.name=双联钚棒
-item.rod_dual_plutonium_fuel.name=双联钚燃料棒
-item.rod_dual_plutonium_fuel_depleted.name=双联枯竭钚燃料棒
+item.rod_dual_plutonium_fuel.name=核反应堆 双联钚燃料棒
+item.rod_dual_plutonium_fuel_depleted.name=核反应堆 双联枯竭钚燃料棒
 item.rod_dual_polonium.name=双联钋棒
 item.rod_dual_pu238.name=双联钚238燃料棒
 item.rod_dual_pu239.name=双联钚239燃料棒
 item.rod_dual_pu240.name=双联钚240燃料棒
 item.rod_dual_schrabidium.name=双联Sa326燃料棒
-item.rod_dual_schrabidium_fuel.name=双联Sa326燃料棒
+item.rod_dual_schrabidium_fuel.name=核反应堆 双联Sa326燃料棒
 item.rod_dual_schrabidium_fuel_depleted.name=双联枯竭Sa326燃料棒
 item.rod_dual_solinium.name=双联Sa327燃料棒
 item.rod_dual_th232.name=双联钍232燃料棒
@@ -2250,21 +2328,21 @@ item.rod_dual_u233.name=双联铀233燃料棒
 item.rod_dual_u235.name=双联铀235燃料棒
 item.rod_dual_u238.name=双联铀238燃料棒
 item.rod_dual_uranium.name=双联铀棒
-item.rod_dual_uranium_fuel.name=双联铀燃料棒
-item.rod_dual_uranium_fuel_depleted.name=双联枯竭铀燃料棒
+item.rod_dual_uranium_fuel.name=核反应堆 双联铀燃料棒
+item.rod_dual_uranium_fuel_depleted.name=核反应堆 双联枯竭铀燃料棒
 item.rod_dual_waste.name=双联核废料棒
 item.rod_dual_water.name=双联燃料棒[水]
 item.rod_empty.name=空燃料棒
 item.rod_euphemium.name=Ep棒
 item.rod_lead.name=铅棒
 item.rod_lithium.name=锂棒
-item.rod_mox_fuel.name=MOX燃料棒
-item.rod_mox_fuel_depleted.name=枯竭MOX燃料棒
+item.rod_mox_fuel.name=核反应堆 MOX燃料棒
+item.rod_mox_fuel_depleted.name=核反应堆 枯竭MOX燃料棒
 item.rod_neptunium.name=镎燃料棒
 item.rod_of_discord.name=混沌传送杖
 item.rod_plutonium.name=钚棒
-item.rod_plutonium_fuel.name=钚燃料棒
-item.rod_plutonium_fuel_depleted.name=枯竭钚燃料棒
+item.rod_plutonium_fuel.name=核反应堆 钚燃料棒
+item.rod_plutonium_fuel_depleted.name=核反应堆 枯竭钚燃料棒
 item.rod_polonium.name=钋棒
 item.rod_pu238.name=钚238燃料棒
 item.rod_pu239.name=钚239燃料棒
@@ -2276,8 +2354,8 @@ item.rod_quad_empty.name=空四联燃料棒
 item.rod_quad_euphemium.name=枯竭的四联Sa326燃料棒
 item.rod_quad_lead.name=四联铅棒
 item.rod_quad_lithium.name=四联锂棒
-item.rod_quad_mox_fuel.name=四联MOX燃料棒
-item.rod_quad_mox_fuel_depleted.name=枯竭MOX燃料棒
+item.rod_quad_mox_fuel.name=核反应堆 四联MOX燃料棒
+item.rod_quad_mox_fuel_depleted.name=核反应堆 枯竭MOX燃料棒
 item.rod_quad_neptunium.name=四联镎燃料棒
 item.rod_quad_plutonium.name=四联钚棒
 item.rod_quad_plutonium_fuel.name=四联钚燃料棒
@@ -2287,41 +2365,61 @@ item.rod_quad_pu238.name=四联钚238燃料棒
 item.rod_quad_pu239.name=四联钚239燃料棒
 item.rod_quad_pu240.name=四联钚240燃料棒
 item.rod_quad_schrabidium.name=四联Sa326燃料棒
-item.rod_quad_schrabidium_fuel.name=四联Sa326燃料棒
-item.rod_quad_schrabidium_fuel_depleted.name=四联枯竭Sa326燃料棒
+item.rod_quad_schrabidium_fuel.name=核反应堆 四联Sa326燃料棒
+item.rod_quad_schrabidium_fuel_depleted.name=核反应堆 四联枯竭Sa326燃料棒
 item.rod_quad_solinium.name=四联Sa327燃料棒
 item.rod_quad_th232.name=四联钍232燃料棒
-item.rod_quad_thorium_fuel.name=四联钍燃料棒
+item.rod_quad_thorium_fuel.name=核反应堆 四联钍燃料棒
 item.rod_quad_thorium_fuel_depleted.name=四联枯竭钍燃料棒
 item.rod_quad_tritium.name=四联氚燃料棒
 item.rod_quad_u233.name=四联铀233燃料棒
 item.rod_quad_u235.name=四联铀235燃料棒
 item.rod_quad_u238.name=四联铀238燃料棒
 item.rod_quad_uranium.name=四联铀棒
-item.rod_quad_uranium_fuel.name=四联铀燃料棒
+item.rod_quad_uranium_fuel.name=核反应堆 四联铀燃料棒
 item.rod_quad_uranium_fuel_depleted.name=四联枯竭铀燃料棒
 item.rod_quad_waste.name=四联核废料棒
 item.rod_quad_water.name=四联燃料棒[水]
 item.rod_reiium.name=雷恩棒
 item.rod_schrabidium.name=Sa326燃料棒
 item.rod_schrabidium_fuel.name=Sa326燃料棒
-item.rod_schrabidium_fuel_depleted.name=枯竭Sa326燃料棒
+item.rod_schrabidium_fuel_depleted.name=核反应堆 枯竭Sa326燃料棒
 item.rod_solinium.name=Sa327燃料棒
 item.rod_th232.name=钍232燃料棒
 item.rod_thorium_fuel.name=钍燃料棒
-item.rod_thorium_fuel_depleted.name=枯竭钍燃料棒
+item.rod_thorium_fuel_depleted.name=核反应堆 枯竭钍燃料棒
 item.rod_tritium.name=氚燃料棒
 item.rod_u233.name=铀233燃料棒
 item.rod_u235.name=铀235燃料棒
 item.rod_u238.name=铀238燃料棒
 item.rod_unobtainium.name=难得素棒
 item.rod_uranium.name=铀棒
-item.rod_uranium_fuel.name=铀燃料棒
-item.rod_uranium_fuel_depleted.name=枯竭铀燃料棒
+item.rod_uranium_fuel.name=核反应堆 铀燃料棒
+item.rod_uranium_fuel_depleted.name=核反应堆 枯竭铀燃料棒
 item.rod_verticium.name=韦德赛棒
 item.rod_waste.name=核废料棒
 item.rod_water.name=燃料棒[水]
 item.rod_weidanium.name=魏丹棒
+item.rod_zirnox_empty.name=空锆诺克斯燃料棒
+item.rod_zirnox_natural_uranium_fuel.name=锆诺克斯 天然铀燃料棒
+item.rod_zirnox_uranium_fuel.name=锆诺克斯 铀燃料棒
+item.rod_zirnox_th232.name=锆诺克斯 钍-232燃料棒
+item.rod_zirnox_thorium_fuel.name=锆诺克斯 钍燃料棒
+item.rod_zirnox_mox_fuel.name=锆诺克斯  MOX燃料棒
+item.rod_zirnox_plutonium_fuel.name=锆诺克斯 钚燃料棒
+item.rod_zirnox_u233_fuel.name=锆诺克斯 铀-233燃料棒
+item.rod_zirnox_u235_fuel.name=锆诺克斯 铀-235燃料棒
+item.rod_zirnox_les_fuel.name=锆诺克斯  LES低浓度Sa326燃料棒
+item.rod_zirnox_lithium.name=锆诺克斯 锂燃料棒
+item.rod_zirnox_tritium.name=锆诺克斯 氚燃料棒
+item.rod_zirnox_natural_uranium_fuel_depleted.name=锆诺克斯 枯竭天然铀燃料棒
+item.rod_zirnox_uranium_fuel_depleted.name=锆诺克斯 枯竭铀燃料棒
+item.rod_zirnox_thorium_fuel_depleted.name=锆诺克斯 枯竭钍燃料棒
+item.rod_zirnox_mox_fuel_depleted.name=锆诺克斯 枯竭MOX燃料棒
+item.rod_zirnox_plutonium_fuel_depleted.name=锆诺克斯 枯竭钚燃料棒
+item.rod_zirnox_u233_fuel_depleted.name=锆诺克斯 枯竭铀-233燃料棒
+item.rod_zirnox_u235_fuel_depleted.name=锆诺克斯 枯竭铀-235燃料棒
+item.rod_zirnox_les_fuel_depleted.name=锆诺克斯 枯竭LES低浓度Sa326燃料棒
 item.rotor_steel.name=大型钢转子
 item.rtg_unit.name=放射性同位素单元
 item.rune_blank.name=空白催化剂基质
@@ -2343,6 +2441,7 @@ item.sat_head_resonator.name=Xenium共振器
 item.sat_head_scanner.name=M700测量扫描仪
 item.sat_interface.name=卫星操作接口
 item.sat_laser.name=轨道死光炮
+item.sat_lunar_miner.name=月球采矿飞船
 item.sat_mapper.name=地表测绘卫星
 item.sat_miner.name=小行星采矿飞船
 item.sat_radar.name=雷达探测卫星
@@ -2360,6 +2459,7 @@ item.schrabidium_plate.name=Sa326胸甲
 item.schrabidium_shovel.name=Sa326锹
 item.schrabidium_sword.name=Sa326剑
 item.scrap.name=废料
+item.scrap_nuclear.name=放射性废料
 item.screwdriver.name=螺丝刀
 item.scrumpy.name=一瓶烈性苹果酒
 item.security_boots.name=防护靴子
@@ -2400,6 +2500,10 @@ item.stamp_357.name=.357马格南锻模
 item.stamp_44.name=.44马格南锻模
 item.stamp_50.name=大口径锻模
 item.stamp_9.name=小口径锻模
+item.stamp_desh_circuit.name=Desh电路版锻模
+item.stamp_desh_flat.name=Desh锻模
+item.stamp_desh_plate.name=Desh板锻模
+item.stamp_desh_wire.name=Desh电线锻模
 item.stamp_iron_circuit.name=铁质电路版锻模
 item.stamp_iron_flat.name=铁质锻模
 item.stamp_iron_plate.name=铁质板锻模
@@ -2575,12 +2679,18 @@ item.warhead_thermo_exo.name=放热弹头
 item.warhead_volcano.name=构造弹头
 item.waste_mox.name=枯竭MOX燃料
 item.waste_mox_hot.name=枯竭MOX燃料[热]
+item.waste_natural_uranium.name=枯竭天然铀燃料
+item.waste_natural_uranium_hot.name=枯竭天然铀燃料[热]
 item.waste_plutonium.name=枯竭钚燃料
 item.waste_plutonium_hot.name=枯竭钚燃料[热]
 item.waste_schrabidium.name=枯竭Sa326燃料
 item.waste_schrabidium_hot.name=枯竭Sa326燃料[热]
 item.waste_thorium.name=枯竭钍燃料
 item.waste_thorium_hot.name=枯竭钍燃料[热]
+item.waste_u235.name=枯竭铀-235燃料
+item.waste_u235_hot.name=枯竭铀-235燃料[热]
+item.waste_u233.name=枯竭铀-233燃料
+item.waste_u233_hot.name=枯竭铀-233燃料[热]
 item.waste_uranium.name=枯竭铀燃料
 item.waste_uranium_hot.name=枯竭铀燃料[热]
 item.watch.name=破旧怀表
@@ -2680,7 +2790,7 @@ tile.barbed_wire_wither.name=凋零铁丝网
 tile.barrel_antimatter.name=磁约束反物质容器
 tile.barrel_corroded.name=被腐蚀的桶
 tile.barrel_iron.name=铁桶
-tile.barrel_plastic.name=安全桶™
+tile.barrel_plastic.name=安全桶?
 tile.barrel_steel.name=钢桶
 tile.barrel_tcalloy.name=锝-钢合金桶
 tile.barricade.name=沙袋
@@ -2755,6 +2865,7 @@ tile.block_pu_mix.name=反应堆级钚块
 tile.block_pu238.name=钚238块
 tile.block_pu239.name=钚239块
 tile.block_pu240.name=钚240块
+tile.block_ra226.name=镭-226块
 tile.block_red_copper.name=紫铜块
 tile.block_red_phosphorus.name=红磷块
 tile.block_reiium.name=雷恩块
@@ -2792,6 +2903,7 @@ tile.block_white_phosphorus.name=白磷块
 tile.block_yellowcake.name=黄饼块
 tile.block_zirconium.name=锆块
 tile.boat.name=船
+tile.bobblehead.name=Bob的魔法娃娃
 tile.bomb_multi.name=多功能炸弹
 tile.bomber.name=坠毁轰炸机
 tile.book_guide.name=HBM的核科技mod手册[遗留]
@@ -2803,7 +2915,7 @@ tile.brick_concrete_broken.name=破混凝土砖块
 tile.brick_concrete_cracked.name=裂混凝土砖块
 tile.brick_concrete_marked.name=标记混凝土砖
 tile.brick_concrete_mossy.name=苔混凝土砖块
-tile.brick_ducrete.name=Ducrete 砖
+tile.brick_ducrete.name=高密度贫铀混凝土砖块
 tile.brick_dungeon.name=硒铜砖
 tile.brick_dungeon_circle.name=圆环硒铜块
 tile.brick_dungeon_flat.name=硒铜块
@@ -2820,6 +2932,7 @@ tile.brick_jungle_trap.name=陷阱硫砷钢砖块
 tile.brick_light.name=轻质砖块
 tile.brick_obsidian.name=黑曜石砖块
 tile.broadcaster_pc.name=腐败广播
+tile.burning_earth.name=燃烧草地
 tile.cable_switch.name=电源开关
 tile.cheater_virus.name=冻结Ep
 tile.cheater_virus_seed.name=不稳定Ep Schrabide块
@@ -2918,9 +3031,11 @@ tile.dfc_emitter.name=DFC发射器
 tile.dfc_injector.name=DFC燃料喷射器
 tile.dfc_receiver.name=DFC接收器
 tile.dfc_stabilizer.name=DFC稳定器
+tile.dirt_dead.name=泥渣
+tile.dirt_oily.name=油泥
 tile.drill_pipe.name=钻杆
-tile.ducrete.name=Ducrete 瓷砖
-tile.ducrete_smooth.name=Ducrete
+tile.ducrete.name=高密度贫铀混凝土瓷砖
+tile.ducrete_smooth.name=高密度贫铀混凝土
 tile.dummy_block.name=虚拟方块
 tile.dummy_port.name=虚拟方块[电力接口]
 tile.dungeon_chain.name=金属链
@@ -2944,7 +3059,7 @@ tile.flame_war.name=盒中论战
 tile.float_bomb.name=悬浮炸弹
 tile.fluid_duct.name=通用流体管道
 tile.foam_layer.name=泡沫层
-tile.fraction_spacer.name=分馏塔分离器
+tile.fraction_spacer.name=分馏塔分隔器
 tile.frozen_dirt.name=冰冻土
 tile.frozen_grass.name=冰冻草
 tile.frozen_log.name=冰冻原木
@@ -2969,6 +3084,7 @@ tile.gas_duct.name=输气管道
 tile.gas_duct_solid.name=密封输气管
 tile.gas_explosive.name=爆炸性气体
 tile.gas_flammable.name=可燃气体
+tile.gas_meltdown.name=熔毁气体
 tile.gas_monoxide.name=一氧化碳
 tile.gas_radon.name=氡气
 tile.gas_radon_dense.name=高浓度氡气
@@ -3045,6 +3161,7 @@ tile.machine_boiler_electric_off.name=电锅炉
 tile.machine_boiler_electric_on.name=电锅炉
 tile.machine_boiler_off.name=锅炉
 tile.machine_boiler_on.name=锅炉
+tile.machine_catalytic_cracker.name=催化裂化塔
 tile.machine_centrifuge.name=离心机
 tile.machine_chemplant.name=化工厂
 tile.machine_chungus.name=“利维坦”巨型汽轮机
@@ -3058,10 +3175,13 @@ tile.machine_converter_rf_he.name=RF→HE转换器
 tile.machine_crystallizer.name=矿物酸化器
 tile.machine_cyclotron.name=回旋加速器
 tile.machine_detector.name=功率检测器
-tile.machine_deuterium.name=氘提取器
+tile.machine_deuterium_extractor.name=氘提取器
+tile.machine_deuterium_tower.name=氘萃取塔
 tile.machine_diesel.name=柴油发电机
 tile.machine_difurnace_off.name=高炉
 tile.machine_difurnace_on.name=高炉
+tile.machine_difurnace_rtg_off.name=核高炉
+tile.machine_difurnace_rtg_on.name=核高炉
 tile.machine_dineutronium_battery.name=Spark蓄电池
 tile.machine_drill.name=自动采矿钻机
 tile.machine_electric_furnace_off.name=电炉
@@ -3072,6 +3192,7 @@ tile.machine_flare.name=高架火炬
 tile.machine_fluidtank.name=储罐
 tile.machine_forcefield.name=力场发生器
 tile.machine_fraction_tower.name=分馏塔
+tile.machine_fracking_tower.name=水力压裂塔
 tile.machine_gascent.name=气体离心机
 tile.machine_generator.name=核反应堆[旧]
 tile.machine_geo.name=地热发电机
@@ -3131,6 +3252,7 @@ tile.machine_turbofan.name=涡扇发动机
 tile.machine_uf6_tank.name=六氟化铀储罐
 tile.machine_waste_drum.name=乏燃料池
 tile.machine_well.name=钻油塔
+tile.machine_zirnox.name=锆诺克斯核反应堆
 tile.marker_structure.name=多方块结构信标
 tile.meteor_battery.name=星辉静电发生器
 tile.meteor_brick.name=陨石砖
@@ -3144,6 +3266,7 @@ tile.mine_ap.name=反步兵地雷
 tile.mine_fat.name=核地雷
 tile.mine_he.name=反坦克地雷
 tile.mine_shrap.name=破片地雷
+tile.moon_turf.name=月壤
 tile.mud_block.name=毒泥
 tile.muffler.name=消声器
 tile.mush.name=发光真菌
@@ -3167,6 +3290,7 @@ tile.ore_aluminium.name=铝矿石
 tile.ore_asbestos.name=石棉矿
 tile.ore_australium.name=奥斯矿石
 tile.ore_bedrock_coltan.name=基岩钶钽铁矿
+tile.ore_bedrock_oil.name=基岩油层
 tile.ore_beryllium.name=铍矿石
 tile.ore_cinnebar.name=朱砂矿石
 tile.ore_coal_oil.name=含油煤矿石
@@ -3219,6 +3343,7 @@ tile.ore_rare.name=稀土矿石
 tile.ore_reiium.name=雷恩矿石
 tile.ore_schrabidium.name=Sa326矿石
 tile.ore_sulfur.name=硫磺矿石
+tile.ore_tektite_osmiridium.name=渗锇熔融石
 tile.ore_thorium.name=钍矿石
 tile.ore_tikite.name=赛瑞克矿石
 tile.ore_titanium.name=钛矿石
@@ -3249,9 +3374,11 @@ tile.rbmk_absorber.name=RBMK反应堆硼中子吸收器
 tile.rbmk_blank.name=RBMK反应堆结构柱
 tile.rbmk_boiler.name=RBMK反应堆蒸汽管道
 tile.rbmk_console.name=RBMK石墨式反应堆控制台
+tile.rbmk_cooler.name=RBMK冷却器
 tile.rbmk_control.name=RBMK反应堆控制棒
 tile.rbmk_control_auto.name=RBMK反应堆自动控制棒
 tile.rbmk_control_mod.name= RBMK反应堆慢化控制棒
+tile.rbmk_crane_console.name=RBMK起重机控制台
 tile.rbmk_loader.name=RBMK反应堆蒸汽导出器
 tile.rbmk_moderator.name=RBMK反应堆石墨慢化剂
 tile.rbmk_outgasser.name=RBMK反应堆辐照通道
@@ -3262,6 +3389,7 @@ tile.rbmk_rod_reasim.name= RBMK反应堆燃料棒(ReaSim)
 tile.rbmk_rod_reasim_mod.name= RBMK反应堆慢化燃料棒(ReaSim)
 tile.rbmk_steam_inlet.name=RBMK ReaSim进水口
 tile.rbmk_steam_outlet.name=RBMK ReaSim蒸汽出口
+tile.rbmk_storage.name=RBMK燃料棒存储棒
 tile.reactor_computer.name=反应堆控制器
 tile.reactor_conductor.name=反应堆锅炉
 tile.reactor_control.name=控制棒
@@ -3271,10 +3399,11 @@ tile.reactor_hatch.name=反应堆端口
 tile.reactor_inserter.name=反应堆燃料插入器
 tile.red_barrel.name=炸药桶
 tile.red_cable.name=紫铜电线
+tile.red_connector.name=电力连接器
 tile.red_pylon.name=电线杆
 tile.red_wire_coated.name=密封紫铜电缆
 tile.reinforced_brick.name=强化石头
-tile.reinforced_ducrete.name=加固 Ducrete
+tile.reinforced_ducrete.name=加固高密度贫铀混凝土
 tile.reinforced_glass.name=强化玻璃
 tile.reinforced_lamp_off.name=强化红石灯
 tile.reinforced_lamp_on.name=强化红石灯
@@ -3286,6 +3415,8 @@ tile.residue.name=云残留
 tile.safe.name=保险箱
 tile.sand_boron.name=硼砂
 tile.sand_boron_layer.name=硼砂层
+tile.sand_dirty.name=油砂
+tile.sand_dirty_red.name=红色油砂
 tile.sand_gold.name=金沙
 tile.sand_gold198.name=金-198沙
 tile.sand_lead.name=铅沙
@@ -3324,6 +3455,7 @@ tile.steel_wall.name=钢墙
 tile.stone_depth.name=深层岩石
 tile.stone_depth_nether.name=下界深层岩石
 tile.stone_gneiss.name=石墨页岩
+tile.stone_porous.name=多孔石
 tile.struct_iter_core.name=聚变反应堆核心组件
 tile.struct_launcher.name=发射台部件
 tile.struct_launcher_core.name=紧凑型发射台核心组件
@@ -3334,6 +3466,7 @@ tile.struct_soyuz_core.name=联盟号发射器核心组件
 tile.taint.name=腐质
 tile.taint_barrel.name=IMP残渣桶
 tile.tape_recorder.name=录音机
+tile.tektite.name=熔融石
 tile.tesla.name=特斯拉线圈
 tile.test_nuke.name=测试核弹
 tile.therm_endo.name=吸热炸弹
@@ -3359,6 +3492,7 @@ tile.turret_richard.name=火箭炮塔“理查德”
 tile.turret_spitfire.name=目前没有名字[开发中]
 tile.turret_tau.name=陶子炮塔
 tile.turret_tauon.name=XVL1456原型陶子发射器炮塔"陶恩"
+tile.vacuum.name=真空
 tile.vault_door.name=避难所防爆门
 tile.vent_chlorine.name=氯气排气口
 tile.vent_chlorine_seal.name=氯气容器
@@ -3368,6 +3502,7 @@ tile.vitrified_barrel.name=玻璃化核废料桶
 tile.volcanic_lava_block.name=火山熔岩
 tile.volcano_core.name=火山核心
 tile.waste_earth.name=死亡草地
+tile.waste_leaves.name=枯叶
 tile.waste_log.name=烧焦原木
 tile.waste_mycelium.name=发光菌丝
 tile.waste_planks.name=烧焦木板
@@ -3384,7 +3519,7 @@ tile.yellow_barrel.name=核废料桶
 trait.asbestos=石棉
 trait.blinding=致盲
 trait.breeding=可在增殖反应堆中工作 %s 次
-trait.coal=Coal Dust
+trait.coal=煤尘
 trait.digamma=迪伽马辐射
 trait.drop=掉落物危险
 trait.explosive=高度易燃/易爆