aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2022-06-22Change Super Fuels and Added Advanced Glue (#1042)Steelux
* Change Super Fuels and Added Advanced Glue - Changed Super Fuel recipes to accept HOG input instead of CBD. The amount of input is proportional to the fuel value, so that both recipes match in the fuel value of inputs; - Added a new early-game glue, Advanced Glue, which replaces Refined Glue in the recipes that use Polyvinyl Acetate and Methyl Acetate/Acetone; - Changed the Super Fuel Binder recipes to use this new glue instead of the old one; - Added recipes with the new glue for making Graphene Dust with the first two wafers, Glowstone and Naquadah. My intent is to replace the old glue altogether in these recipes. * fix advanced glue (cherry picked from commit 89979d9593b3d6ab97c31394f101dc7e470bcab9) * Steel Boiler Not Accepting Charcoal Fix - Fixed a bug that made Charcoal and its equivalents not work in the Steel Boiler, when they're supposed to. * Remove commented out line, the fluid is already created with MaterialBuilder Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Raven Szewczyk <git@eigenraven.me>
2022-06-21Added cached items list to the ME Output bus scanner output (#1075)repo-alt
* Added cached items list to the ME Output bus scanner output * limit dumping to 100 stacks * Added a tooltip for GT++ https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10520
2022-06-20Added Use for Cactus/Sugar Coke in BBF (#1058)Steelux
* Added Use for Cactus/Sugar Coke in BBF - Added Cactus and Sugar Coke to the first Blast Furnace, with the same recipe time as Coal Coke but with 4x the amount needed, as these Cokes have 1/4 the burn time as Coal Coke. * Fix Item Name in getModItem
2022-06-19Allow wire cutters to toggle cobblestone replacing on MBM (#1083)xSkewer
* Allow wire cutters to toggle cobblestone replacing * Add NBT saving
2022-06-19Add Plasma Forge (Endgame multi) (#1076)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-10oredict circuit parts and INDUCTOR (#1040)Yang Xizhi
2022-06-10Adjust NEI recipe pages (#1077)Connor-Colenso
* Add config support for changes. * Change ticks config to default OFF. * Usage -> Voltage for some cases. Also fix language translations. * Remove comment. * Remove redundant null check. * Bring back null checks (crashes). Move config to client. Adjust priorities so that if OC is detected it will display usage instead of voltage. * Remove null checks again (but for realsies this time). * Add language localisation. * Update language localisation. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-09Turbine Rework Beyond Optimal Flow (#1038)Steelux
* Turbine Rework - Changed the tooltip of Turbine items to add more data and clarify some values: it now shows all types of optimal flow rates, EU/t values and the new overflow tier; - Changed the math for the EU/t value above the optimal flow. Before this change, efficiency drops so quickly that EU/t will never raise above that of optimal flow, but with this change, higher EU/t values are possible, with efficiency losses; * Prevent Explosions by Voiding Fuel on Startup - Changed all multiblock turbines so that, when switching from disabled to enabled mode, they void all the fuel in the input hatch and only start running afterwards. This prevents them from exploding due to filled input hatches on startup, but punishes the player by wasting the fuel; * Revert Voiding Change and Throttle Output - Reverted the input voiding change done in the previous commit, given that the turbines could still explode on world load; - Changed the fluidIntoPower functions to never output an EU/t value higher than what the dynamo can handle. If the value is higher, set it to the maximum EU/t of the dynamo and consume the same amount of fuel regardless. * Changed Tooltip Values to Int - Changed tooltip values to int, for rounding and simplifying purposes.
2022-06-07Make display slot invalid. (#1072)Jakub
2022-06-04Refactor add secondary description (#1056)MuXiu1997
2022-05-26Fix crash with multi amperage recipe & improve Mass Fabricator NEI (#1053)miozune
2022-05-26Fluid Regulator GUI fixes (#1065)miozune
* Fluid Regulator GUI fixes * Disallow too large negative value * Fix inputting invalid values in a row does not update textbox * another fix for invalid input * Fix messing around with tick rate can bypass pump limit * tab
2022-05-22fixes GTNewHorizons/GT-New-Horizons-Modpack#10115 (#1052)Pavel Belous
2022-05-08Fix ME OutputBus void items (#1051)MuXiu1997
* Fix ME OutputBus void items * Make backward compatible
2022-05-03Remove dragged stack when locked fluid slot is clicked (#1046)miozune
2022-05-03Unhide craftable bottled drinks (#1045)miozune
2022-05-02More Disassembler fixes (#1044)miozune
* More Disassembler fixes * blacklist Mixed Metal Ingot
2022-04-28Fix LHE duping water (#1043)Glease
2022-04-28Prioritize Assembler recipe over crafting one in Disassembler (#1035)miozune
2022-04-24Add Fluid Storage Monitor Cover (#1027)MuXiu1997
* Add Fluid Storage Monitor Cover * Add support for normal cells etc. * Add Recipe
2022-04-24Use proper method for emptying container item (#1034)miozune
* Use proper method for emptying container item * Add javadoc
2022-04-23fix miner output using wrong endIndex (#1033)Glease
2022-04-22fix plasma to molten ratio on vac freezersMartin Robertz
(cherry picked from commit f0b8c6e8c1a18b2872c47ceb19782fca731a8094)
2022-04-22Address some warnings found by static code analysis (#1028)Glease
* Address some warning found by static code analysis * Improve variables naming by redoing logic
2022-04-21Disallow disassembling Schematic (#1029)miozune
2022-04-19Add Threshold to Energy Detector Cover (#1025)MuXiu1997
* Add Threshold to Energy Detector Cover * Fix things * Refactor
2022-04-18Multitileentity precursor (#963)Jason Mitchell
* Refactors * Refactor CoverableTileEntity a bit more, pull out a CommonMetaTileEntity * Add an IDebugableTileEntity interface instead of checking various subclasses * Move more redstone related things to CoverableTileEntity * Add IGTENet * Final and dead code removal * Address a few comments, fix a few comments, remove some more dead code, and add some more finals. * fix bad rebase
2022-04-16Refuse to allow multiple controllers on a single block (#1023)MuXiu1997
2022-04-16Fix Super/Quantum tanks `FluidTankInfo` (#1024)MuXiu1997
2022-04-12Fix wrong battery tier (#1022)LewisSaber
2022-04-09Allow using FluidDisplay stack to lock fluid in output hatch (#1015)miozune
2022-04-08Fix LDIP using the wrong side to proxy sided requests (#1014)Glease
2022-04-08Add a voiding mode for Super/Quantum tanks (#1009)MuXiu1997
* Add a voiding mode for Super/Quantum tanks * Fix things * Fix things
2022-04-08Loose Mode Turbine Changes (#1000)Steelux
* Loose Mode Turbine Changes - Changed Steam loose mode efficiency and optimal flow to improve this mode, especially on the lategame turbines. Efficiency was capped at 75% regardless of the regular value, with this change setting it to always be a percentage of the tight mode efficiency, down to 60% for those lategame turbines, and a maximum of 90% of the tight mode value for the lowest efficiency turbines. - Also changed the optimal flow calculation to grant a larger optimal flow in loose mode than it was before the change, for all turbines except the highest efficiency ones; - Improved the tooltip for these turbines, updating to these new values, fixing a typo and showing the EU/t for steam at optimal flow, in both modes. * Fixed Weird Spacing * Update GT_MetaGenerated_Tool.java * Remove Duplicate Formula for Loose Mode
2022-04-08Allows sorting of configuration circuits (#1012)MuXiu1997
* Allows sorting of configuration circuits * Fix things
2022-04-08add 4 input and 4 output slots to ebf (#1004)Martin Robertz
(cherry picked from commit 131d67ab7a58a5b0c00a6e711ab4e7558e036d78)
2022-04-07Adding connection status tooltip for Long Distance Pipe (#1013)MuXiu1997
2022-04-05Disassemblers now cannot process items that is made by higher tier ↵miozune
Assemblers (#1011)
2022-04-04fix boxinator using wrong texture (#1007)Glease
2022-04-02fix oredrilling crush gems (#991)Pnc6lx
2022-03-30Optimize item transfer and inventory sorting (#992)Jakub
* Optimize conveyors, input busses, chest buffers * More checks * More checks and fixes * Check for slot validity when sorting * Fix NPE * More optimization * Fix disable sort not working * Enable order in input bus, Some fixes
2022-03-29Refactor #987 (#997)MuXiu1997
2022-03-26Fix secondary description not written to language file (#987)MuXiu1997
* Fix secondary description not written to language file * Extract ISecondaryDescribable interface * Recover isDisplaySecondaryDescription in MetaTileEntity
2022-03-18fix set locked fluid not working via drag n drop (#979)Glease
2022-03-18make miner output to correct slots (#985)Glease
* make miner output to correct slots * fix git derp
2022-03-14Add flow rate of oil rigs in the tricorder info (#981)Jakub
* Add info to tricorder * Add number formatting
2022-03-14pin comb type id instead of depending on array ordinal (#980)Glease
* pin comb type id instead of depending on array ordinal * fix up _NULL related problems * fix out of bound * make it private * add some more test
2022-03-14save config late (#982)Glease
2022-03-13fallback to error texture if icon is null (#978)Glease
2022-03-12reverse linesMartin Robertz
(cherry picked from commit ac75144b6aedae4214d3103c075345a1bb563869)