aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
AgeCommit message (Collapse)Author
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
2017-11-22cherry pickDimach
Commit: eed72ede969a408a9668281de90ea91e13d92d9f [eed72ed] Added info to small miners tooltip.
2017-10-19l10n improveAntifluxfield
2017-10-18Fix #2100Antifluxfield
2017-10-17Change the range of oil drillsAntifluxfield
2017-10-09Fix EBF tooltipTechnus
2017-10-09Add tier infoTechnus
2017-10-07cherry pickDream-Master
Commit: f5abfcefe8d77e2c3c6284bff72de25c0a0ef774 [f5abfce] The right method to find out whether the machine should break the block.
2017-10-07cherry pickAntifluxfield
0802fdbd0272c4251c4615026643c8eadcf7fe70 9d8ac82535b0099ef70e8995bca51f62f39f9f94 e725c455b3d9025caeebdbf12cc9d25f238f74bb 3db38a5c53a771aeb37a8cf2568f79c49bb38c21 aef60bbf3b6752963b51c9c4e27b6ba03f75ba8c ef41455fe59f2915c94c204b97cee19aa2ddcd3b 4372034ff4edc9e58629d63123b84c29e6e0e516 Drillers fix #1230 https://github.com/Blood-Asp/GT5-Unofficial/pull/1230
2017-10-06cherry pickDream-Master
32d4998ec6b2a9e6d8b14450748a9ae256d311a1 Fixed small bug - basic miner cant work using battery in inner slot. #1232 https://github.com/Blood-Asp/GT5-Unofficial/pull/1232/files
2017-10-04Move Large Chem Reactor casing texture index to GT rangeTechnus
2017-10-01Optimize imports, optimize random number generation, make turbines loose ↵Technus
0.75 or normal durability in loose fitting mode.
2017-10-01LHE, turbine, steam turbine changes.Technus
2017-09-15Added cleanroom debug messages. Enable debug messages in gregtech.cfgRichard Hendricks
2017-09-13Add more uo methods for reading easily, make consumption scaleableTechnus
Makes the code more A ok
2017-09-13tool tip fixesDream-Master
2017-09-12cherry pickDream-Master
bd305c45b038819de2a0e61166da7344dbc770c7 69d557908f447be138102676309e48e5f95b32b9 Fix localization of Item Distributor #1211 https://github.com/Blood-Asp/GT5-Unofficial/pull/1211
2017-09-12cherry pickDream-Master
dae15665ccb54a0a8d6a76ffcc7d48eae0abec15 Odp speed improving #1209 https://github.com/Blood-Asp/GT5-Unofficial/pull/1209
2017-09-12cherry pickDream-Master
11213d18d7345ee29f2efce6c5d421a855bed056 fb163d1be0aa291508bb6513e34cacba3ca06b36 fb508132d91543d5e837dfa4fac09cf5e4b9e7a8 d682ca0d36e3824b1bf73cc800f58c4126bcf104 0f2db4f76a88c26ca08b2da444b264444ce01316 50229e4506687d184c93ed702cdeeecea65e326a f5195f822d9951015c4ef6599e5b4f6544ec0714 fbdb6ceecf60183ab382f043b78b61941157eccf 55af1972b86a82bf6038342aa1a3bf9013d0f164 c0d9d5a268da4b58385ee95e27408e06829c74b8 416890142c0fa62617fc6e4537826689635e9eb3 d532cb67f7bc68243e3d2dc2a12a466ed9c9e2d9 d1671eaf33b3b4223da174e115f35b9bc1f19c5a 4d90afad87375e3f1013a493f4b3b5d4e92bf521 3c397d61697c13f0467e0cb67fb127fff8401f71 64957ccd0f51ef283cc561d52a5439c3752c4e71 b7e0863207253ee758742a22c607c3ccc37af6d3 ae5a1e117d47876de9d2d2e8ea581e15686c5e1a a0eb30d03f8fc311598f628ad45b5365c7391917 505a9c263e88e5519bade6a3167f829e41e13e64 9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2 Drillers upgrade #1163 https://github.com/Blood-Asp/GT5-Unofficial/pull/1163
2017-09-12cherry pickDream-Master
61d058201244d9dd6f19ed72c863722b7da0ad14 bab71c5349799ba77ac42f80c54725a999fab40c Fix #1206 #1210 Fix NPE of fluid check. https://github.com/Blood-Asp/GT5-Unofficial/pull/1210
2017-09-04cherry pickDream-Master
848a57291a2145680e0a87f7178b416e03f1ffaa Correct description of regulator #1168
2017-09-04cherry pickDream-Master
c09f6b5bdd47e51c3d5ec41d9947f1f94bfb0267 Fix the Tooltip of Pumps #1191