aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
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-06-23Fix NEI GT Pipe/wire issue (#1090)Connor-Colenso
* Fix NEI GT Pipe/wire issue Fixes NEI displaying every variation of wire/pipe recipe instead of specific ones. * Adjust fix. * Adjust fix again. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-23Spacetime temp fix (#1089)Connor-Colenso
* Update textures * Add credits to readme * Fix spacetime temp. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-23Fix 16x cable materials (#1091)Tyler
2022-06-23Plasma forge fixes (#1086)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. * Update/fix plasma forge recipes. * Increase max hatch count. * Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time. * Fix spacetime recipe. * Update spacetime textures and add new item textures. * Remove manual spacetime fluid addition. * Add custom fluid texture override ability. * Update infinity and spacetime to use new custom fluid override texture. * Depreciate old recipe adding methods. * Refactor GT NEI handler. * Remove unnecessary import. * Remove debug comment. * Clean up auto generated fluid code. * Fix NPE and add a few comments. * Refactor GT NEI handler. * Update NEI GUIs. * More NEI fixes. * Update LCR NEI GUI. * Update error message. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-22UEV blast recipes+fix exploit (#1085)Connor-Colenso
* Remove auto UEV SC recipes. Stupid overwriting. * Fix UEV SC exploit. * Add proper UEV SC blast furnace recipes. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-22Change Super Fuels and Added Advanced Glue (#1042)Steelux
* Change Super Fuels and Added Advanced Glue - Changed Super Fuel recipes to accept HOG input instead of CBD. The amount of input is proportional to the fuel value, so that both recipes match in the fuel value of inputs; - Added a new early-game glue, Advanced Glue, which replaces Refined Glue in the recipes that use Polyvinyl Acetate and Methyl Acetate/Acetone; - Changed the Super Fuel Binder recipes to use this new glue instead of the old one; - Added recipes with the new glue for making Graphene Dust with the first two wafers, Glowstone and Naquadah. My intent is to replace the old glue altogether in these recipes. * fix advanced glue (cherry picked from commit 89979d9593b3d6ab97c31394f101dc7e470bcab9) * Steel Boiler Not Accepting Charcoal Fix - Fixed a bug that made Charcoal and its equivalents not work in the Steel Boiler, when they're supposed to. * Remove commented out line, the fluid is already created with MaterialBuilder Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Raven Szewczyk <git@eigenraven.me>
2022-06-19Custom animated material support (#1081)Connor-Colenso
* Add custom texture ability for items. * Fix warning. * Add custom texture for infinity. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-19Add Plasma Forge (Endgame multi) (#1076)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-10oredict circuit parts and INDUCTOR (#1040)Yang Xizhi
2022-05-24Revert "Add dust extrusion recipe for PTFE and PBI (#1055)" (#1057)miozune
This reverts commit d90c5d942d4db24fea6592bc9f5968732c9cff8e.
2022-05-19Add dust extrusion recipe for PTFE and PBI (#1055)miozune
2022-05-19Fix oredict for UV/UHV Superconductor Rod (#1054)miozune
2022-04-24Add Fluid Storage Monitor Cover (#1027)MuXiu1997
* Add Fluid Storage Monitor Cover * Add support for normal cells etc. * Add Recipe
2022-04-24add quadruple input hatch (#1016)Yang Xizhi
* add quadruple input hatch * pull all fluid slot thing to GT_Container
2022-04-18Multitileentity precursor (#963)Jason Mitchell
* Refactors * Refactor CoverableTileEntity a bit more, pull out a CommonMetaTileEntity * Add an IDebugableTileEntity interface instead of checking various subclasses * Move more redstone related things to CoverableTileEntity * Add IGTENet * Final and dead code removal * Address a few comments, fix a few comments, remove some more dead code, and add some more finals. * fix bad rebase
2022-04-11add ALF3 for compatibilty reasonsMartin Robertz
2022-03-28Add Naquadria OreByProduct (#996)ScriptedPiky
Allows certain processes, like the Stargatium Leaf and Naquadria Combs with crushed Naquadria Ore to yield 144L of Molten Naquadria; if GoodGenerator is loaded, this instead will be "Naquadria Goo" and requires further processing
2022-03-26Change Kanthal mixer recipe to hv (#989)Martin Robertz
remove default ebf recipe (cherry picked from commit dfc5f6a1989d69262d1e37cdd3ed26860bebc78e)
2022-03-14save config late (#982)Glease
2022-03-08sunnarium from glowstone in reactors (#971)Glease
* sunnarium from glowstone in reactors * change glowstone dust to 9 items (cherry picked from commit 24d7318ae8e73dc0082784e0a5872903b074dd2e) Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-03-06fix id drift in bartworks (#972)Glease
2022-03-02Fix tooltip (#961)Jakub
2022-02-25remove autogenerated jade electolyse recipesMartin Robertz
2022-02-25fix jasper fumularMartin Robertz
2022-02-23Base work adding 3 new tiers of coils. (#885)Alkalus
* Base work adding 4 new tiers of coils. * Remove OPV tier. Remove nonsensical coil tier tags. (Awak = UIV, really? No thanks) Add proper texture for Hypogen, Infinity and Eternal coils. * Revert avaratia dep via import by Alk. If someone can implement cosmic rendering here then great but that is well beyond me. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-02-23UEV Superconductors and slight rejig of other superconductors (#943)Colen
2022-02-23fix Add Jasper Dust Electrolyzer Recipe [Suggestion] #9801Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9801
2022-02-23fix Add Amber Electrolyzer Recipe #9802Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9802
2022-02-23fix Add Jade Electrolyzer Recipe #9803Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9803
2022-02-23fix Graphite Dust missing C chemical formula #9804Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9804
2022-01-30Add compat for EnumHelper to Element#get (#908)Glease
2022-01-28Texture tooltips update (#903)Colen
* New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com> * Fixed github shenanigans with new tier colours. * Update A LOT of textures (mostly minor) * Remove extraneous comments. * Remove obsolete comments and update materials.java. * Add tooltips for all batteries in base GT. * Remove test case Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com>
2022-01-27Add new xSMDs (#894)GTNH-Colen
* Add new xSMDs and xSMD wraps. * Add new xSMDs and xSMD wraps.
2022-01-27Add new circuit tiers (#895)GTNH-Colen
* New circuits * Fix last tier ore dict * Colorfull tier tooltips (#898) * Make Repellator stop slimes spawning (#896) * Add special tooltip handling, requested by Colen Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com> Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com> Co-authored-by: glowredman <fredcraft00@gmail.com>
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
2022-01-18ECE and Fuel Rebalances (#878)Steelux
* Large Boiler Rebalance - Changed Large Steel Boiler to output 1000 instead of 600 EU/t. - Changed Large Titanium Boiler to output 6000 instead of 800 EU/t. - Changed Large Titanium Boiler to output 6000 instead of 800 EU/t. - Changed Large Tungstensteel Boiler to output 18750 instead of 1000 EU/t. - Changed Titanium and Tungstensteel Boilers to output Superheated Steam instead of regular Steam. - Added an upper bound for the burn value that can be processed by the boilers, in order to prevent an overflow. - Added a lower bound for the burn value that can be processed by the boilers. This is a placeholder limitation intended to prevent the player from using the improved Titanium and Tungstensteel boilers to generate lots of power from easy solid fuels like Charcoal. A better way to implement this would be to make a whitelist of accepted fuels. The one I had in mind for these boilers was the Super Fuels, both the magic and non-magic ones. The last two boilers had terrible numbers for their tier. High numbers would allow for charcoal powergen up to IV or LuV, though, so the better boilers should only accept solid fuels that are difficult to make and need a processing chain. * Fuel Check, Water to Steam and Tooltip Fixes - Changed the Titanium and Tungstensteel Boilers to only consume the Super Fuels. They are checking for their burn values, which are unique - this is a hotfix, this should be implemented as a whitelist that can be changed in the config file, but I do not know how to do this; - Changed the code in the tooltips to differentiate between the two types of boilers without copypasting; - Changed the water consumption when producing Superheated Steam, to maintain the amount of Distilled Water. * Powergen Rebalance 1 - Changed Titanium Boiler from 6000 to 4000 EU/t; - Changed Tungstensteel Boiler from 18750 to 16000 EU/t. * ECE and Fuel Rebalance - Changed Biodiesel fuel value from 256k to 320k EU; - Changed Benzene fuel value from 288k to 360k EU; - Changed Cetane-Boosted Diesel fuel value from 720k to 1M EU; - Changed High Octane Gasoline fuel value from 1.728M to 2.5M EU; - Changed the recipe of Biodiesel to CBD to output 900L instead of 750L per 1000L of Biodiesel, to account for the fuel value change; - Reduced the LOX consumption of the ECE from 320 to 80 L/s. A quad Vacuum Freezer setup, with 3 HV and 1 EV can feed one ECE; - Small changes to the EU/t of the ECE due to it all being coded with ints in a specific format, where doubles caused several rounding errors. The boosted output amount is very similar to how it was before; - Added a condition to the LCE to not burn HOG if it does not have Oxygen to boost it, since it generated power without consuming any fuel due to its consumption being smaller than 1 L/t, and therefore rounded down to 0.
2022-01-15add a cover copy/paste tool (#872)Yang Xizhi
* add a cover copy/paste tool * check server side
2022-01-14Add recipe filter block (#870)Glease
* add recipe filter block * Add tooltip to recipe filter GUI & improve type filter UI interaction now you can click special slot in type filter UI to directly set the oreprefix based on the stack held on the cursor
2022-01-06Add in game GUI to configure client preference (#852)Glease
* Add in game GUI to configure client preference * Fix backslash
2021-12-24add more turbine texture (#835)Yang Xizhi
2021-12-23Optimize OrePrefixes.contains and OrePrefixes.add (#832)Glease
1. Convert global map mCachedResults to an instance field. 2. Convert the post add null check to a builtin null check via GT_ArrayList 3. Use new GT_ItemStack2 (which has a slightly better hash function than stackToInt)
2021-12-13Yeet unused compat, including GT adding a bunch of RC rock crushing recipes ↵Jason Mitchell
:-/ (#798)
2021-12-12add infinite oil rig (#795)boubou19
* add infinite oil rig * fix typo * get same speed as the oil rig III * adjust speed for the infinite oil rig
2021-12-11add Cryolite Bee and combs (#793)Martin Robertz
* add Cryolite Bee and combs * add Cryolite Block
2021-11-21Add Dimethylbenzene electrolyzer recipeGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-19Add MTBE as an alternative to ETBE in HOG productionGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-16underground oil and pollution persistence form reworkGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-11-11Merge pull request #718 from GTNewHorizons/ev-motos-re-tierMartin Robertz
change ev motor wire material to Black Steel
2021-11-12color changeGlodBlock
generated by cgit (git 2.34.1) at 2026-01-15 23:24:29 +0000