aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
AgeCommit message (Collapse)Author
2024-08-01Add multi lathe (#2783)Volence
* first few files outlining new lathe multi * MultiLathe: Attempt to add tiers based on pipes * MultiLathe: Added Item Pipe Casing blocks and tiers * MultiLathe: Finished Machine and its mechanics * MultiLathe: Add recipe map and recipes for new precision lathe mode * MultiLathe: Apply Spotless * Revert recipe map changes * remove a few more recipe additions * revert to basic lathe recipe map for the multi * fix imports and make them all explicit * remove a few more * imports, update tooltip info * Update src/main/java/gregtech/common/blocks/GT_Block_Casings11.java Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> * Added to the texture list documentation for blocks --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
2024-07-30Adds lockable output buses (#2787)querns
* Adds output locking for non-ME output buses * Add data stick support for output bus filters * Small optimization to output bus iteration * spotless, my one true enemy
2024-07-29Optimize recipe check forcing and add a button to enable/disable (#2785)Sampsa
Disable expecited recipe check by default and add a button to enable behavior + optimize
2024-07-29Adds vein type readout to multiblock miners (#2732)querns
* Adds vein type readout to multiblock miners (+metrics) * Spotless, fix weird import * Downgrades VP dep to latest non-pre version * Update dependencies.gradle * Refactor to eliminate dep on VisualProspecting --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-25Changed tooltips and some logic in Steam Multi (#2747)evgengoldwar
* Change Steam Centrifuge * Change Steam Compressor * Change Steam Macerator * Change Steam Washer * Change Steam Water Pump * Added sounds for Steam Water Pump and Steam Washer * Change recipe ULV input and output hatch * Added sounds
2024-07-25Added Steam Forge Hammer (#2736)evgengoldwar
* Added Steam Forge Hammer * fix * Saving tiers in NBT * fix update bs --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-25Update multi-machines to display running mode in GUI (#2755)Mary
* Framework for mode text in gui * Add getMachineModeName to all multimachines * Changed lang file for MFE because "Electromagnetic Polarizer" and "Electromagnetic Separator" are too long and make the GUI look bad * Removed leftover code * Removed more leftover code... oops * Moved logic to base class and made mode switch chat message localizable * Merge caused spotless to fail, I guess * Reverted logic from parent class * ahhhh spotless
2024-07-24Add new textures for circuits (#2757)GDCloud
add new circuit textures
2024-07-20Beamline (#2619)Raven Szewczyk
* Beamline * Remove hardcoded dreamcraft items and spotless * Remove logs and fix auto structure check * Remove logs and fix auto structure check * Fix typo and synchrotron high MF scaling * sa (cherry picked from commit b2796d95538a1b683b4a98bf6cb0f8fe21404fbd) * Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes * Spotless * Prevent mob spawning on casings * Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe * Spotless * Add placeholder particle textures * Add some mask recipes I missed * Spotless apply for branch lanth-beamline for #2619 (#2630) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes * Spotless apply for branch lanth-beamline for #2619 (#2648) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Minor changes, add more multi error messages & 9x U-238 SC recipe * Spotless apply for branch lanth-beamline for #2619 (#2651) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Missed a change * Spotless apply for branch lanth-beamline for #2619 (#2652) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Update beamline desc * Remove comments, move coolant fluid check to Util class * Spotless * Spotless apply for branch lanth-beamline for #2619 (#2666) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Fix Mu-Metal recipe output amount, tool stats for MM & LaB6 * Spotless * Fix multi hatch textures * Spotless apply for branch lanth-beamline for #2619 (#2676) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time * Fix misleading BL tooltip * update * remove import * Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases * Remove RA1 calls in beamline (#2716) * Spotless apply for branch lanth-beamline for #2619 (#2717) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix * Spotless apply for branch lanth-beamline for #2619 (#2733) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: unknown <gtandemmodding@gmail.com> Co-authored-by: Elisis <jarrad.thomson@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-07-19Mode switch button (#2730)Mary
* Button textures. Once again I am manually pulling changes from a different branch... sorry. If you want to read the full commit history, the modeswitchgui branch has it. * Texture enums * Implementation in ControllerWithOptionalFeatures * Implementation in GT_MetaTileEntity_MultiBlockBase * Implemented into all multi-machines * Lang changes * Added documentation * Added missing clear * Quick polish changes - button base texture is standard instead of pressed, and the click noise works. * MFE compatibility * TurboCan compatibility * Fix misordered icons in canner * Removed redundant code in button * Attempted to refactor with MachineMode enum. Also moved loadNBT and saveNBT logic to base class * sa * fix (cherry picked from commit 1f14a7abf460ad114f10e8ba58b6be44b7b18d48) * Rework machineMode into enum of IMachineMode completely * Fixed breaking typo * Made it stop crashing on normal multis that don't support mode switch * Revert * Finished revert and re-addressed changes from original review * spotless * Load nbt tags in correct order. Fixes backwards compat * Check nbt key on load instead * Run super last and make all MACHINEMODE static --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-07-18Added Water Pump (#2694)evgengoldwar
* Add Water Pump * Added check humidity * Apply spotless * Added tier 2 WaterPump * Added new textures and Fixed the display in nei * Optimizing imports * Fix tooltip * Added craft for Output hatch ULV, Wooden Casing, Water Pump * Apply spotless * sa+update deps * Delete the sky check method * sa * Rewrote WaterPump to SteamMultiBase. * Added a steam hatch to the structure and changed the tooltip * Spotless apply * Changed VoidProtection and calculate water generation * Remove star imports * Rename Wooden Casing to Primitive Wooden Casing * Remove enableMultiblock_WaterPump * Rename static variables * Change variables and tooltip * Sa --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-18Add wireless computation and data stick hatches (#2724)NotAPenguin
* start on wireless computation * initial implementation of wireless computation hatch * Implement wireless data sticks * Fix wireless computation by simplifying the implementation greatly * Delete dead code * Add scanner output for wireless computation in network * Rename wireless computation hatch to cloud hatch * Final rename to client/server
2024-07-18Add a Multiblock Electromagnetic Separator (#2726)Mary
* Built multi template with required methods in gt++. * Filled out template based on gt++ electrolyzer code * Refactored into gregtech. Not supposed to add multis to gt++, whoops! * IntelliJ "smartly" deleted all of the imports in GT_Loader_MetaTileEntities and replaced it with a wildcard import... which caused it to fail checkstyle. Thanks so much, IntelliJ. * Figured out how to make IntelliJ Stop Doing That * Added author tag and vac freezer texture for testing. * Registered casing, working on getting texture functional * Added casing texture * Fixed structure check and added processing logic. Multi now forms and can run EMS recipes * Added overlay textures * Made new Casings10 class and added EMS Casings to it. Texture mesh now functions * Made controller match casing mesh * Shifted Casings10 to an actual page number instead of magic number. Now sits on page 16, following where waterline casings will be implemented in future * Added Electromagnet Housing. Has no texture, but you can place an open its inventory * Added electromagnets and their texture files * Multi now requires EM housing and breaks if there are 2 * Electromagnet Housing has proper texture and can be wrenched. Also has a placeholder overlay * Tooltip updates. Added pollution * Electromagnet tiers modify processing logic. Some issues remaining * Prettier switch & spotlessApply * Multi now validates electromagnet before recipe check. Also added a machine casing texture * Pollution fix * Support for exotic energy hatches added. Recipe check fails if electromagnet is too weak * Stack size of 1 for electromagnets * New electromagnet textures * Final pass on EM textures. Also, EM Housing uses IV hull as base texture instead of ULV * Put in placeholder-ish recipes for controller/casings/EM housing * Placeholder recipes for electromagnets. Also fixed structure check, whoops * Renamed multi to Magnetic Flux Exhibitor * MFE can run as a polarizer * Fixed exotic warning getting stuck * Attempted to add assline recipes, not working * Fixed assembling line recipe templates. Thank you chochem <3 * Fancied up tooltips * Fixed parallel issue * Updated recipes. Will have to move them to coremod * Nerfed speed on all electromagnets * sa * Restricted MFE to multiamp non-laser. * Spotless * Animated Mag hatch * Added glow * Removed pollution. I am a gentle soul * Addition to structure check * Disabled wireless laser compatibility * sa (cherry picked from commit 155cf4dd7284ca84bd9be79f11b6f577b38a4e0d) * spotless * Removed all recipes. These have been replaced in the coremod * -Removed unnecessary structure check -MIN_CASING final -Baps author tag -Refactored mMagHatch to not be a list -Added tooltip builder in MagnetTiers * Forgot to run spotless * Last minute tooltip fix for structure accuracy --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-18Add a multiblock for Fluid Canner/Canner (#2729)Mary
* Ported changes from canner-dev branch because I have thoroughly messed up my branch management. * Renamed multi, fixed textures, spotless
2024-07-15Amazon warehouse is now an unpackager too (#2723)ddoubleo
* Amazon warehouse is now an unpackager too * Fixed unpackager recipes not showing up in NEI for the Warehouse. Edited the tooltip * sa (cherry picked from commit e42861816ba516bd3da1f28d068a1e800e6098ee) --------- Co-authored-by: bdoubleo <user@MacBook-Pro-user.local> Co-authored-by: Dream Master <dream-master@gmx.net>
2024-07-06Add MK0 and MK4 precise casings for PrAss (#2698)HoleFish
* add mk0 and mk4 casings * fix recipe (fuck bw material)
2024-07-02Add Dimensional Convergence, a new DTPF mode (#2669)GDCloud
* store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * Add bonus for using higher tier CoAl casings (#2668) * add bonus for higher tier casings * add tooltip info * Fix a vat recipe conflict (#2677) add circuit * update * Fix EBF & multi smelter scanner info (#2681) fix * Put some sanity in GT_MetaGenerated_Item_01 (#2649) * set coin ids in enum * extract coin shapeless recipes * Arrows * splitting more * mold shapes * big split * split behaviors * spotless * enumerated shapes * more enum work * continuing enum work * new batch of enum work * last enum work * Sort enum by IDs * move enum into its own class * public field * Put some sanity in GT_MetaGenerated_Item_02/03 and in GT_MetaGenerated_Tool_01 (#2659) * enum work * sorting the class * extracting the enum in its own class * initial enum work for GT_MetaGenerated_Item_03 * split * finished enum work * extract enum in its own class * migrate to enum * remove duplicated recipes * sorted enums * extracted enum in its own class * spotless * fix compilation errors * spotless * fix mistake * Add oredict for LV and HV circuits (try no 2) (#2682) * blacklist ic2 ciruits from unificator * fix 2 circuit oredicts * move cleanroom assembler recipe * remove unittest that needs nhcoremod to work * fix electronic circuit recipe * move recipe to better place and avoid duplicates * move fluid filter recipe * Clean crafting achievements (#2662) * clean up crafting achievements * spotless * make crop tooltip appropriate (#2684) change tooltip * Move some mixins to hodgepodge (#2633) * Move some mixins to hodgepodge * store astral arrays internally * save to item nbt * initial implementation * uncap running time and add syncer for convergence status * adjust tooltips and add localisation * add comments * this should not be here * small text adjustments * add transdimensional alignment matrix * add recipe * require alignment matrix * capital c * fix catalyst tier being off by one * swap some items around * update aligment matrix tooltip --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: HoleFish <48403212+HoleFish@users.noreply.github.com> Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Jason Mitchell <mitchej@gmail.com>
2024-06-30Adding information to Waila (#2674)evgengoldwar
* Adding information to Waila * sp * Added mode names to the lang file
2024-06-29Several fixes for Tesla Cover (#2671)RealSilverMoon
* Fix tesla cover memory leak * Fix tesla crash when destroying tesla cover * Add max output display
2024-06-29Add GUI parallel configuration window for transcendent plasma mixer (#2664)GDCloud
add parallel config window
2024-06-17Sludge fixes (and buff) (#2667)chochem
what a sludge
2024-06-09Fix typo in wind meter (#2653)Reagan
Fix typo in wind mete
2024-06-09Add configurable tick rate to yottank via EM parameters (#2643)Jakub
* Add configurable tick rate to yottank * More precise * Fix possible logic bug
2024-06-07Add Steam Multi (#2631)evgengoldwar
* add Steam Centrifuge * add Steam Washer * Change Steam Washer * Change Steam Multi * Fix tooltip Washer * Change Washer * Change Steam Multi * add id comment * update deps + sa * Added centrifuge tiers * Added washer tiers * Added compressor tiers * Added macerator tiers * Delete fixAllMaintenanceIssue(); * Delete fixAllMaintenanceIssue(); * Changed recipes * Added meaningful names * sa + update bs --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-06-03Added One Time Rebalance Button to LSC (#2635)reign
* Added one time use instant rebalance button to LSC * Update src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com> --------- Co-authored-by: NotAPenguin <michiel.vandeginste@gmail.com>
2024-05-30Complete backend rework of the EIG (#2616)Raven Szewczyk
* Complete backend rework of the EIG * Mergening Related Updates Also some loader references refactoring * fix (cherry picked from commit 7fd5d7417bddfb6e49ede3986d9a547f15b21289) * More Mergening fixes Updates the declaration of the stem mixin to match the new format. * Inline EIG IC2 bucket constants addresses: https://github.com/GTNewHorizons/GT5-Unofficial/pull/2616#discussion_r1620596497 * Fix Seed Removal in regular seed simulations Should address https://github.com/GTNewHorizons/GT5-Unofficial/pull/2616#discussion_r1620583338 --------- Co-authored-by: Guillaume Mercier <10gui-gui10@live.ca> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-05-29Concrete backfiller - Added the ability to fill liquid (#2623)evgengoldwar
* lang file * sa * Update GT_MetaTileEntity_ConcreteBackfillerBase.java remove star imports * Restore original logic * Save and load NBT --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-05-27Bartworks cleanup (#2628)HoleFish
* cleanup * fix typo
2024-05-26Leaves, Breads and Pizzas re texture (#2606)BlueHero233
* Leaves, Breads and Pizzas re texture * Crop Blocks Added
2024-05-25Merge Lanthanides sourcesRaven Szewczyk
2024-05-25Migrate kubatech source codeRaven Szewczyk
2024-05-25Move GoodGen sourcesRaven Szewczyk
2024-05-25Move kekztech sourcesRaven Szewczyk
2024-05-24Merge addon sourcesRaven Szewczyk
2024-05-23GigaGramFab relocationRaven Szewczyk
2024-05-22Implementation: Raw Ore Items as Ore Drops (#2502)Ethryan
* testing * Fix textures * Adding Drops, still need to add furnace recipe * Need to fix the multiple smelting recipes. otherwise stuff works. * part 2 * Remove wip block code I added * Moved it to a new processing file * Fix Oredict and add a stone dust chance output. And added a config option for fortune bonus. * Finally got Spotless to work * fix config system set it in gregtech config with oredropbehaviour in gregtech.cfg * Added new option and an option that returns it to the old behaviour. * Moved the raw ores to meta3 since meta1 was full. (MetaID range fix) * Fixing the MBM to only process small ores with fortune. * New config option * try to fix the recipes not working on Zeta * Implement Caedis Fortune fix * Added comment * Spotless * Fix stone dust amount from macerator * Adding Raw ore to the OreFactory (Untested) * spotless * Update this to actually drop the amount number of stack, instead of the stack set to the amount * New Random function for fortune and shapeless crushing recipes for the raw ores. * Fix * Actually make the block per dimension. * Fix an () issue. And make this actually work ingame. and not just randomly. * Change back drops Ned to look into Silk Touch more * Enable Silk Touch * Wth Spotless?, THIS made you complain?
2024-05-13Fix unwanted trailing commas from MCMETA (#2597)Julien Constant
This might be ignored by MC, but external JSON parser yells on this
2024-05-11Change warning texts (#2592)HoleFish
change
2024-05-10Imporved Drone Center (#2591)RealSilverMoon
* Add plascrete block as an exception * Spotless * Add sort button * rebalance range * small fix * Add a localized button * Rename and add comment * Spotless
2024-04-24Fix Drone Centre Memory Leak (#2582)RealSilverMoon
* Fix: downlink connect to various centres * Spawn drone item after destroying * Update lang * Save to nbt
2024-03-11Add messages about the reasons for machine shutdown during processing (#2522)HoleFish
* ShutDownReason setup * implement * fix machine not turn on
2024-03-02Restore overlay textures removed by mistake in #1671 (#2521)Caedis
2024-02-27Capitalize TiC recipe categories (#2512)miozune
2024-02-26Add recipe categories for TiC integration (#2510)miozune
2024-02-25Add SearchBar for Drone centre (#2498)RealSilverMoon
* Add SearchBar for DC * Display customName * Fix i18n * Add UI for module * extract variable as final * convert to ChatComponentTranslation * move some code to mui * Spotless * More i18n
2024-02-12Wireless Activity Detector; Power On/Off Activity Detector (#2490)slprime
* Wireless Activity Detector; Power On/Off Activity Detector * Wireless Gui Redesign --------- Co-authored-by: slprime <history-21@yandex.ru>
2024-02-11Add godforge materials (#2491)GDCloud
* add magmatter * add quark gluon plasma * remove nanites * forgot chem formula
2024-01-31Add Drone Centre (#2412)RealSilverMoon
* Add Drone Centre * Apply texture and model * Update en_US.lang * Remove import.* * Switch to block render * Balance range and break chance * Add recipe * Spotless * Update lang * Fix recipe * Rewrite connection system and UI * Remove debuff party * Spotless * Fix server class not found * A stupid enough recipe * Another bad recipe * Update tooltip & i18n * Close it! * Spotless * Disable draggable * prohibited remote control when centre is offline * Rename * Rename; Change specifiers * Update texture * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-01-15Change Canola back to Rape seed (#2464)Caedis
* Revert "Canola is a better name than Rapeseed (id is staying the same) (#2443)" This reverts commit 2e7625ffed587d930afda7692db0c478e430a8c2. * Only rename visual item name, not internal name * Revert "Only rename visual item name, not internal name" This reverts commit d1a764338344c4871fd12cb4890c38bb1f9ca40b.
2024-01-12Make stocking bus/hatch autopull slot refresh timer adjustable (#2448)GDCloud
* add to stocking bus * add to stocking hatch * localisation stuff * nbt fix (maybe) * fix stocking hatch too * hasKey is cleaner