aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/GregTech_API.java
AgeCommit message (Collapse)Author
2022-06-24Silicon change (#953)Martin Robertz
* remove autogenerated recipes (electrolyzer) * change Silicon to Raw Silicon add Silicone SG and EG for Solar Panels and circuits add new materials fro Silicon Line * add more materials and recipes fro Silicon line * add more materials for silicon line add more recipes * re arranged materials and add it to material builder change gases (cherry picked from commit 2706242d1d41221eaf2311d7f05a3f6c1358feb0) * derp (cherry picked from commit 208fc734f474eda26364e8e3c345969b0f57032d) * change famular add recipes that use all Quartz variants (SiO2) Add ebf Si recipes with all quartz variants change tep to 2273k (2000°C) (cherry picked from commit 0a9fc9f8aeddd19918e2ccb4d2d41bbbaf9c3b18) * Add new Blocks doe Sieg and Sisg move cryolite to metal blocks change Boule recipes to use new SI variants (cherry picked from commit 26074610edaf62c891953a2005948ef1716a3bcd) * Add new Blocks doe Sieg and Sisg move cryolite to metal blocks change Boule recipes to use new SI variants (cherry picked from commit aa0d37acc501ff6151cd46a759386e424a41a573) * rename sisg and sieg (cherry picked from commit 55f81a2418bf76cbed4d8e6b1db37ce22d0a8729) * re enable electrolyzer autogenerated recipes * add Formular to Quartz (cherry picked from commit 57057fb4f3892911e4ef7f5bd7c3be09edecebd5) * add centrifuge recipes to brick dust add Quartz dust to BBF recipes (Ferrosilite) change Lava recipe output dust instead of small dust Add Quartz dust to Chalcopyrite EBF recipes (cherry picked from commit dfe920ebba18bc7d330a8c9ae5dc00b01c2f7bb6) * add new materials for Silicon line add fluid to Hexachlorodisilane add mor si line recipes * Committer: Martin Robertz fix broken recipes set output fluids and items to 6 * add a way to electrolyze Dichlorosilan (cherry picked from commit ff82a5d04e0a182ebd13efd1b24de74fcddeba2a) * add ebf to Sieg and Sisg fix some si line recipes (cherry picked from commit 79b5ecbcedfa0fe0f056a1369ed9f127ae26e9b8) * add electrolyser recipe for Hexachlorodilisilan fix recipe (cherry picked from commit e6b012f77760707ef5fdbfb656f7b08fdc06cd8b) * change chemical Famular from Trichlorsilane fix recipes and add cell varaint recipes (cherry picked from commit 8207edcbb82523646c20af3c9d6ba6a1d61a366f) * add a few cell recipes fix recipe (cherry picked from commit 36dac62eacbfe55baae4a6a8ceb2d79637214335) * add Poly and Mono to SI name change back Boule recipes made out of SIsg (cherry picked from commit 83cafb97df22319f1b3191bc9eeb38bbddec8623) * add Gallium Arsenide Crystal for Boule recipes (cherry picked from commit 436fbe52230bf12cd3f02b7b7f3376c8d2dba882) * add 4 output slots to cutting machines (hv and up) add Silicon dust to Wafer recipes (recycling) (cherry picked from commit 7a5bb72fcc9337a6841e7c7f0e487eee3d8b363b) * remove fluids from Boule cutting process add diamond sawblade to recipe (not consumed) (cherry picked from commit 1b5f14da1352eacb78bdd8466c4de7e42ccbfb8a) * fix SI typo fix Cutter4 slots can be used (cherry picked from commit a258cfd7747a0ed5ed164a5e8c7a0ecd0f67ca76) * change recipe change fluid position in chemical rector multi * resolve conflicts * fix fluid stack visual bug in chemical reactor if fluids >3 (cherry picked from commit 6e509b36d3a5a702f0354e6d683ecc5aa095c7cf) * fix recipes * change recipe times (cherry picked from commit 86302a7476a5985e862f8ae0242f77444a41ed37) * fix LCR not showing item and fluids overriden thanks to miozune * Update Materials.java * Fix SI recipes (cherry picked from commit 4c6ff96ead83e53b7fe4cab79ba8f07a13ae2476) * fix mire SI recipes (cherry picked from commit dc3aac372e5bdbc08b7de49f55325a260ed0a21f) * fix recipes SI (cherry picked from commit e077a6976e6614f547aa3ce4215208a85aef3dca) * buff this recipes a bit. (cherry picked from commit 334c6e5eb8224525116fd2a9fe340feef38c6579) * fix typo (cherry picked from commit d0eae40c64f44ab6d207891ff8a8ae30f5988cd8) * remove SIeg (cherry picked from commit 59f870d04234454bd73131aadfecff0cfdac2266) * remove Sieg recipes (cherry picked from commit 80c501f210ff30726c37a74f1cfec4844138273f) * remove SIeg Block * remove SIeg * fix Tooltip Grammar for Gallium Arsenide Crystal #10221 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10221 * fix [Conflicted Recipe] Monocrystalline Silicon Boule cannot be made in LV EBF #10308 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10308 (cherry picked from commit 7acd07346add055cb729205de1a50ae8381e3d47) * fix Silicon Processing Line Feedback #10228 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10228 (cherry picked from commit bc71c9ccb0aac338aedb2a282d0859d7c4fd07d2) * Make the circuits used in silicon boules smelting more consistent (#1079) (cherry picked from commit b1e994efce0bedb5ae10c5f6468b07a0cac9068a) Co-authored-by: repo-alt <wvk17@yandex.ru>
2022-05-03Reserve MTE IDs fon MuXiu1997 (#1048)MuXiu1997
2022-04-08Allows sorting of configuration circuits (#1012)MuXiu1997
* Allows sorting of configuration circuits * Fix things
2022-03-14pin comb type id instead of depending on array ordinal (#980)Glease
* pin comb type id instead of depending on array ordinal * fix up _NULL related problems * fix out of bound * make it private * add some more test
2022-03-14save config late (#982)Glease
2022-03-02reserve machince meta id for GlodBlock (#959)Yang Xizhi
2022-02-01Reserve meta IDs for glowredman (#912)glowredman
2022-02-01Reserve MTE IDs for glee8e (#911)Glease
2022-01-23AE2 Cable facade as cover (#887)Glease
* initial work on facade covers * fix colorMultiplier also removed derp * Clean up drop cover texture reset code What was I thinking actually? Send a packet to reset client states? * Fix cover display stack
2021-12-30Refactors for easier reading (#839)Jason Mitchell
* Refactors * Common functionality to base classes * GT Pre/Postload broken into more modular pieces * Extract common (mainly cover related) functionality from BaseMetaTileEntity & BaseMetaPipeEntity
2021-12-04Make machine reconfiguration interface a little nicerGlease
also tweaked the API a little for GT++ conf circuits and bartworks circuit programmer Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-12-02add select circuit gui for machine and circuits itself (#773)Martin Robertz
also fixed some issue with basic machine gui introduced in 9d42b299def1c41bbc7a1f01efe445be28f54399 also retrofitted volumetric flask to use the new INetworkUpdatableItem and GT_Packet_UpdateItem, deprecating MessageSetFlaskCapacity in the meanwhile. To open the gui for machine, shift-left-click the circuit slot To open the gui for circuit, click any block (need to be sneaking if it's chest, furnace, etc) with the circuit held in hand. Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2021-12-01Add a new ghost slot to single block machines for config circuitsGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-17Rename GT_CoverBehavior_New to GT_CoverBehaviorBaseGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-17convert cover data storage to a full nbt tagGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-09-19Fix GT ToolsMinepolz320
I tried to fix the tools
2021-07-15Merge pull request #598 from TimeConqueror/experimentalMartin Robertz
More optimizaaations
2021-07-15Removed useless method callingsTimeConqueror
2021-07-14Add option to not change GUI color based on paintGlease
2021-06-16add graph network to pipes and implement it for powerkorneel vandamme
2021-03-03impr(rendering): Machine block casts an ambient occlusion shadowLéa Gris
- Implement the missing ambient occlusion shadow from machine block over neighbour blocks. - Fix the LightingHelper to properly shade pipes/cables/wires against an opaque block. - Refactor and cleanup the GT_Block_Machines class of all bad practices and code smell, checked and validated with Sonarlint.
2021-01-19ME output busrepo_alt
2021-01-17Debloat - Remove Modular Armor (It's buggy and not in use anyway)Jason Mitchell
2020-12-26Adds long distance Item & Fluid pipelines and pipes. Inspired/ported from ↵Jason Mitchell
GT6 under LGPL.
2020-12-26Update ranges (from upstream)Jason Mitchell
2020-12-26Machine Block Update changesJason Mitchell
* Conditionally trigger an update on front facing (Needed for pipelines) * Use a queue instead of recursion
2020-05-12Fixed NPE during Worldgenbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14crashfixbartimaeusnek
+ Added a new Thread every time a world is loaded Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14Made use of Thread.wait()bartimaeusnek
+ shortened "causeMachineUpdate" method Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-14Tried to make Mogballs Optimisation properly threadedbartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-04-12Use HashSet for machine block update and limit recursion depthMogball
2020-04-10Void miner adjustments (#262)bartimaeusnek
* Added all Ores to Voidminer in DeepDark + removed Infinity Ore Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> * renormalize line endings Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2020-03-16Refactored GregTech_API.javabartimaeusnek
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2018-09-08GC Energy CompatJason Mitchell
* GT cables now properly fill GalacticCraft machines with Energy IC2/AE2 Energy Compat * Updated IC2 & AE2 energy compatability * Added an option ic2EnergySourceCompat (default is on) to allow GT cables to pull energy directly from IC2 energy sources (nuclear reactors, MSFEs, etc) without the need for a transformer * Filling IC2/AE2 energy buffers will now send multiple amps if needed Misc * Use a set instead of an arraylist for transfer electricity; deprecated backwards compatiable method left in
2018-06-05Added option for disabling machinemetal tinting.Richard Hendricks
2018-01-13Make pipes aware of translocators & tinker construct faucets so they can connectJason Mitchell
2017-11-13GT6 styled pipesAntifluxfield
2017-06-22wrongly removed Casings 6Dream-Master
2017-06-22cherry pickJohannes Gäßler
14b9332d141ff652cf728ea16a7d44274f0e1bef Moved the Casings for the Large Chemical Reactor again. As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-04-27Merge branch 'experimental' from GTNH into mergeGTNH (based on BLOODASP)Technus
# Conflicts: # build.properties # src/main/java/gregtech/GT_Mod.java # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Materials.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/enums/Tier.java # src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java # src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/api/util/GT_ModHandler.java # src/main/java/gregtech/api/util/GT_Recipe.java # src/main/java/gregtech/api/util/GT_RecipeRegistrator.java # src/main/java/gregtech/api/util/GT_Utility.java # src/main/java/gregtech/common/GT_Client.java # src/main/java/gregtech/common/GT_Pollution.java # src/main/java/gregtech/common/GT_Proxy.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java # src/main/java/gregtech/common/GT_Worldgenerator.java # src/main/java/gregtech/common/blocks/GT_Block_Casings3.java # src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java # src/main/java/gregtech/common/blocks/GT_Block_Machines.java # src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java # src/main/java/gregtech/common/blocks/GT_Item_Machines.java # src/main/java/gregtech/common/blocks/GT_Item_Ores.java # src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java # src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java # src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java # src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java # src/main/java/gregtech/common/gui/GT_Container_Regulator.java # src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java # src/main/java/gregtech/common/items/armor/ArmorData.java # src/main/java/gregtech/common/items/armor/GuiElectricArmor1.java # src/main/java/gregtech/common/items/armor/ModularArmor_Item.java # src/main/java/gregtech/common/items/armor/Values.java # src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java # src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java # src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java # src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java # src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java # src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java # src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java # src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java # src/main/java/gregtech/common/tools/GT_Tool_Scoop.java # src/main/java/gregtech/loaders/load/GT_FuelLoader.java # src/main/java/gregtech/loaders/misc/GT_Achievements.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDustSmall.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingDustTiny.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingGemExquisite.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingGemFlawless.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate1.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate2.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate3.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate4.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate5.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadBuzzSaw.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadChainsaw.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadDrill.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadFile.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadWrench.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire01.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire02.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire04.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire08.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire12.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingWire16.java # src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java # src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java # src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java # src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java # src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png # src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png # src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png # src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png
2017-03-12fix adv circuitTechlone
2017-02-28Reserved IDsBlood-Asp
2017-01-20Tank Block no function only for crafting S and QTanksDream-Master
2016-11-25Minor string changesTechnus
2016-11-21Not needed i guess.Technus
2016-11-02Modular Armor configsBlood-Asp
2016-10-29Teleporter and missing textureTechnus
2016-10-23Quick Fixes BloodASPBlood-Asp
2016-10-22quick fixesBlood-Asp
2016-10-22Detect GT++ and enable materials for it.Blood-Asp
generated by cgit (git 2.46.0) at 2025-03-06 04:28:25 +0000