aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2017-06-22Moved the Casings for the Large Chemical Reactor again.Johannes Gäßler
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-06-18Merge branch 'ChemistryUpdate' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-16Fix buffer and regulator RS signalsBlood-Asp
2017-06-15Hitboxes when holding soldering iron #1095Blood-Asp
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
Conflicts: src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java src/main/java/gregtech/loaders/load/GT_FuelLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
2017-06-14pollution smogBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-Asp
2017-06-13missed one fileBlood-Asp
2017-06-13Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-13Port GT6 timber changesBlood-Asp
2017-06-13meh...Blood-Asp
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-12At last one free face.Blood-Asp
2017-06-12Only open machine gui if front is free.Blood-Asp
2017-06-12Cables and pipes now change hitboxes dynamicly depending on connections or ↵Blood-Asp
covers
2017-06-07formattingTechlone
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
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-07Merge pull request #1076 from vlad20012/int-overflow-fixBlood-Asp
Fixed stored energy integer overflow
2017-06-06Check general redstoneoutput for nullBlood-Asp
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05Missing in item pipeTechnus
2017-06-04More redstone changesBlood-Asp
2017-06-04Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-04Missing overrideTechnus
2017-06-04Fixed stored energy integer overflowvlad20012
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-031ddc91aTechnus
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-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-18Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-05-18Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler