aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
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
2017-12-02cherry pickredmage17
Commit: eb7185ca85a967c18acca514cb43bc096e0fcdb6 [eb7185c] Merge pull request #1284 from redmage17/unstable Configed Machine Casings
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-29cherry pickAntifluxfield
Commit: f3be52de1661b7d42897211f17ebf8c5c731a932 [f3be52d] Try to fix #1301
2017-11-28cherry pickBlood-Asp
Commit: b96180ac4f1564bcb7a2e19d16738cfea7fc04a3 [b96180a] GT6 style concrete speedup (no soulsand like behavior that blocks you from entrances and less OP ice hyperspeed highways)
2017-11-24Leave deep dark orevein max size at 32, only place GT stone if the ↵Richard Hendricks
requesting chunk can potentially accept it.
2017-11-24Added primary meta to orevein seed. Read comments for details.Richard Hendricks
2017-11-24Removed oreveinSize to use a hardcoded value for now, until we can do ↵Richard Hendricks
per-dimension setup. Other minor fixes
2017-11-24Feature complete. Fixed/understand Deep Dark double oregen issue. Still ↵Richard Hendricks
have some funky chunks, but suspect that is a DD issue, not related to Gregtech.
2017-11-24Remove tabs, replace with spacesRichard Hendricks
2017-11-24Code CleanupRichard Hendricks
2017-11-24Feature complete. Ready for testing in multiple dimensions.Richard Hendricks
2017-11-24Happy with orevein generation now. Working on small ores next.Richard Hendricks