aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07Merge branch 'advminer2_improvements' of ↵Techlone
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
2017-06-07Quick fixesBlood-Asp
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-06forgot to commit the oredict changesBlood-Asp
2017-06-06Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for ↵Blood-Asp
marble/basalt, chisel compat #1050
2017-06-06Correcting Steel Boiler Tooltip #1080Blood-Asp
2017-06-06Fix vents as covers. Ventcovers now speed up machines 1-3% #1065Blood-Asp
2017-06-05Attempt to prevent worldgen loops with other mods #1063 #828Blood-Asp
2017-06-05Improved large boiler tooltip #877Blood-Asp
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05this actually changes the raytracer boxes reusing the collision boxesTechnus
2017-06-05fix OsmiridiumCasing recipe in AssemblerTechlone
fix ODP changing state when the tip meets itself fix cleaning of oreBlockPositions when a mining column was broken
2017-06-04Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-031ddc91aTechnus
2017-06-03Fix Pollution bugBlood-Asp
2017-06-02Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" ↵Techlone
message for II-IV tiers change build.gradle for debugging in IDEA
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01OreDrill state savingTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-01Teleporter and Energy Transmitter fixesBlood-Asp
2017-06-01Cleanup and some commentaryDaniel
2017-06-017bd71feDaniel
2017-06-01Fix that so pollution is not negative.Daniel
2017-06-018e0e516Technus
2017-06-01Cherry-Pick c12e474Technus
https://github.com/GTNewHorizons/GT5-Unofficial/commit/c12e474c23ca02fb3479312850f6ae07e623d8b9
2017-06-01that makes it look better?Technus
2017-06-01Why does one change the machine state TWICE in the same tick...Technus
2017-05-31Fix comb processing recipes #1052Blood-Asp
2017-05-31Make Internal wireless redstone work as machine controllerBlood-Asp
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
Four tiers of Ore Drilling Plant I - radius is 3 chunks MV+ (default) II - radius is 4 chunks HV+ III - radius is 6 chunks EV+ IV - radius is 9 chunks IV+ New behavior: - pick pipes after mining finish - extract ore block before moving down
2017-05-31Merge pull request #1051 from JohannesGaessler/unstableBlood-Asp
[5.09.29] EBF recipe fix followup
2017-05-31Merge pull request #1058 from Georggi/patch-4Blood-Asp
Auto Maintenance Hatch tweaks
2017-05-31Merge pull request #1067 from antifluxfield/unstableBlood-Asp
Wrong behavior of Player Detector
2017-05-31Disable switching armor gui because of broken syncBlood-Asp
2017-05-31Catch login armor crashBlood-Asp
2017-05-27Update GT_Cover_PlayerDetector.javaantifluxfield
2017-05-27Update GT_Cover_PlayerDetector.javaantifluxfield
2017-05-16Added config for automationYuriy Shnitkovskiy
2017-05-10Changed multiblocks so they all consider all inputs for finding recipesJohannes Gäßler
2017-05-07Reverted erroneous previous commit.Johannes Gäßler
2017-05-06Created a first draft for the Large Chemical ReactorJohannes Gäßler
2017-05-06Fixed the Electric Blast Furnace not recognizing recipes when there isJohannes Gäßler
more than one Fluid input. Also added a String representation for GT_FluidStack that was used for debugging.
2017-04-27Merge pull request #1025 from JohannesGaessler/SteamProductionImprovementBlood-Asp
Steam production improvement / Tooltip improvement / Pollution adjustment
2017-04-27Fix eu consumption absence by AssemblyLine and some clean upTechlone