aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
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-07remove compat with IC2 fuel can (#1506)Glease
* remove compat with IC2 fuel can * Spotless apply for branch feature/remove-ic2-fuel-can for #1506 (#1507) 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-11-05Fix disassembler not handling container item (#1505)miozune
2022-11-04Overwrite setStackToZeroInsteadOfNull in me input bus (#1504)Maxim
2022-11-03Use right casing index for muffler and input hatch (#1503)Maxim
2022-11-03fix annoying rawtype warnings (#1501)Glease
2022-11-03a proper implementation for material from fluid (#1502)Glease
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-30Add method for getting a GT material from a Forge Fluid instance (#1497)Elisis
* Add Fluid material map, lookup function * spotlessApply (#1498) Co-authored-by: Elisis <gtandemmodding@gmail.com> Co-authored-by: GitHub GTNH Actions <> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-28make the cleanroom to accept 2 doors so alastor is happy (#1493)RIONDY 'POPlol333' Adam
2022-10-26Fixed annoying cover message bug (#1490)johnch18
* Fixed annoying cover message bug * Spotless
2022-10-26Force Industrial Apiary to suck 4 amps (#1492)Jakub
2022-10-25Recipe fixes 2022/10/25 (#1489)miozune
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-22Added check to API if the block should drop its inventory on break (#1479)Maxim
* Added check to API if the block should drop its inventory on break * Apply spotless * Changed should drop flag to take index argument
2022-10-22Remove convert gendustry bees code (#1187)DianeXD
* Remove convert gendustry bees code * fix derp. run BS update Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-10-20suppress grid proxy save NPE (#1478)Glease
2022-10-17allow reload the fluid texture (#1477)Yang Xizhi
fix fluid texture corruption after resource reload. e.g. switch language in game https://cdn.discordapp.com/attachments/522098956491030558/1031599367116836965/unknown.png
2022-10-17me output hatch (#1473)Yang Xizhi
* me input hacth * sa
2022-10-17add PR screwdriver compat to GT screwdriver (#1475)Glease
* add PR screwdriver compat to GT screwdriver * Spotless apply for branch feature/pr-screwdriver for #1475 (#1476) Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> * make it optional Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-10-16Fix upgrades (#1474)Jakub
2022-10-16Revise EBF description for Output Hatches a bit (#1469)miozune
2022-10-16Fix steam power total usage (#1467)miozune
2022-10-16Add combs ore dict (#1468)Jakub
2022-10-14Allow PA to handle Long EUt (#1465)BlueWeabo
2022-10-13Fix Fluid Detector RS signal (#1464)Charles Gagnon
2022-10-13Fix Super tank capacity in Waila (#1463)Charles Gagnon
2022-10-13Interface IAlleleBeeAcceleratableEffect moved to Forestry (#1462)Jakub
* Bump Forestry * Interface IAlleleBeeAcceleratableEffect moved to Forestry
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-12No more duplicated key II (#1457)iouter
* no more duplicated key II * spotlessApply
2022-10-12Add a Heating Counter for LHE Explosions (#1455)Steelux
* Add a Heating Counter for LHE Explosions - Change the LHE code to start counting up to a specific value on every tick where there's no distilled water, only exploding after a certain time has passed without water, instead of instantly. * Fixes * spotlessApply (#1456) Co-authored-by: Steelux <70096037+Steelux8@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-10-12fix comb localization (#1454)iouter
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-09only save necessary info on super tank break (#1448)Glease
2022-10-07Add Processing Option for GT++ Solar Salt in the LHE (#1444)Steelux
* Add Processing Option for Solar Salt in the LHE - Add an option to process GT++ Solar Salt in the Large Heat Exchanger, to avoid people having to build the Thermal Boiler specifically for this purpose. * spotlessApply (#1445) Co-authored-by: Steelux <70096037+Steelux8@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-10-07Added batch mode to Processing Arrays adding up to 128 parallel (#1446)Sampsa
* Added batch mode to Processing Arrays simulating up to 128 back-to-back recipe completions * Fix copy-paste mistake
2022-10-07Cryotheum bee change (#1443)Runakai1
* Add Blizz comb * apply spotless * Wrong way around
2022-10-06Less max PA parallels (#1438)BlueWeabo
2022-10-05Allow Redstone, Energy, and item to pass through Fluid Filter Cover (#1437)miozune
2022-10-05Port pocket multitool from gt6 (#1435)iouter
* Pocket Multitool * :spotlessApply * Revert ":spotlessApply" This reverts commit f1421c537c25627bb3d56ddca4fa610d90b16b07. * :spotlessApply again
2022-10-03Switch HF and phatlic acid (#1433)Runakai1
2022-10-03Add additional number formatting to GT5u and fix localisation issue with ↵Connor-Colenso
volumetric flasks (#1431) * Format large cells. * Add number formatting and fix localisation issue. * Add number formatting for radioactive cells. * Add number formatting for coal boiler. * Add number formatting for GT turbine items. * Add number formatting for GT credits. * Add number formatting for breeder cells. * spotlessApply (#1432) Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Co-authored-by: GitHub GTNH Actions <> 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>
2022-10-03Fix typo in NEI handler (1 ticks should be written as 1 tick). (#1430)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-10-01Merge branch 'advanced_redstone_covers'Martin Robertz
# Conflicts: # src/main/java/gregtech/api/util/GT_Utility.java
2022-10-01spotlessMartin Robertz
2022-10-01With recent changes, Allow PA to handle cell-less recipes (#1346)BlueWeabo
* add recipe maps, and allow PA to handle more than 1 fluid output * add some null checks * add forestry combs to the recipe map * safety null checks. * spotless
generated by cgit (git 2.46.0) at 2025-03-09 23:30:06 +0000