aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets/gregtech
AgeCommit message (Collapse)Author
2022-11-17added new capes, credit to @Jimbno (#1519)boubou19
2022-11-17Add New Items Related to the QFT Tiers (#1514)Steelux
* Add New Items Related to the QFT Tiers * spotlessApply (#1515) Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Small Addition to Composite Description Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-11-13Gas turbine singleblock (#1511)Martin Robertz
* Added EV and IV single Block Gas Turbine * BS+SA * derp (cherry picked from commit c8ebc2f5a8decb8e28c76e9ceb2eca0e04618c22) * add pollution level (cherry picked from commit ffcddc7547fa9f8f3d3235b596ead812291ff4cb) * Set efficiency * Texture Co-authored-by: kuba6000 <kuba.123123.6000@gmail.com>
2022-11-03upd(CASING_ENGINE_INTAKE): Radiatorreplaces propeller (#1500)Léa Gris
2022-10-31Add solenoid coils for cyclotron (#1494)Connor-Colenso
* Add solenoid coils for cyclotron. * Fix? * Push * Spotless apply for branch cyclotron_coils for #1494 (#1495) * Change stack size (#1484) * Replace TSS Coils with Titanium-Platinum Ones (#1211) * Replace TSS Coils with Titanium-Platinum Ones - Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1); - Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier; * Simplified Metal Proportion for TPV * change tpv ebf temp to 3k to be even with TSS (cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490) * add TPV mixer recipe (cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1) * add tpv as metal via tag (cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e) * Spotless apply for branch EV_Coil_Change for #1211 (#1482) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * move TSS and TPV to ev (Mixer recipe) (cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f) * add info to Nei * Spotless apply for branch EV_Coil_Change for #1211 (#1483) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> 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: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de> * Recipe fixes 2022/10/25 (#1489) * Fix quad input hatch voiding (#1487) fixes https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11728 * Add constructor for Energy Hatch with inventory (#1488) * Force Industrial Apiary to suck 4 amps (#1492) * Fixed annoying cover message bug (#1490) * Fixed annoying cover message bug * Spotless * make the cleanroom to accept 2 doors so alastor is happy (#1493) * spotlessApply Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@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: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Random magic numbers 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: Phineasor <80113803+Phineasor@users.noreply.github.com> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Guinea Wheek <guineawheek@users.noreply.github.com> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: johnch18 <42650497+johnch18@users.noreply.github.com> Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
2022-10-30Added localization of the Ore Factory achievement (#1499)Maxim
2022-10-23Replace TSS Coils with Titanium-Platinum Ones (#1211)Steelux
* Replace TSS Coils with Titanium-Platinum Ones - Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1); - Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier; * Simplified Metal Proportion for TPV * change tpv ebf temp to 3k to be even with TSS (cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490) * add TPV mixer recipe (cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1) * add tpv as metal via tag (cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e) * Spotless apply for branch EV_Coil_Change for #1211 (#1482) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * move TSS and TPV to ev (Mixer recipe) (cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f) * add info to Nei * Spotless apply for branch EV_Coil_Change for #1211 (#1483) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> 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: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de>
2022-10-22ore line for some useless ore (#1210)Yang Xizhi
* oreline * ilmenite * update BS+SA * Revert "update BS+SA" This reverts commit 00c0d26b5d4963a42c7cd6721cc9444fac8fd2c2. * add missing import * garnet * Spotless apply for branch ore for #1210 (#1481) * Remove convert gendustry bees code (#1187) * Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net> * Added check to API if the block should drop its inventory on break (#1479) * Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument * spotlessApply Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * green vitriol recipe 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: DianeXD <64360468+DianeXD@users.noreply.github.com> Co-authored-by: Maxim <maxim235@gmx.de>
2022-10-17me output hatch (#1473)Yang Xizhi
* me input hacth * sa
2022-10-12Add interface to implement Bee effects that can be accelerated (#1460)Jakub
* Add IAlleleBeeAcceleratableEffect * Still feeling the rainbow * Use float * NBT * No more gendustry * Production modifier is counted from 0 now * Extract bee cycles length * spotless
2022-10-09Apply new Bees formula in Industrial Apiary and move all gendustry upgrades ↵Jakub
to Gregtech (#1447) * Update forestry * Apply new formula (+uncap the chance) * Yeet gendustry upgrades * Conversion recipes * Add upgrade frame * Remove recipes * Gendustry way * Yeet gendustry * Fix
2022-10-09digital chests improvements (#1450)Glease
* unify super chest and quantum chest code base * add item info to waila * add an input filter to digital chests
2022-10-09pump no uncommanded auto retract (#1449)Glease
2022-10-05Port pocket multitool from gt6 (#1435)iouter
* Pocket Multitool * :spotlessApply * Revert ":spotlessApply" This reverts commit f1421c537c25627bb3d56ddca4fa610d90b16b07. * :spotlessApply again
2022-10-01Merge branch 'advanced_redstone_covers'Martin Robertz
# Conflicts: # src/main/java/gregtech/api/util/GT_Utility.java
2022-10-01added current parallelism in the integrated ore factory desc (#1426)boubou19
* added current parallelism in the integrated ore factory desc * spotlessApply (#1427) Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: GitHub GTNH Actions <> * updated lang file * update lang file Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-26Adapt some multiblock GUIs for configuration circuit (#1415)miozune
* Adapt Distillation Tower GUI for configuration circuit * Ore Drilling Plant & Pyrolyse Oven
2022-09-24Update zh_CN.lang (#1403)Kiwi
2022-09-23Properly revert `GuiCover` textureMatej Dipčár
2022-09-23Add new icon for the analog modeMatej Dipčár
2022-09-23Add cover texturesMatej Dipčár
2022-09-23Update item cover texturesMatej Dipčár
2022-09-23Add Maintenance Detector CoverMatej Dipčár
2022-09-23Implement all advanced receiver modesMatej Dipčár
2022-09-23Revert GuiCover texture to originalMatej Dipčár
2022-09-23Add Advanced Wireless Redstone CoversMatej Dipčár
2022-09-18migrate to new survival autoplace api (#1382)Glease
* migrate to new survival autoplace api * reduce type of blocks autoplace will use this does not prevent those blocks from not being accepted into the structures though * implement getBlocksToPlace * fix survivalConstruct code for assline and DT i hate variable size multi :( * fix AIOBE * allow disabling machine block updates on a per-thread basis * make a sensible guess at what texture to use on server side * spotless * implement hologram support for bbf * spotless
2022-09-17Fix Tooltip (#1388)ChromicRedBrick
* Fix typo in tooltip * Update LCR tooltip
2022-09-14Fix inconsistencies (#1380)GDCloud
2022-09-13fix localisation typo (#1379)Alexdoru
2022-09-11Adv debug structure writer (#1362)Maxim
* Added advanced debug structure writer * Applied spotless * Removed testing variables * Added client only to rendering * Added one client side annotation too much * Included requested changes * Applied spotless * Introduced variables for tooltip keys
2022-09-11Use pre-defined methods to draw tooltips in GT_GUIContainer_DigitalTank (#1374)Alexdoru
* use pre defined methods to draw tooltip in GT_GUIContainer_DigitalTank * introduce private static final fields for string tooltip names
2022-09-10some text change (#1369)Alexdoru
* some text change * added colors with ON / OFF * correction
2022-09-09Move GT Tank button position (#1363)くぁーりぃ
* move digital tank button position * spotless * spotlessApply (#1364) Co-authored-by: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-08fix(API): GT_Fluid (#1349)Léa Gris
* fix(API): GT_Fluid - Fix: Use registeredFluid instead of GT_Fluid to configure Materials and containers to prevent crashes when retrieving fluids referrences from those. - Impr: Adjust fluid luminosity computation to better fit with Tungsten as maximum - Impr: Remove transparency from the fluid.molten.autogenerated.png texture to prevent molten materials to appear dilluted. * ./gradlew :spotlessApply * rev(comment): address review comment from @Glease rev: https://github.com/GTNewHorizons/GT5-Unofficial/pull/1349#pullrequestreview-1098651647 fix: Logic to handle working with own registered fluids and already registered fluids. imp: Some IGT_Fluid methods requires the fluid to be registered, throws an IllegalStateException on use at an unregistered fluid. imp: Normalizes @inheritDoc no additionnal text allowed
2022-09-07revert to spritesheet for block textures for gaia spirit (#1351)Glease
* revert to spritesheet for block textures for gaia spirit also removed now-unused transcendent metal block textures * Spotless apply for branch fix/animated-material-texture-fix for #1351 (#1352) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-06Fix overly large sprites being used causing some users FPS lag (#1347)Glease
* fix sprite abuse * Spotless apply for branch fix/sprite-abuse for #1347 (#1348) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> * convert gaia spirit Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-09-01Digitalize Super Tank part 2 (#1331)くぁーりぃ
* fix super tank pipe connecting issue * Add fifth button and fix translation key * apply spotless * fix
2022-09-01Sodium potassium (#1322)Martin Robertz
* Add a new way get Sodium Potassium Add Fluid Sodium to gt * spotless remove old NAk and Helium cell recipes * derp * add liquid sodium texture (cherry picked from commit bd050330f91e0306e156f6a130783e867661338a) * add liquid sodium cells (cherry picked from commit 45f988cf3bbca43abf3f07a0a8e7ba891b8727a3) * move recipe to core mod (cherry picked from commit 7db15cd792136abac6fb88c9a7fa9d05f1f0619e) * add a heater recipe without a input fluid * Revert "move recipe to core mod" This reverts commit 9d5ff875a00e59c6edb52336b7d9c20889d9bd9b. * use fluid heater recipe without input fluid * Spotless apply for branch Sodium-Potassium for #1322 (#1328) * Two slots wiremill (#1324) * add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * spotlessApply Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * Revert "Spotless apply for branch Sodium-Potassium for #1322 (#1328)" This reverts commit 5bf31ffddfeddd1c4d161d434abb8402939ec9d6. * spotless * make fluid heater working with <1 fluid (cherry picked from commit 8045cf6f03d0ce030b8e7b2fa6c70dca6d9ccc5d) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
2022-08-31Two slots wiremill (#1324)Martin Robertz
* add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-08-29Digitalize Super Tank (#1318)くぁーりぃ
* add new GUI * make gui interactable * make later three buttons actually function * add auto output feature * do localization * apply spotless * spotless pt.2
2022-08-26texture workJason Mitchell
2022-08-26add subchannel helper to GT_Multiblock_Tooltip_Builder (#1292)Glease
2022-08-23Add heating coil NEI display (#1287)miozune
* Add heating coil NEI display * correct condition
2022-08-19ME input bus, gives the multiblock direct access to the 16 selected item ↵repo-alt
types (#1271) * ME input bus, gives the multiblock direct access to the 16 selected item types * Reworked GUI to match the normal interface * Don't need to duplicate shadow slots Sync can (better) be done in `endRecipeProcessing`, in case some multi doesn't call `updateSlots` or does it at the wrong time * Clarify name, to distinguish from the (future) Buffering and Crafting buses * Make the GUI 4x4 again * Make the 4x4 GUI actually work * Make ghost item show item amount * Remove unimplemented code remnants Co-authored-by: Sampsa <sampo.vanninen@aalto.fi>
2022-08-16Texture Update (#1219)Connor-Colenso
* Update some textures to be more consistent and have proper black spots in pipes * Brighter textures Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-08-15Add localization to MC language list (#1260)miozune
* Add localization to MC language list * Revert workaround patches
2022-08-14Add localization for Squid Ink Cell (#1257)miozune
2022-08-14Fluid Limiter Cover (#1248)TrainerSnow
* Add FluidLimiter Cover * Update ItemList.java and register * Add texture * Refactor method
2022-08-14do not cache result of GuiColors if the object is not short-lived (#1254)Glease
generated by cgit (git 2.46.0) at 2025-03-06 09:26:35 +0000