aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/blocks/BlockCasings8.java2
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java35
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java28
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java24
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java17
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialsElements.java2
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java119
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java13
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.pngbin3300 -> 634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.pngbin1029 -> 1154 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.pngbin113 -> 539 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.pngbin680 -> 915 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.pngbin954 -> 947 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.pngbin736 -> 938 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.pngbin682 -> 909 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.pngbin694 -> 918 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.pngbin652 -> 899 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.pngbin651 -> 894 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.pngbin682 -> 911 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.pngbin2207 -> 813 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.pngbin511 -> 246 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.pngbin251 -> 114 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.pngbin1013 -> 258 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.pngbin399 -> 129 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.pngbin1010 -> 255 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.pngbin398 -> 129 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.pngbin305 -> 524 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.pngbin1243 -> 747 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/electron.pngbin1180 -> 657 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.pngbin1169 -> 669 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/photon.pngbin1089 -> 725 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/proton.pngbin1331 -> 681 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/Blank.pngbin75 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.pngbin1131 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.pngbin492 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.pngbin1222 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.pngbin645 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.pngbin249 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.pngbin1627 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.pngbin557 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.pngbin1869 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.pngbin613 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.pngbin511 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.pngbin1309 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.pngbin492 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.pngbin1617 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.pngbin607 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.pngbin2084 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.pngbin624 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.pngbin1593 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.pngbin562 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.pngbin677 -> 812 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.pngbin647 -> 642 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.pngbin643 -> 647 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.pngbin0 -> 446 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.pngbin378 -> 777 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.pngbin834 -> 748 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.pngbin941 -> 773 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.pngbin754 -> 691 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.pngbin2035 -> 623 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.pngbin2048 -> 610 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.pngbin2039 -> 642 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.pngbin1887 -> 561 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.pngbin1929 -> 648 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.pngbin2060 -> 575 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.pngbin1952 -> 533 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.pngbin2112 -> 655 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.pngbin1156 -> 609 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.pngbin2174 -> 677 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.pngbin533 -> 653 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.pngbin569 -> 700 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.pngbin447 -> 671 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.pngbin448 -> 641 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.pngbin453 -> 612 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.pngbin1220 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.pngbin312 -> 664 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.pngbin493 -> 739 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.pngbin2503 -> 770 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.pngbin532 -> 600 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.pngbin367 -> 585 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.pngbin266 -> 635 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.pngbin285 -> 691 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.pngbin513 -> 599 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.pngbin474 -> 741 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.pngbin469 -> 757 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.pngbin360 -> 639 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.pngbin668 -> 684 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/qft/blank.pngbin0 -> 511 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.pngbin655 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.pngbin3676 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/special/block_3.pngbin535 -> 713 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/special/block_7.pngbin716 -> 602 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.pngbin2112 -> 1275 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta72
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.pngbin750 -> 614 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.pngbin834 -> 638 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.pngbin936 -> 637 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.pngbin764 -> 669 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.pngbin24039 -> 1035 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.pngbin1326 -> 798 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.pngbin1122 -> 646 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.pngbin1045 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.pngbin605 -> 648 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.pngbin627 -> 651 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.pngbin633 -> 634 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.pngbin646 -> 652 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.pngbin622 -> 652 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/1.pngbin1327 -> 631 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/2.pngbin1335 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/3.pngbin1340 -> 620 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/4.pngbin1306 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/5.pngbin1302 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/6.pngbin1338 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/7.pngbin1317 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/8.pngbin1402 -> 624 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/9.pngbin1183 -> 621 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/0.pngbin112 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/1.pngbin146 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/IonBase.pngbin1789 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion0.pngbin0 -> 684 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion1.pngbin0 -> 761 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemAirFilter.pngbin1469 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemAirFilter1.pngbin0 -> 591 bytes
-rw-r--r--