shit nobody asked for

changelog

@@ -8,9 +8,16 @@
   * An inline conveyor machine similar to the splitter, receives items from conveyors (but not from ejectors directly) and outputs them on its built-in conveyor belt
 
 ## Changed
-* The mandatory washing step for bedrock ore byproducts now needs 4 items for sulfuric, 12 for dissolved and 24 for cleaned byproducts (isntead of just one)
+* Updated russian localization
+* The mandatory washing step for bedrock ore byproducts now needs 4 items for sulfuric, 12 for dissolved and 24 for cleaned byproducts (instead of just one)
   * This should offset the exponentially increasing amount of byproduct created from processing bedrock ore which ends up being far greater than the primary product
+* The sound extension is now configurable, and the amount of sound channels reserved is now 200 by default instead of 1000, this should fix an issue where OC's sound would not work
+* Logistics drones are now crafted with standard transport drones and not express ones, making them substantially cheaper
+* Added strontium to the rare earth bedrock ore chain
 
 ## Fixed
-* Added a write lock o cellular dungeons while generating, fixing a crash caused by dungeons that generate next to each other due to cascading worldgen
+* Added a write lock on cellular dungeons while generating, fixing a crash caused by dungeons that generate next to each other due to cascading worldgen
 * Added recipe caching to the arc furnace, fixing an issue where recipe detection and item IO are horribly inefficient
+* Fixed arc furnace state not properly saving after performing a recipe
+* Fixed crash regarding OC compat
+* Fixed a rare crash with the anvil GUI

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -1099,7 +1099,6 @@ public class ModBlocks {
 	public static Block rbmk_loader;
 	public static Block rbmk_steam_inlet;
 	public static Block rbmk_steam_outlet;
-	public static Block rbmk_heatex;
 	public static Block pribris;
 	public static Block pribris_burning;
 	public static Block pribris_radiating;
@@ -2128,7 +2127,6 @@ public class ModBlocks {
 		rbmk_loader = new RBMKLoader(Material.iron).setBlockName("rbmk_loader").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_loader");
 		rbmk_steam_inlet = new RBMKInlet(Material.iron).setBlockName("rbmk_steam_inlet").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_steam_inlet");
 		rbmk_steam_outlet = new RBMKOutlet(Material.iron).setBlockName("rbmk_steam_outlet").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_steam_outlet");
-		rbmk_heatex = new RBMKHeatex(Material.iron).setBlockName("rbmk_heatex").setCreativeTab(null).setHardness(50.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":rbmk_heatex");
 		pribris = new RBMKDebris().setBlockName("pribris").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris");
 		pribris_burning = new RBMKDebrisBurning().setBlockName("pribris_burning").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris_burning");
 		pribris_radiating = new RBMKDebrisRadiating().setBlockName("pribris_radiating").setCreativeTab(MainRegistry.machineTab).setHardness(50.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_debris_radiating");
@@ -3113,7 +3111,6 @@ public class ModBlocks {
 		register(rbmk_loader);
 		register(rbmk_steam_inlet);
 		register(rbmk_steam_outlet);
-		GameRegistry.registerBlock(rbmk_heatex, rbmk_heatex.getUnlocalizedName());
 		GameRegistry.registerBlock(pribris, pribris.getUnlocalizedName());
 		GameRegistry.registerBlock(pribris_burning, pribris_burning.getUnlocalizedName());
 		GameRegistry.registerBlock(pribris_radiating, pribris_radiating.getUnlocalizedName());

src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeatex.java

@@ -1,18 +0,0 @@
-package com.hbm.blocks.machine.rbmk;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-public class RBMKHeatex extends BlockContainer {
-
-	public RBMKHeatex(Material mat) {
-		super(mat);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return null;
-	}
-}

src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java

@@ -5,7 +5,6 @@ import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
-import com.hbm.items.tool.ItemDrone;
 import com.hbm.main.MainRegistry;
 
 import net.minecraft.entity.Entity;

src/main/java/com/hbm/inventory/OreDictManager.java

@@ -168,6 +168,8 @@ public class OreDictManager {
 	public static final DictFrame BBRONZE = new DictFrame("BismuthBronze");
 	/** ARSENIC BRONZE */
 	public static final DictFrame ABRONZE = new DictFrame("ArsenicBronze");
+	/** BISMUTH STRONTIUM CALCIUM COPPER OXIDE */
+	public static final DictFrame BSCCO = new DictFrame("BSCCO");
 	/** LEAD */ 
 	public static final DictFrame PB = new DictFrame("Lead");
 	public static final DictFrame BI = new DictFrame("Bismuth");
@@ -281,6 +283,7 @@ public class OreDictManager {
 	/*
 	 * FISSION FRAGMENTS
 	 */
+	public static final DictFrame SR = new DictFrame("Strontium");
 	public static final DictFrame SR90 = new DictFrame("Strontium90", "Sr90");
 	public static final DictFrame I131 = new DictFrame("Iodine131", "I131");
 	public static final DictFrame XE135 = new DictFrame("Xenon135", "Xe135");
@@ -376,6 +379,7 @@ public class OreDictManager {
 		CDALLOY																.ingot(ingot_cdalloy)																												.block(block_cdalloy);
 		BBRONZE																.ingot(ingot_bismuth_bronze);
 		ABRONZE																.ingot(ingot_arsenic_bronze);
+		BSCCO																.ingot(ingot_bscco);
 		PB			.nugget(nugget_lead)									.ingot(ingot_lead)													.dust(powder_lead)				.plate(plate_lead)				.block(block_lead)			.ore(ore_lead);
 		BI			.nugget(nugget_bismuth)		.billet(billet_bismuth)		.ingot(ingot_bismuth)												.dust(powder_bismuth)											.block(block_bismuth);
 		AS			.nugget(nugget_arsenic)									.ingot(ingot_arsenic);
@@ -474,6 +478,7 @@ public class OreDictManager {
 		/*
 		 * FISSION FRAGMENTS
 		 */
+		SR									.hot(1F)	.hydro(1F)									.dust(powder_strontium);
 		SR90	.rad(HazardRegistry.sr90)	.hot(1F)	.hydro(1F)	.dustSmall(powder_sr90_tiny)	.dust(powder_sr90)	.ingot(ingot_sr90)	.billet(billet_sr90)	.nugget(nugget_sr90);
 		I131	.rad(HazardRegistry.i131)	.hot(1F)				.dustSmall(powder_i131_tiny)	.dust(powder_i131);
 		XE135	.rad(HazardRegistry.xe135)	.hot(10F)				.dustSmall(powder_xe135_tiny)	.dust(powder_xe135);

src/main/java/com/hbm/inventory/material/Mats.java

@@ -111,6 +111,7 @@ public class Mats {
 	public static final NTMMaterial MAT_BORON		= makeSmeltable(500,		B,			0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(DUSTTINY, INGOT, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_ZIRCONIUM	= makeSmeltable(4000,		ZR,			0xE3DCBE, 0x3E3719, 0xADA688).setShapes(NUGGET, WIRE, DUSTTINY, BILLET, INGOT, DUST, CASTPLATE, WELDEDPLATE, BLOCK).m();
 	public static final NTMMaterial MAT_SODIUM		= makeSmeltable(1100,		NA,			0xD3BF9E, 0x3A5A6B, 0x7E9493).setShapes(DUST).m();
+	public static final NTMMaterial MAT_STRONTIUM	= makeSmeltable(3800,		SR,			0xF1E8BA, 0x271E00, 0xCAC193).setShapes(DUST).m();
 	public static final NTMMaterial MAT_CALCIUM		= makeSmeltable(2000,		CA,			0xCFCFA6, 0x747F6E, 0xB7B784).setShapes(INGOT, DUST).m();
 	public static final NTMMaterial MAT_LITHIUM		= makeSmeltable(300,		LI,			0xFFFFFF, 0x818181, 0xD6D6D6).setShapes(INGOT, DUST, BLOCK).m();
 	public static final NTMMaterial MAT_CADMIUM		= makeSmeltable(4800,		CD,			0xFFFADE, 0x350000, 0xA85600).setShapes(INGOT, DUST).m();
@@ -130,6 +131,7 @@ public class Mats {
 	public static final NTMMaterial MAT_CDALLOY		= makeSmeltable(_AS + 13,	CDALLOY,	0xF7DF8F, 0x604308, 0xFBD368).setShapes(INGOT, CASTPLATE, WELDEDPLATE, HEAVY_COMPONENT).m();
 	public static final NTMMaterial MAT_BBRONZE		= makeSmeltable(_AS + 16,	BBRONZE,	0xE19A69, 0x485353, 0x987D65).setShapes(INGOT, CASTPLATE).m();
 	public static final NTMMaterial MAT_ABRONZE		= makeSmeltable(_AS + 17,	ABRONZE,	0xDB9462, 0x203331, 0x77644D).setShapes(INGOT, CASTPLATE).m();
+	public static final NTMMaterial MAT_BSCCO		= makeSmeltable(_AS + 18,	BSCCO,		0x767BF1, 0x000000, 0x5E62C0).setShapes(INGOT, DENSEWIRE).m();
 	public static final NTMMaterial MAT_MAGTUNG		= makeSmeltable(_AS + 8,	MAGTUNG,	0x22A2A2, 0x0F0F0F, 0x22A2A2).setShapes(WIRE, INGOT, DUST, DENSEWIRE, BLOCK).m();
 	public static final NTMMaterial MAT_CMB			= makeSmeltable(_AS + 9,	CMB,		0x6F6FB4, 0x000011, 0x6F6FB4).setShapes(INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, BLOCK).m();
 	public static final NTMMaterial MAT_DNT			= makeSmeltable(_AS + 15,	DNT,		0x7582B9, 0x16000E, 0x455289).setShapes(INGOT, DUST, DENSEWIRE, BLOCK).m();

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

@@ -112,6 +112,10 @@ public class CrucibleRecipes extends SerializableRecipe {
 				.inputs(new MaterialStack(Mats.MAT_TUNGSTEN, i), new MaterialStack(Mats.MAT_SCHRABIDIUM, n * 1))
 				.outputs(new MaterialStack(Mats.MAT_MAGTUNG, i)));
 		
+		recipes.add(new CrucibleRecipe(17, "crucible.bscco", 3, new ItemStack(ModItems.ingot_bscco))
+				.inputs(new MaterialStack(Mats.MAT_BISMUTH, n * 2), new MaterialStack(Mats.MAT_STRONTIUM, n * 2), new MaterialStack(Mats.MAT_CALCIUM, n * 2), new MaterialStack(Mats.MAT_COPPER, n * 3))
+				.outputs(new MaterialStack(Mats.MAT_BSCCO, i)));
+		
 		registerMoldsForNEI();
 	}
 

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

@@ -91,6 +91,19 @@ public class SolderingRecipes extends SerializableRecipe {
 						new OreDictStack(PB.wireFine(), 12)}
 		));
 		
+		recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.QUANTUM.ordinal()), 400, 100_000,
+				new FluidStack(Fluids.RADIOSOLVENT, 1_000),
+				new AStack[] {
+						new ComparableStack(ModItems.circuit, 4, EnumCircuitType.CHIP_QUANTUM),
+						new ComparableStack(ModItems.circuit, lbsm ? 4 : 16, EnumCircuitType.CHIP_BISMOID),
+						new ComparableStack(ModItems.circuit, lbsm ? 1 : 4, EnumCircuitType.ATOMIC_CLOCK)},
+				new AStack[] {
+						new ComparableStack(ModItems.circuit, 16, EnumCircuitType.PCB),
+						new OreDictStack(ANY_HARDPLASTIC.ingot(), 4)},
+				new AStack[] {
+						new OreDictStack(PB.wireFine(), 16)}
+		));
+		
 		/*
 		 * COMPUTERS
 		 */
@@ -110,14 +123,25 @@ public class SolderingRecipes extends SerializableRecipe {
 		recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER_ADVANCED.ordinal()), 600, 25_000,
 				new AStack[] {
 						new ComparableStack(ModItems.circuit, lbsm ? 8 : 16, EnumCircuitType.CHIP_BISMOID),
-						new ComparableStack(ModItems.circuit, lbsm ? 16 : 48, EnumCircuitType.CAPACITOR),
+						new ComparableStack(ModItems.circuit, lbsm ? 16 : 48, EnumCircuitType.CAPACITOR_TANTALIUM),
-						new ComparableStack(ModItems.circuit, lbsm ? 8 : 32, EnumCircuitType.CAPACITOR_TANTALIUM)},
+						new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ATOMIC_CLOCK)},
 				new AStack[] {
 						new ComparableStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER_CHASSIS),
 						new ComparableStack(ModItems.upgrade_speed_3)},
 				new AStack[] {
 						new OreDictStack(PB.wireFine(), 24)}
 		));
+		recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER_QUANTUM.ordinal()), 600, 250_000,
+				new AStack[] {
+						new ComparableStack(ModItems.circuit, lbsm ? 8 : 16, EnumCircuitType.CHIP_QUANTUM),
+						new ComparableStack(ModItems.circuit, lbsm ? 16 : 48, EnumCircuitType.CHIP_BISMOID),
+						new ComparableStack(ModItems.circuit, lbsm ? 1 : 8, EnumCircuitType.ATOMIC_CLOCK)},
+				new AStack[] {
+						new ComparableStack(ModItems.circuit, 2, EnumCircuitType.CONTROLLER_ADVANCED),
+						new ComparableStack(ModItems.upgrade_overdrive_1)},
+				new AStack[] {
+						new OreDictStack(PB.wireFine(), 32)}
+		));
 
 		/*
 		 * UPGRADES

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

@@ -148,6 +148,7 @@ public class ModItems {
 	public static Item ingot_cdalloy;
 	public static Item ingot_bismuth_bronze;
 	public static Item ingot_arsenic_bronze;
+	public static Item ingot_bscco;
 	public static Item lithium;
 	public static Item ingot_zirconium;
 	public static Item ingot_hes;
@@ -2568,6 +2569,7 @@ public class ModItems {
 		ingot_cdalloy = new Item().setUnlocalizedName("ingot_cdalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cdalloy");
 		ingot_bismuth_bronze = new Item().setUnlocalizedName("ingot_bismuth_bronze").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth_bronze");
 		ingot_arsenic_bronze = new Item().setUnlocalizedName("ingot_arsenic_bronze").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_arsenic_bronze");
+		ingot_bscco = new Item().setUnlocalizedName("ingot_bscco").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bscco");
 
 		niter = new Item().setUnlocalizedName("niter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":salpeter");
 		ingot_copper = new Item().setUnlocalizedName("ingot_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_copper");
@@ -5663,6 +5665,7 @@ public class ModItems {
 		GameRegistry.registerItem(ingot_cdalloy, ingot_cdalloy.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_bismuth_bronze, ingot_bismuth_bronze.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_arsenic_bronze, ingot_arsenic_bronze.getUnlocalizedName());
+		GameRegistry.registerItem(ingot_bscco, ingot_bscco.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_lead, ingot_lead.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_bismuth, ingot_bismuth.getUnlocalizedName());
 		GameRegistry.registerItem(ingot_arsenic, ingot_arsenic.getUnlocalizedName());

src/main/java/com/hbm/items/machine/ItemCircuit.java

@@ -23,18 +23,22 @@ public class ItemCircuit extends ItemEnumMulti {
 		list.add(new ItemStack(item, 1, EnumCircuitType.VACUUM_TUBE.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR_TANTALIUM.ordinal()));
+		list.add(new ItemStack(item, 1, EnumCircuitType.ATOMIC_CLOCK.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.PCB.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.SILICON.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CHIP.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CHIP_BISMOID.ordinal()));
+		list.add(new ItemStack(item, 1, EnumCircuitType.CHIP_QUANTUM.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.ANALOG.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.BASIC.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.ADVANCED.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR_BOARD.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.BISMOID.ordinal()));
+		list.add(new ItemStack(item, 1, EnumCircuitType.QUANTUM.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER_CHASSIS.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER.ordinal()));
 		list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER_ADVANCED.ordinal()));
+		list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER_QUANTUM.ordinal()));
 	}
 
 	public static enum EnumCircuitType {
@@ -53,6 +57,10 @@ public class ItemCircuit extends ItemEnumMulti {
 		CONTROLLER_CHASSIS,
 		CONTROLLER,
 		CONTROLLER_ADVANCED,
+		QUANTUM,
+		CHIP_QUANTUM,
+		CONTROLLER_QUANTUM,
+		ATOMIC_CLOCK,
 	}
 	
 	@Override

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

@@ -120,7 +120,7 @@ public class ItemBedrockOreNew extends Item {
 		//												primary						sulfuric						solvent							radsolvent
 		LIGHT_METAL(	0xFFFFFF, 0x353535, "light",	IRON, CU,					TI, AL, AL,						CHLOROCALCITE, LI, NA,			CHLOROCALCITE, LI, NA),
 		HEAVY_METAL(	0x868686, 0x000000, "heavy",	W, PB,						GOLD, GOLD, BE,					W, PB, GOLD,					BI, BI, GOLD),
-		RARE_EARTH(		0xE6E6B6, 0x1C1C00, "rare",		CO, EnumChunkType.RARE,		B, LA, NB,						ND, B, ZR,						CO, ND, ZR),
+		RARE_EARTH(		0xE6E6B6, 0x1C1C00, "rare",		CO, EnumChunkType.RARE,		B, LA, NB,						ND, SR, ZR,						CO, ND, SR),
 		ACTINIDE(		0xC1C7BD, 0x2B3227, "actinide",	U, TH232,					RA226, RA226, PO210,			RA226, RA226, PO210,			TC99, TC99, U238),
 		NON_METAL(		0xAFAFAF, 0x0F0F0F, "nonmetal",	COAL, S,					LIGNITE, KNO, F,				P_RED, F, S,					CHLOROCALCITE, SI, SI),
 		CRYSTALLINE(	0xE2FFFA, 0x1E8A77, "crystal",	DIAMOND, SODALITE,			CINNABAR, ASBESTOS, REDSTONE,	CINNABAR, ASBESTOS, EMERALD,	BORAX, MOLYSITE, SODALITE);

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

@@ -124,7 +124,10 @@ public class CraftingManager {
 		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), new Object[] { "I", "S", "W", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'W', GOLD.wireFine() });
 		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), new Object[] { "III", "SNS", "WWW", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'N', ANY_BISMOID.nugget(), 'W', CU.wireFine() });
 		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), new Object[] { "III", "SNS", "WWW", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'N', ANY_BISMOID.nugget(), 'W', GOLD.wireFine() });
+		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_QUANTUM), new Object[] { "HHH", "SIS", "WWW", 'H', ANY_HARDPLASTIC.ingot(), 'S', BSCCO.wireDense(), 'I', ModItems.pellet_charged, 'W', CU.wireFine() });
+		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_QUANTUM), new Object[] { "HHH", "SIS", "WWW", 'H', ANY_HARDPLASTIC.ingot(), 'S', BSCCO.wireDense(), 'I', ModItems.pellet_charged, 'W', GOLD.wireFine() });
 		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), new Object[] { "PPP", "CBB", "PPP", 'P', ANY_PLASTIC.ingot(), 'C', ModItems.crt_display, 'B', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.PCB) });
+		addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ATOMIC_CLOCK), new Object[] { "ICI", "CSC", "ICI", 'I', ModItems.plate_polymer, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'S', SR.dust() });
 		
 		addRecipeAuto(new ItemStack(ModItems.crt_display, 4), new Object[] { " A ", "SGS", " T ", 'A', AL.dust(), 'S', STEEL.plate(), 'G', KEY_ANYPANE, 'T', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE) });
 		
@@ -993,7 +996,7 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()), new Object[] { " P ", "KDK", " P ", 'P', TI.plateWelded(), 'K', Fluids.KEROSENE.getDict(1_000), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) });
 		addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_CHUNKLOADING.ordinal()) });
 		addShapelessAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()), new Object[] { new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS_CHUNKLOADING.ordinal()) });
-		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL_EXPRESS.ordinal()) });
+		addRecipeAuto(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), new Object[] { "E", "D", 'E', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'D', new ItemStack(ModItems.drone, 1, EnumDroneType.PATROL.ordinal()) });
 
 		addRecipeAuto(new ItemStack(ModItems.drone_linker), new Object[] { "T", "C", 'T', ModBlocks.drone_waypoint, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) });
 		addRecipeAuto(new ItemStack(ModBlocks.drone_waypoint, 4), new Object[] { "G", "T", "C", 'G', KEY_GREEN, 'T', Blocks.redstone_torch, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC) });

src/main/java/com/hbm/main/MainRegistry.java

@@ -1341,6 +1341,7 @@ public class MainRegistry {
 		ignoreMappings.add("hbm:tile.ore_verticium");
 		ignoreMappings.add("hbm:item.warhead_mirvlet");
 		ignoreMappings.add("hbm:item.generator_front");
+		ignoreMappings.add("hbm:tile.rbmk_heatex");
 		
 		/// REMAP ///
 		remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

src/main/java/com/hbm/main/ModEventHandler.java

@@ -51,8 +51,6 @@ import com.hbm.items.armor.ItemArmorMod;
 import com.hbm.items.armor.ItemModRevive;
 import com.hbm.items.armor.ItemModShackles;
 import com.hbm.items.food.ItemConserve.EnumFoodType;
-import com.hbm.items.special.ItemBedrockOreBase;
-import com.hbm.items.special.ItemBedrockOreNew.BedrockOreType;
 import com.hbm.items.tool.ItemGuideBook.BookType;
 import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.lib.HbmCollection;
@@ -123,7 +121,6 @@ import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.FoodStats;
 import net.minecraft.util.MathHelper;
-import net.minecraft.util.StatCollector;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;

src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java

@@ -132,6 +132,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl
 							if(this.progress >= 1F) {
 								this.process();
 								this.progress = 0;
+								this.markDirty();
 								this.delay = (int) (120 / (upgrade * 0.5 + 1));
 								PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, 10F);
 							}

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java

@@ -33,7 +33,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java

@@ -11,7 +11,6 @@ import li.cil.oc.api.machine.Context;
 import li.cil.oc.api.network.SimpleComponent;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
-import net.minecraftforge.common.util.ForgeDirection;
 
 @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")})
 public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase implements SimpleComponent, CompatHandler.OCComponent {

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java

@@ -17,7 +17,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.List;
 

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java

@@ -29,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java

@@ -27,7 +27,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")})
 public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implements IRBMKFluxReceiver, IFluidStandardSender, SimpleComponent, CompatHandler.OCComponent {

src/main/java/com/hbm/tileentity/network/TileEntityDroneWaypoint.java

@@ -3,7 +3,6 @@ package com.hbm.tileentity.network;
 import java.util.List;
 
 import com.hbm.entity.item.EntityDeliveryDrone;
-import com.hbm.tileentity.INBTPacketReceiver;
 import com.hbm.util.ParticleUtil;
 import com.hbm.packet.BufPacket;
 import com.hbm.packet.PacketDispatcher;

src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java

@@ -11,7 +11,6 @@ import li.cil.oc.api.machine.Arguments;
 import li.cil.oc.api.machine.Callback;
 import li.cil.oc.api.machine.Context;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.util.ForgeDirection;
 

src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java

@@ -54,7 +54,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;

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

@@ -457,12 +457,14 @@ container.zirnox=ZIRNOX Atomreaktor
 crucible.aa=Herstellung - Fortgeschrittene Legierung
 crucible.abronze=Herstellung - Arsennronze
 crucible.bbronze=Herstellung - Bismutbronze
+crucible.bscco=Herstellung - BSCCO
 crucible.cdalloy=Herstellung - Cadmiumstahl
 crucible.cmb=Herstellung - CMB-Stahl
 crucible.ferro=Herstellung - Ferrouran
 crucible.hematite=Herstellung - Eisen aus Hämatit
 crucible.hss=Herstellung - Schnellarbeitsstahl
 crucible.malachite=Herstellung - Kupfer aus Malachit
+crucible.magtung=Herstellung - Magnetisierter Wolfram
 crucible.redcopper=Herstellung - Roter Kupfer
 crucible.steel=Herstellung - Stahl
 crucible.steelMeteoric=Herstellung - Stahl aus Meteoriteneisen
@@ -809,6 +811,7 @@ hbmmat.bismuth=Bismut
 hbmmat.bismuthbronze=Bismutbronze
 hbmmat.borax=Borax
 hbmmat.boron=Bor
+hbmmat.bscco=BSCCO
 hbmmat.cadmium=Cadmium
 hbmmat.calcium=Kalzium
 hbmmat.carbon=Kohlenstoff
@@ -1563,6 +1566,7 @@ item.cigarette.name=FFI-Markenzigarette
 item.cinnebar.name=Zinnober
 item.circuit.advanced.name=Integrierter Schaltkreis, Militärstandard
 item.circuit.analog.name=Analoger Schaltkreis
+item.circuit.atomic_clock.name=Atomuhr
 item.circuit.basic.name=Integrierter Schaltkreis
 item.circuit.bismoid.name=Vielfältiger Schaltkreis
 item.circuit.capacitor.name=Kondensator
@@ -1570,10 +1574,13 @@ item.circuit.capacitor_board.name=Kondensatorboard
 item.circuit.capacitor_tantalium.name=Tantalkondensator
 item.circuit.chip.name=Mikrochip
 item.circuit.chip_bismoid.name=Vielfältiger integrierter Schaltkreis
+item.circuit.chip_quantum.name=Festkörper-Quantenprozessor
 item.circuit.controller.name=Steuereinheit
 item.circuit.controller_advanced.name=Erweiterte Steuereinheit
 item.circuit.controller_chassis.name=Steuereinheitsgehäuse
+item.circuit.controller_quantum.name=Quantencomputer
 item.circuit.pcb.name=Leiterplatte
+item.circuit.quantum.name=Quantenprozessoreinheit
 item.circuit.silicon.name=Bedrucker Siliziumwafer
 item.circuit.vacuum_tube.name=Vakuumröhre
 item.circuit_aluminium.name=Einfacher Schaltkreis
@@ -2214,6 +2221,7 @@ item.ingot_biorubber.name=Latextafel
 item.ingot_bismuth.name=Bismutbarren
 item.ingot_bismuth_bronze.name=Bismutbronzebarren
 item.ingot_boron.name=Borbarren
+item.ingot_bscco.name=BSCCO-Barren
 item.ingot_c4.name=C4-Tafel
 item.ingot_cadmium.name=Cadmiumbarren
 item.ingot_calcium.name=Kalziumbarren

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

@@ -861,6 +861,7 @@ container.zirnox=ZIRNOX Nuclear Reactor
 crucible.aa=Advanced Alloy Production
 crucible.abronze=Arsenic Bronze Production
 crucible.bbronze=Bismuth Bronze Production
+crucible.bscco=BSCCO Production
 crucible.cdalloy=Cadmium Steel Production
 crucible.cmb=CMB Steel Production
 crucible.ferro=Ferrouranium Production
@@ -1518,6 +1519,7 @@ hbmmat.bismuth=Bismuth
 hbmmat.bismuthbronze=Bismuth Bronze
 hbmmat.borax=Borax
 hbmmat.boron=Boron
+hbmmat.bscco=BSCCO
 hbmmat.cadmium=Cadmium
 hbmmat.calcium=Calcium
 hbmmat.carbon=Carbon
@@ -2322,6 +2324,7 @@ item.cigarette.name=FFI-Brand Cigarette
 item.cinnebar.name=Cinnabar
 item.circuit.advanced.name=Military Grade Circuit Board
 item.circuit.analog.name=Analog Circuit Board
+item.circuit.atomic_clock.name=Atomic Clock
 item.circuit.basic.name=Integrated Circuit Board
 item.circuit.bismoid.name=Versatile Circuit Board
 item.circuit.capacitor.name=Capacitor
@@ -2329,10 +2332,13 @@ item.circuit.capacitor_board.name=Capacitor Board
 item.circuit.capacitor_tantalium.name=Tantalium Capacitor
 item.circuit.chip.name=Microchip
 item.circuit.chip_bismoid.name=Versatile Integrated Circuit
+item.circuit.chip_quantum.name=Sold State Quantum Processor
 item.circuit.controller.name=Control Unit
 item.circuit.controller_advanced.name=Advanced Control Unit
 item.circuit.controller_chassis.name=Control Unit Casing
+item.circuit.controller_quantum.name=Quantum Computer
 item.circuit.pcb.name=Printed Circuit Board
+item.circuit.quantum.name=Quantum Processing Unit
 item.circuit.silicon.name=Printed Silicon Wafer
 item.circuit.vacuum_tube.name=Vacuum Tube
 item.circuit_aluminium.name=Basic Circuit
@@ -3015,6 +3021,7 @@ item.ingot_biorubber.name=Latex Bar
 item.ingot_bismuth.name=Bismuth Ingot
 item.ingot_bismuth_bronze.name=Bismuth Bronze Ingot
 item.ingot_boron.name=Boron Ingot
+item.ingot_bscco.name=BSCCO Ingot
 item.ingot_c4.name=Bar of Composition C-4
 item.ingot_cadmium.name=Cadmium Ingot
 item.ingot_calcium.name=Calcium Ingot