aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2023-03-29Update production upgrades formula in Industrial Apiary (#1820)Jakub
2023-03-28Fix PCB Factory not voiding output when trace size is above 100 (#1822)Fox_white
2023-03-26Display tier of nano forge in GUI (#1813)Maxim
2023-03-23Fix infinite drill loc (#1812)Maxim
* Fix typo in oil drill infinite * IntelliJ hates spaces
2023-03-22Activity Sound (#1811)Maxim
* Added activity sound * Added acitivity sound to DTPF * Added missing annotation * Missed one
2023-03-22Fix super tank output rate based on the pump used (#1810)chochem
* fix tank output speed * sa
2023-03-22Display Mode of Ore Processor to WAILA and Scanner (#1803)Батьків Нестор-Євген Васильович
* Add Some display to WAILA and Scanner * Move arrow and aqua to final * Add localization Fuck u mc7771 :) * Bruh Now u happy?!
2023-03-22Added sound to distillery (#1809)Maxim
2023-03-21Fixed projects not unlocking if build elsewhere (#1808)Maxim
2023-03-20Add Insanely & Mega ultimate battery (#1807)GDCloud
* Add items * Add error-tier tooltip * localisation * textures
2023-03-20Added some null checks to loadInstance (#1806)Maxim
2023-03-20Added machine sound to fusion reactors (#1805)Maxim
2023-03-19Fix typo in Nano Forge tooltip (#1804)glowredman
2023-03-19Add Bw glass to Ore factory (#1802)Батьків Нестор-Євген Васильович
Make Assine Accept UMV glass
2023-03-18fix the machine's tooltip doesn't automatically generate when loading (#1799)iouter
* register tooltips * merge master (#1800) * Added custom click sound for the power switch (#1798) * Auto-stock for stocking input bus (#1790) * Add auto-stock for stocking input bus * Add GUI support for autostock and min input limiting. * Added support for copy+pasting config w/ data sticks * typo * correct order * fixes * update branch (#1795) * Send cover data immediately when cover is placed (#1791) * migrate ore prefixes from gt++ and bw (#1792) OrePrefixes are used in switch case a lot and this prevents it from being a valid EnumHelper target. Under the hood for huge enum switch cases, javac will generate a synthetic class with a synthetic static final int[] field to hold switch map. If the OrePrefixes is ever extended, said switch map will be smaller than actual and cause ArrayIndexOutOfBoundException. This moves all addon added ore prefixes back to main mod. This also cleans up the obnoxious comment blocks created by spotless. * Fix advanced external transmitter cover (#1793) * change tpv back to 4k * Revert "change tpv back to 4k" This reverts commit 3560a670e3d697b26014f6320e344867953684e7. * change Tungstensteel to 4k * Add regulator abilities to Steam Valve (#1785) * fix: fix Steam Valve not being configurable * Revert "fix: fix Steam Valve not being configurable" This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf. * feat: add steam regulator * feat: add superheated steam to steam valve * update bs * update to subversion 42 --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> * fix --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> --------- Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> * Revert "merge master (#1800)" This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc. --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Maxim <maxim235@gmx.de> Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
2023-03-18Revert "Revert "merge master (#1800)""Martin Robertz
This reverts commit 4159f36223a936528f43eaa4439281478a4314c2.
2023-03-18Revert "merge master (#1800)"Martin Robertz
This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc.
2023-03-17Auto-stock for stocking input bus (#1790)MadMan310
* Add auto-stock for stocking input bus * Add GUI support for autostock and min input limiting. * Added support for copy+pasting config w/ data sticks * typo * correct order * fixes * update branch (#1795) * Send cover data immediately when cover is placed (#1791) * migrate ore prefixes from gt++ and bw (#1792) OrePrefixes are used in switch case a lot and this prevents it from being a valid EnumHelper target. Under the hood for huge enum switch cases, javac will generate a synthetic class with a synthetic static final int[] field to hold switch map. If the OrePrefixes is ever extended, said switch map will be smaller than actual and cause ArrayIndexOutOfBoundException. This moves all addon added ore prefixes back to main mod. This also cleans up the obnoxious comment blocks created by spotless. * Fix advanced external transmitter cover (#1793) * change tpv back to 4k * Revert "change tpv back to 4k" This reverts commit 3560a670e3d697b26014f6320e344867953684e7. * change Tungstensteel to 4k * Add regulator abilities to Steam Valve (#1785) * fix: fix Steam Valve not being configurable * Revert "fix: fix Steam Valve not being configurable" This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf. * feat: add steam regulator * feat: add superheated steam to steam valve * update bs * update to subversion 42 --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com> * fix --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: Matej Dipčár <492666@mail.muni.cz> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
2023-03-15fix ghost chunk loading caused by ore blocks (#1797)Glease
* fix ghost chunk loading caused by ore blocks * style update
2023-03-11Add regulator abilities to Steam Valve (#1785)NexusNull
* fix: fix Steam Valve not being configurable * Revert "fix: fix Steam Valve not being configurable" This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf. * feat: add steam regulator * feat: add superheated steam to steam valve
2023-03-10Fix advanced external transmitter cover (#1793)Matej Dipčár
2023-03-09Add EU/t to scanner (#1789)LewisSaber
2023-03-08correct out of date steam turbine tooltip (#1787)Glease
* correct out of date steam turbine tooltip * Spotless apply for branch fix/steam-turbine-tooltip for #1787 (#1788) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-03-04Fix space project upgrades not working (#1783)Maxim
* Fix upgrade requirements being always wrong/causing NPE * Fix unlock command only unlocking unstarted projects * Fixed upgrades never finishing * Fixed upgrades not loading * Delete upgrade being build if finished * Fix built upgrades not being loaded * Address review * Addressed new reviews
2023-03-01Add way to register tooltip without using oredict (#1779)miozune
2023-02-28Remove extra spaces from descriptions (#1776)miozune
2023-02-27implement save & load for single recipe lock (#1771)Glease
* implement save & load for single recipe lock * fix fat finger * fix NPE * disable machine if old locked recipe is gone * address reviews * spotless
2023-02-26Multiblock Sounds (#1768)Maxim
* Added methods to allow multiblocks to play sounds * Implemented first few sounds * Added sound to PA * Introduced static variables for sound indexes
2023-02-26Enhanced multiblock GUIs (#1767)Maxim
* Added more buttons to multiblock GUI * Migrated PA to new GUI * Migrated Nano Forge to new GUI * Migrated PCB Factory to new GUI * Reband void protection to void excess to match GTPP logic * Adjust fusion reactor GUI size * Added statics for new NBT keys * Added getters for button status * Rename methods to reflect that they are about void excess, not the opposite * Added button textures
2023-02-26Add a completely new system for late/endgame content (#1754)BlueWeabo
* basic work * typo fixes * make an enum folder * location enums * space project manager * implement the space project teams * commands * move things around and new things * upgrade work * requirement work * if possible use an upgrades values * cleanup * more helpers in command * fix AOOBE * fix world saved data * builder for requirements * add command autocomplete * fix command npe * mark world saved data dirty * switch to saving to json string. this is fine * fix npe * fix files not saving correctly. serialization * spotless * part 1 of fixing json saving * working json file saving * rename fields * full implementation of SP_Upgrade * fixes * cleanup * texture prep * documentation part 1 * documentation part 2 and rework of json saving * fix the missed conversions * set texture when copying * more interface usage and fixes * rework saving. * Added rudimentary NEI handler for projects * Revert "Added rudimentary NEI handler for projects" This reverts commit 6d8210e25b27fee7dc1865d1afa91708a8d9b875. * address NPEs * some textures * higher quality textures, put in the moon as a temp texture * add a check to create a team if one smt weird happens * command work * add ability to localize the space bodies * Added disabled button and toggle button * Added possibility to not render the original stacksize of item stacks in NEI * Added NEI handler * Fixes item count on tooltip always rendering as 1 * Fix refactor * 5 new body textures * fix misspelled texture name --------- Co-authored-by: minecraft7771 <maxim235@gmx.de>
2023-02-24Better casing amount on tooltips (#1766)Maxim
* Added more functions to more precisely input casing amount * Implement new tooltip casing adder * Only display variable size if sized are actually different * Addressed review
2023-02-21Fix some issues with custom material renderers (#1755)miozune
2023-02-19Make material renderer available for arbitrary item (#1753)miozune
* Make material renderer available for arbitrary item * pass render pass
2023-02-17Add Hodgepodge compat (#1752)miozune
* Add Hodgepodge compat * cleanup * Fix for fluid inside large cell
2023-02-16Loose mode change (#1750)TheEricCheng
* Add files via upload * Add files via upload * Add files via upload
2023-02-16Check for higher voltages instead of unequal voltages (#1747)Maxim
2023-02-16Fusion NEI support (#1742)Maxim
* Added optional special value to Power and getter for power into IMTE * Added FusionPower to properly display available fusion recipes and OC * spotlessApply (#1743) Co-authored-by: GitHub GTNH Actions <> * Moved compare flag to recipe map * Missed a new constructor * Added user request * Addressed reviews * Typo * Update src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java Co-authored-by: miozune <miozune@gmail.com> * Removed wrong bracket from git online commit --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: miozune <miozune@gmail.com>
2023-02-16Apply post-decompilation cleanup patches from the new RFG version (#1744)Raven Szewczyk
2023-02-14Fix silly oversight. (#1741)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2023-02-14Fix missing textures (#1732)Connor-Colenso
* New texture * Blade * Change molten space and time names. * Update fluid names * Bump dep of AE2 * Bump dep of AE2 * spotlessApply (#1733) Co-authored-by: GitHub GTNH Actions <> * New fluid solidifer method * Space * Spotless * New recipes for new white dwarf matter shapes. * Universium block * Universium nanites * Spotless * Add some fine wires --------- 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>
2023-02-13fix large turbine not drawing stuff on reload (#1734)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-02-13Fix id conflict with Living Crystal Chip (#1735)miozune
2023-02-12Add a recipe check to MuTEs (#1727)BlueWeabo
* working recipes! * clean up and save items which need to be outputted * reviews
2023-02-11fix walrus comb (#1730)chochem
2023-02-11fix zfighting on large turbine if rendering from afar (#1729)Glease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2023-02-10Rfg cleanup (#1726)Raven Szewczyk
* Update buildscript, add all recently added gradle.properties entries * Dependency version bumps and cleanup * Bump eternal singularity version * Update buildscript * Make AE2 a required dependency * Switch version to class generation from token replacement
2023-02-08Fix HOG Consumption Rate in LCE (#1687)Daniel Mendes
* Fix HOG Consumption Rate in LCE * Moved New Variables to checkRecipe
2023-02-07Mte inventory block (#1692)BlueWeabo
MTE Inventory Upgrade * inventories saved to nbt in controller * bump up ModularUI to fix labels * inventory renaming * fix inventories not syncing * more nbt saving and loading * unregister inventory on block break * example of a block being made from the same class * clear UpgradeCasing list every structure check * fix inventory halving to 0 * sync inventory name for upgrade block * switch to its own method of sending client data --------- Co-authored-by: Jason Mitchell <mitchej+github@gmail.com>
2023-02-06pyro tooltip fix (#1724)chochem
2023-02-06Fixes (#1721)Connor-Colenso
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>