aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
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-24Buff Oil Output from Soul Sand (#1060)Steelux
* Buffed Oil Output from Soul Sand - Change Oil output from 80L to 200L; - Changed Saltpeter Dust to Tiny instead of Small, changed Coal Dust to Small instead of Tiny and made the latter have a 50% chance instead of 20%; - Reduced EU per recipe from 16000 to 2400. * Normal Dusts - Changed dust outputs to Normal and chances to roughly match previous values.
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-22Buffed Wood Gas DT Recipe (#1073)Steelux
- Changed the Wood Gas DT processing recipe to lower the amounts of CO2 and CO by 100L each, and increase the amounts of Ethylene and Hydrogen by 100L each.
2022-06-22Add Important Ore Processing to Sodium Bisulfate (#1063)Steelux
- Added Chemical Bath recipes that use Sodium Persulfate to process different ores, with more useful outputs.
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-22Make LCE and ECE Cheaper (#1082)Steelux
- Changed the recipe of the Engine Intake Casings to output 4 casings per recipe instead of 1, since these are a big portion of the total cost of the multi.
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-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-16Fix oversight in UV Piston (#1084)miozune
2022-06-10Adjust NEI recipe pages (#1077)Connor-Colenso
* Add config support for changes. * Change ticks config to default OFF. * Usage -> Voltage for some cases. Also fix language translations. * Remove comment. * Remove redundant null check. * Bring back null checks (crashes). Move config to client. Adjust priorities so that if OC is detected it will display usage instead of voltage. * Remove null checks again (but for realsies this time). * Add language localisation. * Update language localisation. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-08Fix recycling amount for Long Distance Pipes (#1074)miozune
2022-05-28Add initial capacity NBT to Volumetric Flask solidifying recipe (#1068)miozune
2022-05-26Replace Soldering Alloy in Assembly Line Recipes with New Higher Tier Solder ↵Steelux
(#1066) * Replace Soldering Alloy with Indalloy 140 - Replaced the LV-tier Soldering Alloy in Assembly Line recipes with a higher tier, more complex solder that fits progression better. * Call getFluidStack Less Often * Fall Back to Previous Solder if Needed
2022-05-06Change config for Sterling Silver (#1050)miozune
2022-04-27Change configuration for Cupronickel mixer recipe (#1039)miozune
2022-04-24add quadruple input hatch (#1016)Yang Xizhi
* add quadruple input hatch * pull all fluid slot thing to GT_Container
2022-04-22fix Add Freezer recipe for Americium Plasma #9521 (#1031)Martin Robertz
* fix Add Freezer recipe for Americium Plasma #9521 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9521 * add fluid vac freezer recipes * Revert "add fluid vac freezer recipes" This reverts commit 74fcd2f626d01f062b31fc2b7d8afddcb9637604.
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-10Fix dupe by disassembling LDFP/LDIP (#1019)miozune
2022-04-09Allow sifter the fluid io slots (#1017)Elisis
2022-04-08Allows sorting of configuration circuits (#1012)MuXiu1997
* Allows sorting of configuration circuits * Fix things
2022-03-29Super Fuel Recipe Changes (#998)Steelux
* Super Fuel Recipe Changes - Removed recipes that used McGuffium, a fluid that is currently uncraftable; - Removed recipes with LPG and Heavy Fuel inputs, as they are much easier to make than CBD. It makes little sense to have cheap oil-related fuels take the place of CBD, and this process can work as an upgrade to CBD on the advanced Large Boilers; - Removed some recipes on the magic fuel side that used Mercury + Thaumcraft inputs, keeping only the basic, inefficient Mercury options with Blaze Powder and Ender Eyes, - Changed all recipes with tiny dusts to use full dusts instead, and changed ratios on most of them, also for balancing purposes. * Glue Input Change - Changed Glue input values from 333 to 500, rounding up to a neater value (glue is very easy to get from stickreed, so I believe 500 is fine).
2022-03-27add tools to pile igniter recipe (#988)Martin Robertz
(cherry picked from commit 206af27f5c732b4dc0f6bbe8432b90e8839c3de5)
2022-03-26Change Kanthal mixer recipe to hv (#989)Martin Robertz
remove default ebf recipe (cherry picked from commit dfc5f6a1989d69262d1e37cdd3ed26860bebc78e)
2022-03-26add brickdust to brick recipe to forming press (#990)Martin Robertz
2022-03-18add multiblock platinum sludge recipes (#984)Martin Robertz
* add multiblock platinum sludge recipes (cherry picked from commit e233d34e88d93590d5e76ec69fbf986021f0acb0) * balance recipe (cherry picked from commit 20ebfca8a1eed609a6f3e1b8a0184674830aaa43)
2022-03-17Fix Muffler Hatch is more expensive in Assembler than hand crafting (#986)miozune
2022-03-13Change some tiny dust recipe (#977)Pnc6lx
2022-03-12change Biomass brewing recipe to 1000 mb (#976)Martin Robertz
* change Biomass brewing recipe to 1000 mb make distilled water recipe much quicker (cherry picked from commit 64d599e1bd37174df4ae5555f0492e058d40fb61) * fix biomass recipe (cherry picked from commit af0cbc4b4f207fd21428f656572d0fa5a1d013e2) * set input and aoutput stack to 1000L * change back to 1000L (cherry picked from commit 63d5b7b3bbf3d3e80485454a3c87eef65dbb28e6) * remove duplication entry change recipe stack(water) (cherry picked from commit cf86138953199b8dbc9a87451ce0be9c44bf1056) * Revert "set input and aoutput stack to 1000L" This reverts commit 500a250ade0d4eab963b96646a01c497cb252abb. (cherry picked from commit c5142567a319f8379bf716d098e97b7d809783c7)
2022-03-10Add (back?) RC coke block compressor recipe (#975)repo-alt
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-05correct sulfuric acid recipe (#967)Yang Xizhi
2022-03-03New recipe to recycle sulfuric acid - My suggestion (#962)Jakub
* Add recipe * Fix recipe
2022-03-03Neutronium Fusion Buff (#945)ScriptedPiky
* Neutronium Fusion Buff With the recent addition of the Naquadah line and making Naquadria a lot more difficult, it seems fair to buff this recipe for neutronium to not be completely garbage. Americium & Naquadria amount increased from 96L to 144L, and increased Neutronium gain from 24L to 144L. Time required to craft this is now 24 seconds and requires 122880 EU/t, or a total of 58,982,400 EU (58M) to create one ingot. For reference, it takes 3.2B EU total for a single neutronium hot ingot to smelt with Radon gas in a regular EBF with no overclocks. However, it's also possible that MEBFs or potentially Volcanus's will inevitably out pace this after a certain point with large EU/t gain. Thoughts on this? * Retier and large buff Neutronium now takes 4 seconds, but requires UHV voltage input and 1B EU startup; T4 fusion at the minimum. * UV input, not UHV, whoopies * Molten Neutronium is at T3 fusion, again Requires 640M EU start, ZPM voltage input, and 12 seconds of total processing time for a single ingot. The "difficulty" or challenge of this recipe is the molten Naquadria being required.
2022-03-03remove hacky circuit oredict code (#955)Yang Xizhi
2022-02-27move recipe orderMartin Robertz
(cherry picked from commit bffd14a07c30922a77d9bb6e8ae04f0a54273456)
2022-02-27fix recipes and control circuitsMartin Robertz
(cherry picked from commit 3cd6a6bd9e04dc774fe2381c9dcac012431c8329)
2022-02-27fix wrong recipesMartin Robertz
(cherry picked from commit 198e44d4a7ce950b8a61ef4286f811f1f25877cf)
2022-02-27fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/8806Martin Robertz
2022-02-26remove hand crafting Neutron Reflector recipes (#956)Martin Robertz
(cherry picked from commit 758a3c4b3c9e46376c24f30f23a97f374396b9ca)
2022-02-26both use circuit 4Martin Robertz
2022-02-26fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9133Martin Robertz
2022-02-25fix RailCraft Tanks beyond Steel Need Material Recovery Options #9808 (#951)Martin Robertz
* fix RailCraft Tanks beyond Steel Need Material Recovery Options #9808 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9808 (cherry picked from commit 923d1fa1b9aded23074809f61173acb57a8f503b) * fix recipes (cherry picked from commit 28c4b21e8094140ac0aac0f36b42f342a5a19a8c) * add fluid extractor recycling recipes as well * fix wrong recipes (cherry picked from commit 712a0ec37bb282a728c177886525b8663f5ec60c) * fix wrong recipes again (cherry picked from commit 18e053085112ecf94c2db44ce636c7692ae3d50c)
2022-02-25change mushroom stew stacksize (#952)Martin Robertz
2022-02-23UEV Superconductors and slight rejig of other superconductors (#943)Colen
2022-02-13fix Alloy smelting synthetic rubber bars into their plates #9717 (#934)Martin Robertz
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/9717
2022-02-09change SMR recipes (#931)Glease
2022-02-08Add CPU wafer craft from Americium and europium wafers (#927)LewisSaber
* Add CPU wafer craft from Americium and europium wafers * Change crafttime of CPU wafers * Change Ram recipes to encourage use of better wafers * Change SoC wafer recipe to encourage use of better wafer * Buff Americium CPu recipe output * Change AsoC wafer recipe time to encourage use of better wafers * Change NPIC time * fix what dream requested im too stupid sometimes help me
2022-02-04Add 2 more transmute recipes (#921)Pao