aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
AgeCommit message (Collapse)Author
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-05Merge pull request #101 from Antifluxfield/GTNHMartin Robertz
Fix translations
2018-02-05Fix translationAntifluxfield
2018-01-25Gas Turbine missing pollution tooltip #2519Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2519
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
2017-12-30change size of Seismic prospectorDream-Master
2017-12-30Add stepping changes to prospector.Technus
2017-12-30Added MV,HV Seismic prospector.Dream-Master
change recipes for seismic prospectors change the range
2017-12-30Add tier based range change method.Technus
2017-12-29Adjust pollution levelsTechnus
2017-12-29Save/load NBT data for Large Turbine - HP STeam (#74)Jason Mitchell
2017-12-24Optimize imports an add molten cellsTechnus
2017-12-21cherry pickDream-Master
Commit: 4069e24c1ebe1487491295fdaa7ff744892ee665 [4069e24] Change diesel to combustion
2017-12-02cherry pickDream-Master
Commit: af7e1d800d76d485608e74105b438c9775debc96 [af7e1d8] Merge pull request #1272 from SuperCoder7979/Magic-Fix Magic fix
2017-12-01Fixed Oil Cracker description typoJohannes Gäßler
2017-12-01Oil Cracker can now also works right -> left, EU/Maint Hatches anywhereJohannes Gäßler
The Oil Cracker now also accepts Input Hatches on the right side and Output Hatches on the left side. Input/Output Hatches must be on opposite sides of one another. Also, Energy/Maintenance Hatches no longer need to be on the middle ring but can also be put on the sides.
2017-12-01The Large Chemical Reactor can now have its Cupronickel Coil on any sideJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
2017-11-23Single block pump refactor & bugfix:Jason Mitchell
1) Pump will properly save it's state and reload with chunk load/reload. It remembers that it was pumping and doesn't immediately move down. Additionally, corrected saving of fluid type so it will properly look it up when it reloads 2) Fixed getYHeadOfPump() so it doesn't punch through bedrock if you destroy the pump head. If you break a gap into an existing pipe line, it will move down through the broken spots until it finds an existing set of pipes - in which case it will continue from the bottom. If you break the pump head, it will replace the last pipe with a new Head and carry on about it's business.
2017-11-22cherry pickDream-MasterXXL
Commit: 09978a0225bbbd1832e123c7d6df1ef7fdc09d5f [09978a0] Refined