aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-13change Naphtha and Light Fuel back to the burn values from 1.4.1.1Dream-Master
2017-06-12cherry pick:Dream-Master
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731
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-11Changed the Primitive Blast Furnace so that it uses the new Recipe MapJohannes Gäßler
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-10Merge pull request #1083 from Techlone/unstableBlood-Asp
More fixes for the world gen
2017-06-10fixed a few more recipesDream-Master
2017-06-10rename BioFuel to BioDieselDream-Master
add Circuits to chemical reactor recipes
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-10remove old Nitric acidDream-Master
2017-06-10 a few fixesTechlone
2017-06-09cherry pickJohannes Gäßler
74c41614a5e8a6cb49e62a225669a1e1d07bc87b
2017-06-09Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc.Johannes Gäßler
Made it so that GT_Values.NI and GT_Values.NF are consistently used when applicable. Nerfed Silicone Rubber so that you only get 3/7 as much as from a regular plastic. The idea is that Silicone Rubber is more versatile than PVC or SBR, but also more expensive. Changed the Distillation Tower description so that it aligns with the new behavior.
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes Gäßler
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID 15 Refactored the non-electric Blast Furnaces: The Bronze Blast Furnace and the Bricked Blast Furnace extend a superclass to ensure consistent behavior. Subclasses only differ in texture, description, and Casing Block.
2017-06-08remove hcl because already addedDream-Master
2017-06-08missing import classDream-Master
2017-06-08remove the recipe because already in the codeDream-Master
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-07cables are to expensivevlad20012
2017-06-07cherry pickTechlone
541144f4433044a6c0b9612e7cd7f94cf9440095 formating
2017-06-07change cables backDream-Master
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-07bump versionDream-Master
2017-06-07cherry pick:Johannes Gäßler
785322f5c76511f8db6e95860c4651b8ebea34a9 Rebalanced Fermented Biomass in face of the Methane Fuel Value change Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-07Rebalanced Fermented Biomass in face of the Methane Fuel Value changeJohannes Gäßler
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-07add Oilcracker Gui with two visual input slotsDream-Master
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-06Added 6 Input slots to AssemblerDream-Master
Change mv chemical reactor using Glass not Plastic
2017-06-06buff Nitro Diesel and Ethanol to old valuesDream-Master
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master