aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2017-06-04Missing overrideTechnus
2017-06-04Missing override addedTechnus
2017-06-04Cleanroom outputs in redstone its cleannes/efficiency.Blood-Asp
2017-06-04Fixed stored energy integer overflowvlad20012
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-031ddc91aTechnus
2017-06-03new fusin reactor textureDream-Master
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-01Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-06-01Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-06-01Catch broken items on recipe moveBlood-Asp
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-018e0e516Technus
2017-06-01Not needed.Technus
2017-06-01Cherry-Pick c12e474Technus
https://github.com/GTNewHorizons/GT5-Unofficial/commit/c12e474c23ca02fb3479312850f6ae07e623d8b9
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-05-31Fix multiblock recipe search fix #1044Blood-Asp
2017-05-31Fix spelling #1043Blood-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 #1058 from Georggi/patch-4Blood-Asp
Auto Maintenance Hatch tweaks
2017-05-31Merge pull request #1060 from JohannesGaessler/MaterialFormulaFixBlood-Asp
Material formula fix
2017-05-31Catch broken items on recipe moveBlood-Asp
2017-05-30Minor cleanupTechnus
2017-05-29Enable ALL components if dreamcraft loadedTechnus
2017-05-28Add Blaze BlockDream-Master
2017-05-28added new molds for Stick, round, long stick, ring, bolt, screwDream-Master
2017-05-22Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH
2017-05-22fix typoTechnus
2017-05-22some fixesDream-Master
2017-05-20Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-05-20Fixed Salt Water and Distillery circuit settings 1Dream-Master
Add Tube Wire Item for automate Tubes
2017-05-20derp fixDream-Master
2017-05-20Merge branch 'ChemistryUpdate' into mergeGTNHJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java src/main/java/gregtech/api/util/GT_Recipe.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/blocks/GT_Block_Casings2.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-18Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-05-18Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-05-18Make the save/load the same as in bloodaspTechnus
2017-05-16Added config for automationYuriy Shnitkovskiy
2017-05-16Auto Maintenance Hatch tweaksYura
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-15Add low grav to proc array, - assuming that proc array is always considered ↵Technus
in a clean room, added circuit assembler to proc array
2017-05-13Fixed a bug that caused there to be two identical recipes for TiF4Johannes Gäßler
2017-05-13Added a new recipe map for the LCR, expanded the API to allow for customJohannes Gäßler
NEI stack positioning. Refactored the name of the Large Boiler Fake Fuels so they're in line with other names. Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-10Merge branch 'unstable' into mergeGTNHTechnus
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-05-09Idk, might be betterDaniel
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
2017-05-07another oil rewrite, even more BloodAsp likeTechnus
2017-05-06Expand low grav dimensionsTechnus