aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2023-02-16Fusion NEI support (#1742)Maxim
* Added optional special value to Power and getter for power into IMTE * Added FusionPower to properly display available fusion recipes and OC * spotlessApply (#1743) Co-authored-by: GitHub GTNH Actions <> * Moved compare flag to recipe map * Missed a new constructor * Added user request * Addressed reviews * Typo * Update src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java Co-authored-by: miozune <miozune@gmail.com> * Removed wrong bracket from git online commit --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com>
2023-02-16Apply post-decompilation cleanup patches from the new RFG version (#1744)Raven Szewczyk
2023-02-14Fix silly oversight. (#1741)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-14Fix missing textures (#1732)Connor-Colenso
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 * Bump dep of AE2 * spotlessApply (#1733) Co-authored-by: GitHub GTNH Actions <> * New fluid solidifer method * Space * Spotless * New recipes for new white dwarf matter shapes. * Universium block * Universium nanites * Spotless * Add some fine wires --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-14Add material ID dumper (#1737)miozune
* Add material ID dumper * spotlessApply (#1738) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-13fix large turbine not drawing stuff on reload (#1734)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-02-13Fix id conflict with Living Crystal Chip (#1735)miozune
2023-02-13Add ID dumpers for MetaTE and MetaItems (#1736)miozune
2023-02-12Fix ore dict with space dusts (#1731)Connor-Colenso
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-12Add a recipe check to MuTEs (#1727)BlueWeabo
* working recipes! * clean up and save items which need to be outputted * reviews
2023-02-11fix walrus comb (#1730)chochem
2023-02-11Fix EU consumption displayed on NEI (#1728)Connor-Colenso
* Fix EU consumption displayed on NEI * Typo --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-11fix zfighting on large turbine if rendering from afar (#1729)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-02-10Rfg cleanup (#1726)Raven Szewczyk
* Update buildscript, add all recently added gradle.properties entries * Dependency version bumps and cleanup * Bump eternal singularity version * Update buildscript * Make AE2 a required dependency * Switch version to class generation from token replacement
2023-02-09LV-IV forgehammer (#1725)chochem
2023-02-08Fix HOG Consumption Rate in LCE (#1687)Daniel Mendes
* Fix HOG Consumption Rate in LCE * Moved New Variables to checkRecipe
2023-02-07Mte inventory block (#1692)BlueWeabo
MTE Inventory Upgrade * inventories saved to nbt in controller * bump up ModularUI to fix labels * inventory renaming * fix inventories not syncing * more nbt saving and loading * unregister inventory on block break * example of a block being made from the same class * clear UpgradeCasing list every structure check * fix inventory halving to 0 * sync inventory name for upgrade block * switch to its own method of sending client data --------- Co-authored-by: Jason Mitchell <mitchej+github@gmail.com>
2023-02-07TypoGTNH-Colen
2023-02-06pyro tooltip fix (#1724)chochem
2023-02-06Improve TPM NEI (#1723)miozune
2023-02-06Add cell item for Super Coolant (#1722)miozune
2023-02-06Fixes (#1721)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-05Centrifuge Recipes for U235 - Tweaks (#1708)Daniel Mendes
* Centrifuge Recipes for U235 - Tweaks * Correct Values to Previous PR
2023-02-05Add TPM Multiblock (#1718)Connor-Colenso
* Remove warning suppression * New helper default method * Initial work on TPM * Bump dep for structure lib and modular UI * Structure works + recipe map * Working * Tooltip and NEI work * Change controller texture * spotlessApply (#1719) * Fix wrong order * Add override * Spotless * Big opps lol * Comment * Spotless --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-02-05Set minimal amount of input items to 0 for fluid heater recipes (#1717)miozune
2023-02-05Fix tooltip for spray can and lighter when full (#1716)miozune
2023-02-04Add Hazmat infusion enchantment recipe (#1715)David Lindström
* Add Infusion Enchantment support to IThaumcraftCompat and implementation * Add Infusion Enchantment recipe for Hazmat enchant
2023-02-04Wetware SoC (#1714)Tyrantnh
* Update ItemList.java * Add files via upload * Delete wetwareSoC.png * Add files via upload * Create 550.png.mcmeta * Update GT_MetaGenerated_Item_01.java * Update 550.png.mcmeta
2023-02-03Add Extremely Ultimate Battery (#1713)GDCloud
2023-02-01Readd recipes for Hatches and Busses (#1711)chochem
2023-02-01Fix fluid display renderer not having "L" for >= 10k amount (#1709)miozune
2023-02-01Fix crash with rendering GT_MetaGenerated_Item_99 item (#1710)miozune
2023-01-30[ci skip] spotlessApply with the new settingsJason Mitchell
2023-01-30fixMartin Robertz
2023-01-30saMartin Robertz
2023-01-30fix merge conflictMartin Robertz
2023-01-30Rendering materials (#1592)Connor-Colenso
* Inf renderer working + fuzzy halo on cosmic neutronium. * Helper method * Cosmic nt nearly done * Glitch renderer * Working! * Add comment * Cosmic Nt finished * Cosmic render appears * Universium Renderer nearly done * New material universium * Dep * Dep * Universium * Some more changes * Spotless apply for branch RenderingMaterials for #1592 (#1593) * Fix Battery Buffer accepting more than 1 items per slot (#1590) * Unify sodium persulfate amount (#1591) Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent. See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context * spotlessApply Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Better textures for universium maybe? * Fixed cosmic Nt * Remove glitch renderer (not used) * Rename universium renderer * Rename universium renderer * Change Colour to Color (begrudgingly) * Gray infinity halo * Remove halo * Fix off axis rotation on dropped universium and some new textures * More universium stuff * Cell render works * Inf render * Working inf * Universium done but no fluid outside of cells rendering * Fluid rendering * Comment * Spotless apply for branch RenderingMaterials for #1592 (#1634) * Fix Battery Buffer accepting more than 1 items per slot (#1590) * Unify sodium persulfate amount (#1591) Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent. See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context * fix it (#1597) * Fix tooltip for required input hatches (#1599) * Allow resource packs to override individual progressbar textures (#1596) * Allow resource packs to override individual progressbar textures * spell: every + singular * Fix potential crash on server with FallbackableSteamTexture * Add colored voltage tier display for Waila (#1598) * Add colored voltage tier display for Waila * Adapt to new methods * fix oredict name (#1600) Fix wrong oredict for blizz comb * fix it (#1601) * adds molds and recipe generation (#1603) * Delete water from recipe (#1604) * Added Shortcut because simply dull (#1594) * Added Shortcut because simply dull * I always forget to remove a dep * Increase Recipe Time To fit the original recipe chain * spotless :( * Upped the recipe to ZPM and increased educt/product side by 16 * make sugar maceration recipe shorter (#1586) * make sugar maceration recipe shorter (cherry picked from commit 55d85dc6ab315da3eb31e41667317e127a2059fe) * spotlessApply (#1587) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> * fix reed to sugar recipe Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add light, medium and heavy oil to get lube (#1584) * Add light, medium and heavy oil to get lube Add distillation recipe to get lube out of oil add control circuit * spotlessApply (#1585) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> * fix misstype Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * remove autogenerated SiSG ebf recipe (#1588) (cherry picked from commit 4d3052e50b7de739c89c339d37a24297f3bb70fc) * Remove void break from fluid tanks and chests (#1602) * Remove void break from fluid tanks Previously, sneaking while breaking a fluid tank would void the contents of the tank, leading to potential loss of valuable resources. However, this behavior is not consistent with other blocks, such as chests and furnaces, which retain their contents when broken while sneaking. This commit removes the sneak breaking voiding behavior for fluid tanks, bringing them in line with other blocks and reducing the risk of unintended loss for players. * run spotless * fix stray check for voidBreak Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * remove override Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * remove void tooltip Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: NexusNull <p.wellershaus@googlemail.com> * fix (#1605) * Fix inconsistency in naming (#1606) * Add a way to remove a furnace recipe using the output instead of input (#1609) * add method * change method to remove all recipes with said output * Naphthenic acid (#1589) * add burn value for NaphthenicAcid 60k in Semi Fluid generator (cherry picked from commit 3fa145932b64025067e807f4ff900f51029d07bd) * add Naphthenic acid recipes and change a few (cherry picked from commit 8b6b6d72dd79b4549dccd3732ccca6e219dd8ce7) * spotless * fix error (cherry picked from commit db7b322cece6cf151f92ab6aa467bc8e4c84bda8) * Chemical balance fixes Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com> * Fix plasma turbine EU output (#1607) * Revert "Turbine efficiency helper (#1562)" This reverts commit 3c852a0143cbfa864da59bdd0b2edab1fa4bf146. * Restore efficiency helper * Spotless Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> * disable auto recipe (#1611) * possible fix (#1614) https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12139 (cherry picked from commit 64f7433f2fab2eff618bb25997c303516fdab3f8) * Add Failsafe for getCasingTextureForId to prevent null page. (#1612) * Improve NEI customizability (#1583) * Move descriptions to recipemap * Move tooltips to recipemap * Move overlays to recipemap * Use shared code for generating grid positions * 2 fluid inputs for freezer recipes * Add deprecation javadoc * Fix (#1616) Allows players to use any rubber instead of just one. As other tiers have that. * Heating element change (#1618) * Changed (sg) to * instead (#1620) * add transcendant metal pipe and multiple pipe (#1619) * fix drills not generating and using less material (#1623) * fix LV steam valve (#1624) * TungSteel to TPV (#1622) * fix waila displaying wrong generated eu/t (#1621) Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Add a Overclock Calculator for multis and the like to use (#1617) * add calculator and unit tests * use math.ceil * math.ceil everywhere * add some more unit tests and add onetick discount possibility * add an exception when trying to get the consumption before calculating * spotless oops * convert PCB Factory to use the OC calculator * fix tests trying for wrong values * fix copy paste error * address reviews * this should be there too. * add callhook for pre block destroy (#1625) * add callhook for pre block destroy Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * spotless Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Change Tungstensteel to Require TPV Coils (#1628) * Fix Blue Steel and Bismuth Bronze mixing (#1629) * blue steel * bismuth bronze * Add new Weed-EX 9000 (#1615) * Add new Weed-EX * Add more pollen * Change material ID * Remove fluid recipes * Remove pollen * Remove cells * Balance adjustment for the LCR Nitrobenzene recipe. (#1631) * nitrobenzene balance * SA * zpm instead * force compound to be grouped together in chemical formula (#1630) * force compound to be grouped together in chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * patch up glass chemical formula Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * merge two toString Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Allow overriding more progressbar textures & Add document for resource packs (#1632) * spotlessApply Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com> Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Ethryan <dborrfors@gmail.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Comment * Glee8e * Spotless * fix Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * Weird error * Spotless * Material ID * Universium fluid working * Fix some inf renderer issues * Remove try catch * Cosmic neutronium fixes, but no fluid rendering yet. * Working * Spotless... * Fake frame --------- Signed-off-by: NexusNull <p.wellershaus@googlemail.com> Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com> Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Ethryan <dborrfors@gmail.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
2023-01-30add back turbine wallsharing (#1699)Glease
* add back turbine wallsharing Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * use new texture from @Jimbno Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * remove unnecessary structure checks it turns out you cannot build 2 functional large turbine at these locations anyway, so why not? Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * spotless Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * update bs * use the original grey for empty texture these are slightly darker, and looks better Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --------- Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-01-30General Fixes (#1702)Connor-Colenso
* Fix missing machine recipes due to load order. * Fix missing compressor recipe * Add new compressor recipe adder method * Line * Narrow crafting restrictions on pipes * Crafting working, assembler not * Nonuple working * Spotless * Both assembler recipes exist * Pipe recipes finally working as they should. * Spotless * Working still * T-2 materials * Tier -> TierEU and a few corrections on recipes using full amps. * Fix comment * spotlessApply (#1703) Co-authored-by: GitHub GTNH Actions <> * Spotless * Remove comment * T-2 --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-01-30Add sifter chance outputs (#1707)GDCloud
2023-01-30Revert "Add chance to sifter method (#1705)" (#1706)BlueWeabo
This reverts commit a132001f964faee20cc035693987c10cb19a02d4.
2023-01-30Add chance to sifter method (#1705)GDCloud
2023-01-28Optical Circuit line recipes (#1665)GDCloud
* Optical Board recipes * Spotless * Tweak chromatic glass amount * Expand Forming press input slots * sa * Glowstone nanites recipe * Add new forming press support * Spotless * Tiered expansion of PLE/Forming press slots --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-01-28add circuit (#1701)chochem
2023-01-28Sanitize recipes (#1688)boubou19
* move some alloy smelter recipes * move printer recipes * moved arc furnace recipes * moved mixer recipes * moved extruder recipes * moved fluid canner recipes * moved fluid solidifier recipes * moved chem bath recipes * moved some chemical reactor recipes * moved some assembler recipes * moved some fluid extractor recipes * moved some autoclave recipes * moved some electrolyzer recipes * moved some centrifuge recipes * moved some pulverizer recipes * moved slicer recipes * moved some forming press recipes * moved some fluid heater recipes * moved some bending machine recipes * moved some vacuum freezer recipes * moved blast furnace recipes * moved pyrolyse oven recipes * moved laser engraver recipes * moved circuit assembler recipes * move compressor recipe * moved cutting machine recipes * moved distillery & distillation tower recipes * moved fermenter recipes * moved some smelter recipes * moved some canner recipes * moved fusion reactor recipes * moved implosion compressor recipes * moved plasma forge recipes * moved some more chemical reactor recipes * moved some lathe recipes * moved some wiremill recipes * moved some more wiremill recipes * moved brewery recipes * spotless 1 * move thaumcraft recipes * moved assline recipes * moved some more recipes * moved sifter recipes * moved forge hammer recipes * moved fuel recipes * moved some more thaumcraft recipes * moved some recipe removals * moved some more fluid extracter recipes * moved extractor recipes * moved crop processing recipes * moved thermal centrifuge recipe * moved packager recipes * moved some more ic2 recipe removal * moved NEI Hidding recipes * moved fluid extractor recipe * moved oredict unification recipes * moved some more arcfurnace recipe * moved matter amplifier recipes * moved electromagnetic separator recipes * use the run method of each file * spotlessApply 2 * forgot mixer potion recipes * aligned recipes * centralise Loader.isModLoaded calls * recipe magic number killstreak 1 * recipe magic number killstreak 2 * recipe magic number killstreak 3 * fix mistake * spotless apply 3 * recipe magic number killstreak 4 * fix Railcraft mixer recipes * fix pyrolyse recipes * fix vacuum recipes
2023-01-28Revert "add circuit (#1698)" (#1700)chochem
This reverts commit 9bc6d0f89e121662cfa2765866628fc14c4c84be.
2023-01-28add circuit (#1698)chochem
2023-01-28Sifter method (#1697)TheEpicGamer274
* Optical Line-Water line & Items * Spotless apply * Spotless applies + Optical Board * Sifter Method for fluid to fluid
2023-01-27Replace max voltage with avg voltage (#1694)Maxim
2023-01-27Fix total EU implementation (PCB Factory and Nano Forge overclocking fix) ↵Jakub
(#1693) * Fix total EU implementation * Wrong hatches
generated by cgit (git 2.46.0) at 2025-03-04 21:37:43 +0000