Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-06-15 | Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate | Johannes 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-15 | Cherry Pick | Dream-Master | |
c3f2b2b49dc3911a377fd062908d4df78bd3e58d Made it so that Pyrolyse Oven recipes are consistent 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-15 | cherry pick | Dream-Master | |
7f408ff581b25fdee81e87c61e124c48f25ee78e Returned BioFuel to its previous state, added BioDiesel instead. There are artifacts for fluids called BioFuel, therefore the change. | |||
2017-06-15 | Made it so that Pyrolyse Oven recipes are consistent | Johannes 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-14 | fixed derp | Dream-Master | |
2017-06-14 | cherry pick | Dream-Master | |
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731 Fixed Allyl Chloride recipe consuming a Fluid Cell | |||
2017-06-14 | Fixed Allyl Chloride recipe consuming a Fluid Cell | Johannes Gäßler | |
2017-06-14 | fix IC Classic compat #1090 | Blood-Asp | |
2017-06-14 | cherry pick | Draknyte1 | |
d1eea59fe744c1b5b2c5dae324b6887f985a6569 Made the Cleanroom optional. This disables the Low Grav option if the Cleanroom is disabled. | |||
2017-06-14 | Made the Cleanroom optional. | Draknyte1 | |
This disables the Low Grav option if the Cleanroom is disabled. | |||
2017-06-13 | Reworking DataOrb and DataStick | Techlone | |
2017-06-12 | cherry pick: | Dream-Master | |
c9277a3a7e6bd2a89ce12f8698ed0e7b86346731 | |||
2017-06-12 | change back the component heat exchanger damage value | Blood-Asp | |
2017-06-12 | Fixed Chloromethane and Chloroform recipes missing empty cell outputs | Johannes Gäßler | |
2017-06-10 | fixed a few more recipes | Dream-Master | |
2017-06-10 | rename BioFuel to BioDiesel | Dream-Master | |
add Circuits to chemical reactor recipes | |||
2017-06-10 | Added a Recipe Map for Primitive Blast Furnaces | Johannes Gäßler | |
The Recipe Map is not yet in use. | |||
2017-06-10 | a few fixes | Techlone | |
2017-06-09 | cherry pick | Johannes Gäßler | |
74c41614a5e8a6cb49e62a225669a1e1d07bc87b | |||
2017-06-08 | Implemented Bricked Blast Furnace, added corresponding textures | Johannes 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-08 | remove hcl because already added | Dream-Master | |
2017-06-08 | remove the recipe because already in the code | Dream-Master | |
2017-06-07 | cables are to expensive | vlad20012 | |
2017-06-07 | change cables back | Dream-Master | |
2017-06-07 | Merge branch 'unstable' into advminer2_improvements | Techlone | |
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java | |||
2017-06-07 | Merge branch 'advminer2_improvements' of ↵ | Techlone | |
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements | |||
2017-06-07 | Merge branch 'refs/heads/pr/1077' into unstable | Blood-Asp | |
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | |||
2017-06-07 | cherry 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-06 | Added 6 Input slots to Assembler | Dream-Master | |
Change mv chemical reactor using Glass not Plastic | |||
2017-06-06 | Oil Cracking Update from Johannes Gaessler | Dream-Master | |
2017-06-06 | Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169 | Johannes Gäßler | |
2017-06-06 | Fix Nitric Acid name #1079 | Blood-Asp | |
2017-06-06 | cherry pick: from Techlone | Dream-Master | |
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db | |||
2017-06-06 | Fix vents as covers. Ventcovers now speed up machines 1-3% #1065 | Blood-Asp | |
2017-06-05 | try this id | Dream-Master | |
2017-06-05 | because this id was used by the core mod. | Dream-Master | |
2017-06-05 | cherry pick | Dream-Master | |
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96 | |||
2017-06-05 | cherry pick: | Johannes Gäßler | |
3ec9ddf34613b819a13e8cab8c84fcff369f1e65 Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200 | |||
2017-06-05 | Thiccness changes done | Technus | |
2017-06-05 | Adjust Thiccnes for things from bloodasp branch | Technus | |
2017-06-05 | Adjust pipe thiccnes | Technus | |
2017-06-05 | fix OsmiridiumCasing recipe in Assembler | Techlone | |
fix ODP changing state when the tip meets itself fix cleaning of oreBlockPositions when a mining column was broken | |||
2017-06-04 | Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200 | Johannes Gäßler | |
2017-06-04 | Merge branch 'unstable' into advminer2_improvements | Techlone | |
2017-06-03 | fixed compressed plates | Dream-Master | |
2017-06-03 | no message | Dream-Master | |
2017-06-02 | Fix compressed meteoric iron recipe. #1071 | Blood-Asp | |
cherry pick : e3b3fd66f19d076fa841ad1da0e05bbb6605f4e3 | |||
2017-06-02 | Fix compressed meteoric iron recipe. #1071 | Blood-Asp | |
2017-06-01 | fix #1041 | Blood-Asp | |
2017-06-01 | Merge branch 'unstable' into advminer2_improvements | Techlone | |