aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines
AgeCommit message (Collapse)Author
2018-07-14Look for air instead of tile.air. Fixes ↵Jason Mitchell
https://github.com/GTNewHorizons/NewHorizons/issues/3308
2018-07-14reverted Blood-Asp#1468 due to buggy behavior with ore grindingbartimaeusnek
2018-06-30added some Main Branch PRsbartimaeusnek
https://github.com/Blood-Asp/GT5-Unofficial/pull/1468/ https://github.com/Blood-Asp/GT5-Unofficial/pull/1462 https://github.com/Blood-Asp/GT5-Unofficial/pull/1452/
2018-06-30fixes #3226 viabartimaeusnek
execution of https://github.com/Blood-Asp/GT5-Unofficial/pull/1384 and
2018-06-18Merge branch 'experimental' into scanner_fixesbartimaeusnek
2018-06-18fix for #2152bartimaeusnek
fix for reused DataSticks keep parts of old NBTTagCompound fixed blockores and removed one hashmap
2018-06-17Smp assembly-line books issures (#128)bartimaeusnek
2018-06-16fixed Multiple items on one pagebartimaeusnek
2018-06-16fixed SMP Assembly Line book issures.bartimaeusnek
2018-06-15fix for Assline booksbartimaeusnek
2018-06-07Add EU/t for monster repellent.Richard Hendricks
2018-06-05Fix for typoRichard Hendricks
2018-06-05Add back in missing large boiler pollution numbers. Fix ↵Richard Hendricks
https://github.com/GTNewHorizons/NewHorizons/issues/2765
2018-06-05Added option for disabling machinemetal tinting.Richard Hendricks
2018-06-04reduce explosives by 50% in seismic prospectorDream-Master
2018-06-03fixes https://github.com/GTNewHorizons/NewHorizons/issues/3040bartimaeusnek
+ exchanges nice and easy, but client-sided, code with messy id comparison code due to shittyness of GC items have the same name and no other option to compare against -_-' (╯°□°）╯︵ ┻━┻
2018-05-22Turbine nuclear gui (#121)bartimaeusnek
fixes critical server crash due to server sided getInfoData() by using StatCollector.translateToLocal instead of I18n.format
2018-05-19nuclear control displays 2.0, lang file addition (#120)bartimaeusnek
* +applied mitchej123 fix to all turbines +added .lang translation for GUI +removed error log for quicksilver dust * Lang file for Multiblock Information Nuclear Display patch * Tin Cell dublicate bug https://github.com/GTNewHorizons/NewHorizons/issues/2970
2018-05-09Merge pull request #119 from GTNewHorizons/Schematic2DataStickMartin Robertz
NEI fix for scanner
2018-05-09quickfix for shematic chips beeing scannablebartimaeusnek
2018-05-08Merge branch 'experimental' into Schematic2DataStickbartimaeusnek
2018-05-08Added tooltop to DataSticksbartimaeusnek
+ Fixed original GC Schematics + changed scanner recipes to 30, 480 (from 32, 512)
2018-05-07this shouldnt be in this branchbartimaeusnek
2018-05-07added mechanic to scan Schematics to data sticsbartimaeusnek
2018-03-31Fix crash when using Scanner/InfoPanel on empty Processing ArrayDavid Vierra
2018-03-22Adjust oilfield size to 8David Vierra
2018-03-22Remove unused codeDavid Vierra
2018-03-22Adv Seismic ProspectorWo0kiee
2018-03-22Cleanup importsWo0kiee
2018-03-22CleanupWo0kiee
# Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
2018-03-22Adv Seismic Prospector reworkedWo0kiee
Prospects from NW to SE 9 of oilfields (6x6 chunks each) and output min-max oil amount # Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
2018-03-15Fix Pump machine inserting into wrong side of tank/pipe aboveDavid Vierra
Fixes an issue where a pipe above the pump with its top side set to "Input Disabled" (to control flow direction) stops receiving fluid from the pump.
2018-03-03#2650 - Fix single-block miners mining bedrockDavid Vierra
May also stop them from mining through protected blocks, warded glass, etc?
2018-02-17Make Large Turbine getInfoData() work better with nuclear control displaysJason Mitchell
2018-02-11Added autamatable data hatchTechnus
2018-02-06Cherry pick upstream texture changesJason Mitchell
2018-02-05Added documentation to updateTexture in GT_MetaTileEntity_Hatch.Alkalus
Added a function to GT_Utility called addTexturePage(byte page). Added information about who is using which texture page in GT_Block_Casings1. Updated GT_Block_Casings5 & GT_Block_Casings8 to utilise texture page 1. Updated Large Chemical Reactor to reflect this change, now also uses Page 1 Index 48. Moved the Pyrolyse oven casing index from 111 to 22, which is currently unused and within the Gregtech index space.
2018-02-05Fix translationAntifluxfield
2018-01-14ZPM Microwave Transmitter #2421Dream-Master
2018-01-14Merge pull request #84 from Antifluxfield/GTNH-asslineMartin Robertz
Oredict support for assline
2018-01-10Update tooltips for Large Steam Turbine and Large HP Steam Turbine #2383Dream-Master
2018-01-09and spell fixDream-Master
2018-01-09Add Tooltip for BBFDream-Master
Change Brick compression time for BBF
2018-01-07reduce timeTechnus
2018-01-07more buffTechnus
2018-01-07Some tweaks to oil rig - test some.Technus
2018-01-07Oredict support for asslineAntifluxfield
2018-01-07NEI page access of Primitive Blast Furnace (#78)Martin Robertz
* NEI page access of Primitive Blast Furnace cherry pick Commit: e0be4bdc4504717968494503ea03b8184af96891 [e0be4bd] * Fix #1039 * Fix #1039
2017-12-31Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental # Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
2017-12-31Fix UO blacklistTechnus
generated by cgit (git 2.46.0) at 2025-03-06 22:02:41 +0000