aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-08-27Backend Rework of the Quantum Computer (QC) (#2849)DylanTaylor1
* QC Rework * Increase cooldown rate * Cleanup QC/rack code * sa * Add Cooling Core * Fix Scanner Info --------- Co-authored-by: Dream Master <dream-master@gmx.net>
2024-08-26Fixed uncraftable LFTR fluid Beryllium Fluoride (#2982)Lorenzo Todisco
2024-08-26Texturework in GT++ (#2945)BlueHero233
* Leaves, Breads and Pizzas re texture * Crop Blocks Added * Fix Advanced Boilers top texture * Adding more controller faces * Remove redundant code * Finish controllers and code readability * spotlessApply to fix violations * Better Tank texture * Various Fixes * Various Fixes * Oopsies * Spotless Apply again... minor adjustments to drinks * Revert public api changes and scanner textures reference couldnt find reason why it was throwing NoSuchFieldError even when crops plus plus was recompiled with correct paths * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Merge branch 'master' into mergeGTNEIOREboubou19
2024-08-26Added a tooltip line for strong redstone output (#2983)RecursivePineapple
Co-authored-by: boubou19 <miisterunknown@gmail.com>
2024-08-26Merge branch 'master' into mergeGTNEIOREboubou19
2024-08-26Update postea to new TE transformer fix (#2985)NotAPenguin
Update postea
2024-08-26Merge branch 'master' into mergeGTNEIOREboubou19
2024-08-26fix issues caused by mergeboubou19
2024-08-26remove gtneioreplugin folder for history mergeBlueWeabo
2024-08-26fix dependenciesBlueWeabo
2024-08-26merge sources and edit mcmod.infoBlueWeabo
2024-08-26Fix breakBlock using wrong block metadata (#2980)NotAPenguin
Fix long standing breakBlock bug
2024-08-26Merge in GTNEIOrePlugin with historyBlueWeabo
git-subtree-dir: gtneioreplugin git-subtree-mainline: 8c406453e956a4630239ccb7088fe1706b61bb7d git-subtree-split: 2ccf8c43d8d25b10239f5bcc48e5be9ac4a0ab65
2024-08-26Fix Typo In Dangote Description (#2979)Dr-Nye
Update GregtechMetaTileEntity_Adv_DistillationTower.java Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Multi Autoclave/Lathe Revisions (#2976)Volence
* Revisions: add option for output hatch * Revisions: Format waila better * Revisions: More cleanup on waila and add some to the MultiLathe --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Small adjustments to waterline (#2978)NotAPenguin
* do some tooltip clarifying and disable maintenance properly * Disable hatch locking for all waterline multis
2024-08-26updateMartin Robertz
2024-08-26Fix of Simple Stirling Water Pump when it consume container item of certain ↵Elkatra2
fuel items (#2970) fixing bug of Simple Stirling Water Pump Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Fix some misnames and allow toggling batch mode with wire cutters (wh… (#2975)Mary
Fix some misnames and allow toggling batch mode with wire cutters (while shifting) Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Extractor multi (#2966)Mary
* Boilerplate * Removed cursed galacticraft dependency. Sorry mitch :( * spotless * Spotless * Update GT_Loader_MetaTileEntities.java * Update to EMS casing * Finalize multi * Renamed * Small tooltip fix --------- Co-authored-by: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com>
2024-08-26Remove O-Xylene (#2973)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-26Give MABS void mode (#2974)Mary
Give MABS batch mode
2024-08-26Normal recipe eu for HSS-E (#2972)Mary
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Fix crash when trying to break AE2 cables with a GT wrench (#2958)ceg
* Account for edge case when Platform.rayTrace returns a null value. * Account for edge case when Platform.rayTrace returns a null value. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Steam Multi change (#2959)evgengoldwar
* Added craft for Forge Hammer * Renamed Steam Controller ID * Added Dark Steel Block For Steel tier --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-25Fix broken oredict cache if cached early during load time (#2968)Raven Szewczyk
2024-08-25New Multi Autoclave (#2863)Volence
* Create basics of new multi * Fix forming and recipe processing. Fix tiering and display tiers in waila * Add textures, clean up some code, rework bonus calculations * Apply spotless * add amp limit * update deps * Revision: Add 128 mininum casings needed and tooltip * Revision: Change extended class to ExtendedPowerMultiBlockBase * Revisions: remove unecessary call to getBaseMetaTileEntity().sendBlockEvent * Revisions: revised code to break out calculations and show in waila, update calculations to be more inline with other multis * Finished some other changes and formatting, moved things to lang file * Update GT_Loader_MetaTileEntities to use star import * Update src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiAutoclave.java * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
2024-08-25Rename Dragon Blood bee and items (#2962)Volence
* Change the Dragon Blood and items based around it to be Dragonblood be to further reflect the items it produces * Add lang instance for bee
2024-08-25Fix T8 waterline draining twice the infinity cost as expected (#2963)NotAPenguin
fix t8 water draining twice the infinity as expected
2024-08-24remove crowbar playing breaking sounds when not breaking (#2960)chochem
better no sound than the wrong one
2024-08-24Make frame boxes no longer TileEntities (#2799)NotAPenguin
* fiddling around with frame boxes * more fiddling * am trying * frames exist * fix frame rendering in inventory * Fix in world frame rendering * Apply cover to dumb frame * continue work on frames * apply covers to correct side and fix crash on load * Test permissions * fix oredict for new frames and create recipes * fix waila names and drops (kind of) * fix drops * mostly all working * remove old comment * fix structurecheck using new frames * create the TE transformer * it didnt work * dont modify tes we dont want to modify (needs future postea update) * it works! * item transformer works too * spotless * add more method overrides from generic gt block? * update postea * fix postea transforming items in reserved frame range that were not frame boxes * fix tesla tower structurecheck + capacitor hatch crash * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * Spotless apply for branch dumb-frames for #2799 (#2953) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove extra null check * Update src/main/java/gregtech/common/blocks/GT_Block_FrameBox.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * remove more messy instanceof checks * Spotless apply for branch dumb-frames for #2799 (#2954) spotlessApply Co-authored-by: GitHub GTNH Actions <> * remove unnecessary null check * try fixing facade color * Update src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> * small cleanup in framebox gen code * swap material for frame box block * fix description * make getMaterial static and add fix AE cover color * nicer casts + localize tooltip in frame block instead of stealing old localization * draw grid on cover hover * add a null check in getTexture() that hopefully fixes crash in full pack when interacting with frame boxes * also draw grid when hovering with wrench * add chemical element back to tooltip * fix breaking frame not causing structure update --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Alexander Anishin <14104815+OneEyeMaker@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-23Cleaner abs recipe duration calc (#2949)chochem
* fix broken file * cleanup tier and duration for abs recipes --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Display real data stick for assembly line recipes in NEI (#2917)HoleFish
* display real data stick * spotless --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23General beamline fixes, balancing (#2899)Elisis
* Remove cell chemistry, increase tiering of recipes from mask-making process * Fix LN2 and LOX in LINAC and Synchrotron * Fix Synchrotron structure definition antenna having a different meta to the actual block * Fix Accelerator Glass Hardness * Fix mobs spawning inside Synchrotron, make LiB6 rods less painful to make * Halve TC base recipe duration, loosen focus requirements for lower-tier wafers, add more detail to LINAC TT * Improve LINAC output energy eu/t scaling * Remove log * Spotless * Remove merge artifact * Spotless apply for branch beamline-fixes-2 for #2899 (#2900) 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> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
2024-08-23Europium bee line (#2818)Volence
* Add europium, neodymium, and rare earth bees. Normalize naming of combs and some bees with their products * fix a few more that were missed, and also apply the same logic to the comb drops * fix redstone bee to iron bee for neodymium * Made requirement for Europium bee mk 1 compact fusion controller and mk 2 for americium bee * Update block requirements to be more efficient for bbreeding * Cleaning up bee and comb names to be closer to what they produce, fix up some typos --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Fix recipes broken in the optimization pr (#2948)Raven Szewczyk
2024-08-23Add recipemap for EBF gas recipes (#2931)HoleFish
add Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Add Structure Update button (#2941)HoleFish
* trigger * structure update button --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Tooltip fixes (#2919)OmdaCZ
* Fixed tooltips of some machines. * removed properly what I didn't remove before * Undid redundant change. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
2024-08-23Cleaned Textures for Quantum and Gravi Star (#2947)ZaykieT
* Add files via upload * Add files via upload --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Added Steam mixer (#2915)evgengoldwar
* Added Steam Mixer * Added Steam Mixer * Change logic and tooltip steam multi * Change mixer tooltip * Apply spotless * Fixed updateTexture for InputHatch * Added controller recipe for Steam Mixer --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
2024-08-23Fix MFE issues with multi-amp hatches (#2912)Mary
Fix Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
2024-08-23Bug with hatches in Steam multis (#2923)evgengoldwar
* Fixed hatches bug * Apply spotless
2024-08-22GT Recipe matching optimizations (#2943)Raven Szewczyk
* GT Recipe matching optimizations * Fix wrong parallel calculation due to unified items having a stacksize of 1 * Fix not validating non-consumed inputs
2024-08-22Fix MEBF controller amount in DTPF controller Recipe (#2944)GDCloud
fix mebf amount
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-22Make CAL only eat a single imprint instead of the entire stack (#2942)NotAPenguin
* make cal only eat a single imprint instead of the entire stack * make sure to clear if empty
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>
generated by cgit (git 2.46.0) at 2025-03-04 23:27:12 +0000