aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2018-02-05Merge pull request #101 from Antifluxfield/GTNHMartin Robertz
Fix translations
2018-02-05Fix translationAntifluxfield
2018-02-05Merge pull request #100 from Kortako/experimentalMartin Robertz
electro magic nanosuit loses pollution protection #2541
2018-02-05Rock-Breaker LV and MV not craftable due to IndustrialDiamond requirement #2544Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2544
2018-02-04electro magic nanosuit loses pollution protection #2541Kortako
Fix pollution on EMT armor upgrades https://github.com/GTNewHorizons/NewHorizons/issues/2541
2018-02-04Chlorobenzene cannot be crafted in large chemical reactor #2553Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2553 remove deprecated recipes change chemical reactor for basic machines a bit
2018-01-27[2.0.2.7]Incorrect recipe (ult lappack) #2464Dream-Master
add more and more ic2 and addon items to code https://github.com/GTNewHorizons/NewHorizons/issues/2464
2018-01-25Gas Turbine missing pollution tooltip #2519Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/2519
2018-01-25Fix End Asteroid worldgen putting all asteroids in the center of the endDavid Vierra
2018-01-21I like this fix better, upstream in the ore layer instead of downstream in ↵Richard Hendricks
the block placer.
2018-01-20Add ncie instructions on calculating oregen.Richard Hendricks
2018-01-19Shifted airblock test over 1x1 because Deep Dark always places the weird ↵Richard Hendricks
open grids on even blocks.
2018-01-19Checking in working version for #2302. Need to verify against full modpack, ↵Richard Hendricks
and document how to evaluate oregen bias.
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-07Fix iridium neutron reflector behavior (#79)Martin Robertz
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-31not usedTechnus
2017-12-31Removed duplicatesTechnus
2017-12-31ADD MORE TOOLSTechnus
2017-12-31Make the description more accurate.Technus
2017-12-31Fix UO part 2Technus
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-26remove EV and IV Soldering IronDream-Master
2017-12-26Added Soldering Iron for MV, HV, EV and IVDream-Master
2017-12-26Merge pull request #66 from Antifluxfield/GTNH-l10nMartin Robertz
Localization bugfix & improvement
2017-12-25Solar panel fixJason Mitchell
Make solar panels always look connected, and allow energy injection from unknown directions
2017-12-26Config to disable placeholder "%material"Antifluxfield
2017-12-25Added missing overlays, made the passtrough of wire cutting/connectiong ↵Technus
trough gt machine blocks work only if the player is isneaking. And because of that, added back the soldering iron support.
2017-12-25Merge pull request #64 from mitchej123/gt6_cables_quality_of_life_enhancementsMartin Robertz
GT6 cable quality of life improvements
2017-12-24Allow use of wire cutter/soldering item on the tile entity, as well as the ↵Jason Mitchell
wire, for a connect/disconnect
2017-12-24Change to 144mb molten cells, change samarium colorTechnus
2017-12-24remove smeltable into gemsTechnus
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