aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2024-08-22Remove some more collisions (#2940)Mary
* Changed conflicting recipe in mass fabricator to a new circuit * Added circuit 1 to assembler recipes for vanilla tools * Removed redundant windmill shaft recipes in gt++. These are loaded in coremod already
2024-08-22avoid item oredict and allocation spam (#2937)boubou19
* avoid item oredict and allocation spam * Spotless apply for branch fix/comparison_spam for #2937 (#2938) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-22Add visual distinction for dimensional convergence (#2934)GDCloud
* change screen texture when convergence is active * forgor * remove magic number Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com>
2024-08-21Update documentation of mte id ranges (#2936)chochem
* update documentation of id ranges * fix order * fix java flag
2024-08-21Cleaning up GT5U's post init (#2932)boubou19
* wrap MTE ids print into a debug option * remove EnsureToBeLoadedLast config * exit early * spotless apply * making collision checks optional by default --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-21Fix full amp recipes (#2930)chochem
* round 1 * RS-AL recipes * round 3 with a bit of cleanup * round 4 --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-20Fix IOF available eut (#2929)chochem
fix IOF available eut
2024-08-19Fix GT_Recipe#compareTo overflow (#2927)miozune
2024-08-19Fix laser engraver recipemap comparator (#2924)NotAPenguin
* Fix laser engraver comparator * debug: use no custom comparator for laser map (do not merge this commit) * Revert "debug: use no custom comparator for laser map (do not merge this commit)" This reverts commit ffc66689f301294f1c4d210a2928ec9a367d4961. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-18Add additional information if GT_NEI_DefaultHandler cache construction fails ↵Raven Szewczyk
(#2922) * Add additional information if GT_NEI_DefaultHandler cache construction fails * Missed exception chain
2024-08-18fix machine recipes not being properly processed (#2921)boubou19
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-18Prevent crash by localizing material (#2920)miozune
2024-08-18Replace all instances of Master/Slave dynamic within Optical and Data ↵GirixK
Bank/Assline Connector hatches (#2918) * Replace all instances of Master/Slave dynamic * Rename to avoid confusion --------- Co-authored-by: GirixK <GirixK@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-17add covers that can hold some items (#2593)Glease
* add chest cover * Spotless apply for branch feature/chestcover for #2593 (#2594) * create window on the left * sa * add slot migration * add texture and T2&3 * add texture and T2&3 * spotless * fix bugs * add chest cover * small fix and spotless Co-Authored-By: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Nxer <43300390+Nxer@users.noreply.github.com> Co-authored-by: Nxer <306803661@qq.com>
2024-08-17Do some recipe cleanup once again (#2897)boubou19
* remove unused config "HardCoreCableLoss" * remove unused config "DisableIC2Cables" * remove unused booleans * Spotless apply for branch sort_recipes for #2897 (#2898) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove unused config "NerfCombs" * remove unused config "NerfCrops" * remove unused config "ArcSmeltIntoAnnealedWrought" * remove unused boolean * remove unused config "online" * remove unused stuff * remove unused config "HardMachineCasings" * remove unused config "NerfDustCrafting" * exit early * remove unused config "harderstone" * decouple recipes from machine registration for alloy smelter, arc furnace, assembler, autoclave, bending machine, canner, printer, recycler, sifter, slicer, thermal centrifuge, unpackager, wiremill * decouple recipes from machine registration for microwave, polarizer,plasma arc furnace, oven, ore washer, mixer, microwave * decouple recipes from machine registration for forming press, laser engraver, lathe, macerator, matter amplifier * decouple recipes from machine registration for centrifuge, extruder, fermenter, fluid canner, fluid extractor, fluid heater, fluid solidifier, forge hammer * decouple recipes from machine registration for chemical bath, chemical reactor, circuit assembler, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor * spotless apply --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-17Add new hydrogen sulfide electrolysis recipe without cells (#2914)Pxx500
* hydrogensulfiderecipe * fix typo --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-17readdCarbonMonoxideRecipe (#2913)Pxx500
2024-08-17Fix OverclockCalculator (#2901)HoleFish
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-16Fix silver nanite recipe time (#2910)NotAPenguin
fix silver nanite recipe time
2024-08-16Follow-up for recipe config removal (#2906)miozune
* Follow-up for recipe config removal * Remove duration check Recipes without recipe config key were not removed in the first place --------- Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-16Fix opencomputers cheese of T8 waterline (#2905)NotAPenguin
fix opencomputers cheese
2024-08-16Cleanup (#2904)miozune
* Remove redundant inputSeparation=true call * Remove deprecated MetaTileEntity#isDisplaySecondaryDescription * Always use ModularUI * Remove useModularUI * Remove unused GUI features * Remove IGlobalWirelessEnergy * Remove CommonValues.V & CommonValues.VN * More deprecation cleanup --------- Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-16Move gt machine recipes to postload (#2902)chochem
* move assembler and compresser recipes * move canner+extractor+packager * register MTEs in preload * move to init instead
2024-08-16makeshift solution of skipping gt hatches (#2881)Glease
* makeshift solution of telling structurelib to not place gt hatches * Spotless apply for branch feature/gt-no-hatch for #2881 (#2882) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-15Electric jukebox (#2827)Raven Szewczyk
* GT music system * Minor fix for some glitches when switching dimensions with P2Ps on both sides * Most features implemented except headphones * Implement wireless headphones * Disable debug mode * Spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-15add forbidden getModItem calls (#2869)boubou19
* add forbidden getModItem calls * remove bartworks gmi * remove goodgenerators gmi * spotless * no more literals in getModItem calls * fix kekztech calls * fix kubatech calls * fix gregtech calls (1/?) * move WA from NHCore to GT5U * MTE enum expanded with bw values * MTE enum expanded with tectech values * fix inversion * fix gregtech calls (2/?) * copied enum from NHCore to GT5U and moved machine hulls * moved plasma gens and alloy smelters * moved machine matter amplifiers, assemblers, scanners, Pump, transformers * moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches * moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches * moved circuit assemblers * moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer * moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine * moved batteries * comment * spotless apply * yeet * imports * bronze blast furnace is no more since a while * sanitize kubatech MTE registration * merge GG's MTE enum into GT5U one * fix gregtech calls (3/4) * fix gt++ calls (1/?) * small cleanup * fix gt++ calls (2/3) * fix gt++ calls (3/3) * temporary test * fix config * Revert "temporary test" This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724. * disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts * spotless apply * dumb dumb * fix dynamic access to CustomItemList * update tests * fix scala test * fix script? * fix script? * actual fix? * there we go! * yeet GT for now, until we move the EOH Controller recipe somewhere else * fix dep
2024-08-15Cleanup (#2803)boubou19
* remove dead code * use proper materials for tiered circuits * remove yet another RA1 call * remove deprecated usage * small step toward Research station assline recipes migration * remove dead code * remove dead code * remove dead code * migrate BW recipes * remove some more RA1 code * remove bad search and replace + spotlessapply * yeet deprecated code and change how sieverts for recipes are computed * fix loading * fix bad replacements * spotless apply
2024-08-15Fix fullenergy debug mode (#2894)HoleFish
Fix fullenergy debug
2024-08-14Remove fixEnergyRequirements (#2890)HoleFish
* Remove fixEnergyRequirements * update * fix * spotless
2024-08-14Fix ph sensor not taking decimal numbers (#2889)NotAPenguin
fix ph sensor not taking decimal numbers
2024-08-14Single-block Steam Boiler item handling improvements (#2871)Yannick Marcotte-Gourde
* Refactored GT_MetaTileEntity_Boiler_Bronze::updateFuel * Refactored GT_MetaTileEntity_Boiler_Lava::addUIWidgets * GT_MetaTileEntity_Boiler: Set item filter on fluid & fuel slots * GT_MetaTileEntity_Boiler: Made automation handling more consistent and respect slot filters * Remove deprecated fuel & ash slots from solar boilers * Removed overrides identical to super * Streamline coal boiler combustion logic
2024-08-13Final waterline visuals and small fix (#2864)NotAPenguin
* try to add baryonic matter fluid texture * fix baryonic matter custom fluid * adjust purified water names * do not form waterline multis without positioned hatches to prevent crashes * final baryonic matter texture
2024-08-13Adjust T4 waterline logic to avoid automation cheese (#2886)NotAPenguin
2024-08-14fix volumetric flask config gui on dedicated server (#2880)Glease
2024-08-13Fix scanner error due to Forestry (#2875)HoleFish
2024-08-12Implement dim num agnostic isGenerationAllowed function (#2854)Spacebuilder2020
* Implement dim num agnostic isGenerationAllowed function Replaces references to old function in as many places as possible Only reference that can't be changed right now is `E:\MinecraftProjects\GT5-Unofficial\src\main\java\com\github\bartimaeusnek\crossmod\galacticgreg\VoidMinerUtility.java:189` * Account for unloaded world or null provider by instead doing a dim number check This route should be avoided when possible. * Apply Spotless
2024-08-12Adjust grade 8 water logic (#2873)NotAPenguin
adjust t8 logic
2024-08-11Removed galacticraft dependency for laser render (#2868)Mary
* Removed cursed galacticraft dependency. Sorry mitch :( * spotless * Spotless * Update GT_Loader_MetaTileEntities.java --------- Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>
2024-08-11Wormhole Renderer dependancy fix (#2867)BucketBrigade
* Remove Dependancy * Now rendering again * Spotless Apply
2024-08-11Faster dev boot times (120s --> 80s while profiling) (#2866)Jason Mitchell
* Faster dev boot times (120s --> 80s while profiling) * Clean up sloppy hard deps and properly gate them behind isModLoaded() checks. * Include CoreTweaks as runtime only non publishable for faster boot as well
2024-08-11Retier Laser Hatch amperage, add Laser Mirror, add customizable amperage to ↵Sampsa
Laser Hatches (#2859) * Remove laser recipes based on tiers * Add 4M and 16M Laser Hatches * Add Laser Mirror * Add Laser Mirror recipe * Refactor mirror * Add customizable amperage to laser source hatches * Hide lasers from NEI, add customizable amperage to target hatches * Fix missing connection branch * Address review
2024-08-11Fix multi bonuses taking too much power (#2804)Volence
Fixed the issue where if bonuses were good enough it would take more than 1 amp + cleaned up now unused text
2024-08-10Require at least 1 fluid input in assline recipes (#2860)NotAPenguin
Require 1 fluid input in assline recipes
2024-08-10Removes "right-click to adjust amount" function of regulator covers (#2853)querns
Removes right-click function of regulator covers
2024-08-09Add Et Futurum Requiem to the mods list (#2852)W. Max Lees
Add Et Futurum Requiem to the mods list so we can modify recipes in Core.
2024-08-09Created LHECoolantRegistry from LHE coolant logic (#2756)RecursivePineapple
* Removed coolant logic from LHE & XL LHE * Added LHECoolantRegistry, which replaces the coolant checking logic
2024-08-09Adjust cleanroom assembler recipe cost (#2850)NotAPenguin
adjust cleanroom assembler recipe cost
2024-08-09Buff later naqfuels and misc changes (#2847)Sampsa
* Buff later naqfuels and misc changes * Buff Mk5 alternate recipe speed
2024-08-09Plasma Line buffs, EHE nerfs, Unstable Naquadah rebalance (#2842)Sampsa
* Plasma Line buffs and EHE changes * Change efficiency to 1.0 (still has +50% boost from Steam buff) * One too many zeros * SC Steam -> 100 EU, 100L of Normal Steam, Base efficiency to 1.2 * Rebalance Extremely Unstable Naquadah to match SpNt (Nerf turbines)
2024-08-09Change Cracking LCR Recipe Tier to HV (#2764)Daniel Mendes
* Change cracking LCR recipe generation -> Changed the CR recipe generation to be singleblock only; -> Added equivalent LCR recipes but at HV tier and halved recipe time. * Spotless apply