aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2017-06-06Fixed a bug where the order of DT fluid outputs was actually reversedJohannes Gäßler
2017-06-06Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169Johannes Gäßler
2017-06-06Merge branch 'OreDrills' into experimentalDream-Master
2017-06-06bump versionDream-Master
2017-06-06Check general redstoneoutput for nullBlood-Asp
2017-06-06Fix Nitric Acid name #1079Blood-Asp
2017-06-06Correcting Steel Boiler Tooltip #1080Blood-Asp
2017-06-06cherry pick: from TechloneDream-Master
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db
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-05fix typoDream-Master
Pyrolyse oven quest consumes pieces #1455 https://github.com/GTNewHorizons/NewHorizons/issues/1455
2017-06-05try this idDream-Master
2017-06-05Improved large boiler tooltip #877Blood-Asp
2017-06-05because this id was used by the core mod.Dream-Master
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05cherry pickDream-Master
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96
2017-06-05cherry pick:Johannes Gäßler
3ec9ddf34613b819a13e8cab8c84fcff369f1e65 Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200