aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Blood-Asp
unstable
2017-06-17Extended logging for AssemblylineBlood-Asp
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-15fix naquadah wafer recipe #1094Blood-Asp
2017-06-15Hitboxes when holding soldering iron #1095Blood-Asp
2017-06-15Fix hiding of unused ores. #1062Blood-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-15Made it so that Pyrolyse Oven recipes are consistentJohannes Gäßler
Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood Vinegar, or Wood Tar to OreProcessing to ensure that all log types can be used.
2017-06-15Improve fog density calculationBlood-Asp
2017-06-14pollution smogBlood-Asp
2017-06-14Fixed Allyl Chloride recipe consuming a Fluid CellJohannes Gäßler
2017-06-14fix IC Classic compat #1090Blood-Asp
2017-06-14Merge pull request #1091 from draknyte1/unstableBlood-Asp
Made the Cleanroom optional.
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14improve cleanroom tooltipBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-Asp
2017-06-13wood plank compressor recipe #1013Blood-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-13Merge pull request #1088 from Techlone/reworking_dataorbBlood-Asp
Reworking DataOrb and DataStick
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-13Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
2017-06-13Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into ↵Techlone
unstable
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-12change back the component heat exchanger damage valueBlood-Asp
2017-06-12Fixed Chloromethane and Chloroform recipes missing empty cell outputsJohannes Gäßler
2017-06-10Merge pull request #1083 from Techlone/unstableBlood-Asp
More fixes for the world gen
2017-06-08fix wrong center chunk coordinatesTechlone
2017-06-08Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
2017-06-07experimental worldgen change fixBlood-Asp
2017-06-07formattingTechlone
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-07Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into ↵Techlone
unstable
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-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
generated by cgit (git 2.46.0) at 2025-03-09 23:06:45 +0000