aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-02-28 02:04:47 +0100
committerBlood-Asp <bloodasphendrik@gmail.com>2017-02-28 02:04:47 +0100
commit4e043f617b729fec6e011b0840657da434cafd27 (patch)
tree957ccb4fe3decbee1fafb343b4328c968919550e /src
parent815f25d5d6554cb22cdd01babb73dfec7a2d5ef0 (diff)
downloadGT5-Unofficial-4e043f617b729fec6e011b0840657da434cafd27.tar.gz
GT5-Unofficial-4e043f617b729fec6e011b0840657da434cafd27.tar.bz2
GT5-Unofficial-4e043f617b729fec6e011b0840657da434cafd27.zip
Circuit changes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/GT_Mod.java3
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java10
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java10
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java6
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java14
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java25
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java8
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java3
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java8
-rw-r--r--src/main/java/gregtech/common/GT_Pollution.java2
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java3
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java26
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java37
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java174
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java23
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java29
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java182
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java11
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java10
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM_ACTIVE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT_ACTIVE.pngbin0 -> 329 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE_ACTIVE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP.pngbin0 -> 311 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP_ACTIVE.pngbin0 -> 311 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.pngbin0 -> 2437 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/700.pngbin231 -> 1378 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/703.pngbin319 -> 356 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.pngbin348 -> 4051 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.pngbin364 -> 4039 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/710.pngbin223 -> 773 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/711.pngbin223 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/712.pngbin252 -> 750 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/715.pngbin273 -> 555 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/716.pngbin441 -> 663 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/717.pngbin450 -> 997 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/718.pngbin520 -> 1064 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/719.pngbin277 -> 738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/720.pngbin331 -> 708 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/1.pngbin0 -> 773 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/10.pngbin0 -> 663 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/11.pngbin0 -> 1155 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/12.pngbin0 -> 1403 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/13.pngbin0 -> 1378 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/14.pngbin0 -> 1067 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/15.pngbin0 -> 555 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/16.pngbin0 -> 1127 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/17.pngbin0 -> 997 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/18.pngbin0 -> 1150 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/19.pngbin0 -> 1064 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/2.pngbin0 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/20.pngbin0 -> 1175 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/3.pngbin0 -> 750 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/30.pngbin0 -> 985 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/31.pngbin0 -> 1098 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/32.pngbin0 -> 1070 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/33.pngbin0 -> 1182 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/34.pngbin0 -> 1275 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/35.pngbin0 -> 1269 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/4.pngbin0 -> 738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/5.pngbin0 -> 708 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/6.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/700.pngbin0 -> 231 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/701.pngbin0 -> 292 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/703.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/704.pngbin0 -> 315 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/705.pngbin0 -> 348 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/707.pngbin0 -> 375 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/708.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.pngbin0 -> 461 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/710.pngbin0 -> 223 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/711.pngbin0 -> 223 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/712.pngbin0 -> 252 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/713.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/714.pngbin0 -> 461 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/715.pngbin0 -> 273 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/716.pngbin0 -> 441 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/717.pngbin0 -> 450 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.pngbin0 -> 520 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/719.pngbin0 -> 277 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/72.pngbin0 -> 252 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/720.pngbin0 -> 331 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/73.pngbin0 -> 9505 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.pngbin0 -> 321 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/80.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/82.pngbin0 -> 323 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/83.pngbin0 -> 358 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/85.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/86.pngbin0 -> 348 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.pngbin0 -> 4043 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/89.pngbin0 -> 325 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.pngbin0 -> 364 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.pngbin0 -> 4059 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/92.pngbin0 -> 320 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/93.pngbin0 -> 350 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.pngbin0 -> 4062 bytes
130 files changed, 536 insertions, 101 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index ef0635bc2d..734c6b5c4f 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -254,7 +254,8 @@ public class GT_Mod implements IGT_Mod {
gregtechproxy.mExplosionItemDrop = tMainConfig.get("general", "ExplosionItemDrops", false).getBoolean(false);
gregtechproxy.mAddGTRecipesToIC2Machines = tMainConfig.get("general", "AddGTRecipesToIC2Machines", true).getBoolean(true);
gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid");
-
+ gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE) && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true);
+
GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true);
GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false);
GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360);
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 734e68f786..e093815b5b 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -640,7 +640,15 @@ public enum ItemList implements IItemContainer {
ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots,
ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene,
FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4, Hatch_AutoMaintenance,
- Machine_Multi_Cleanroom;
+ Machine_Multi_Cleanroom, Circuit_Board_Coated, Circuit_Board_Phenolic, Circuit_Board_Epoxy, Circuit_Board_Fiberglass, Circuit_Board_Multifiberglass, Circuit_Board_Wetware,
+ Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Vacuum_Tube, Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD,
+ Circuit_Silicon_Ingot, Circuit_Silicon_Ingot2, Circuit_Silicon_Ingot3, Circuit_Silicon_Wafer, Circuit_Silicon_Wafer2, Circuit_Silicon_Wafer3, Circuit_Wafer_ILC, Circuit_Chip_ILC, Circuit_Wafer_Ram, Circuit_Chip_Ram,
+ Circuit_Wafer_NAND, Circuit_Chip_NAND, Circuit_Wafer_NOR, Circuit_Chip_NOR, Circuit_Wafer_CPU, Circuit_Chip_CPU, Circuit_Wafer_SoC, Circuit_Chip_SoC, Circuit_Wafer_SoC2, Circuit_Chip_SoC2, Circuit_Wafer_PIC, Circuit_Chip_PIC,
+ Circuit_Wafer_HPIC, Circuit_Chip_HPIC, Circuit_Wafer_NanoCPU, Circuit_Chip_NanoCPU, Circuit_Wafer_QuantumCPU, Circuit_Chip_QuantumCPU,
+ Circuit_Chip_CrystalCPU, Circuit_Chip_CrystalSoC, Circuit_Chip_NeuroCPU, Circuit_Chip_Stemcell,
+ Circuit_Processor, Circuit_Computer, Circuit_Nanoprocessor, Circuit_Nanocomputer, Circuit_Elitenanocomputer, Circuit_Quantumprocessor, Circuit_Quantumcomputer, Circuit_Masterquantumcomputer,
+ Circuit_Quantummainframe, Circuit_Crystalprocessor, Circuit_Crystalcomputer, Circuit_Crystalmainframe, Circuit_Neuroprocessor, Circuit_Wetwarecomputer, Circuit_Wetwaresupercomputer, Circuit_Wetwaremainframe, Circuit_Parts_RawCrystalChip,
+ Machine_LV_CircuitAssembler, Machine_MV_CircuitAssembler, Machine_HV_CircuitAssembler, Machine_EV_CircuitAssembler, Machine_IV_CircuitAssembler, Machine_LuV_CircuitAssembler, Machine_ZPM_CircuitAssembler, Machine_UV_CircuitAssembler, Circuit_Integrated_Good;
public static final ItemList[]
DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX};
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 85b9130061..6c2135ee44 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -103,7 +103,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Rubidium = new Materials(43, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 240, 30, 30, 0, "Rubidium", "Rubidium", 0, 0, 312, 0, false, false, 4, 1, 1, Dyes.dyeRed, Element.Rb, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1)));
public static Materials Samarium = new Materials(69, TextureSet.SET_METALLIC, 1.0F, 0, 2, 1|2|32, 255, 255, 255, 0, "Samarium", "Samarium", 0, 0, 1345, 1345, true, false, 4, 1, 1, Dyes._NULL, Element.Sm, Arrays.asList(new TC_Aspects.TC_Asp