aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
34058f0e1e65f12ab5d7f97fc3469a4de1264bb2 Fixed Diluted Sulfuric Acid recipes, PTFE Pipe Casing name
2017-07-02cherry PickDream-Master
9fc84fc1e74bdf81b33ff84d008a1614115a69f1 ff0017de19f80dd70fa646ea8b6464110e64677b c21e9cfc41ea0129aae7ff8bc41aea7eaf73629f @Antifluxfield Please look if i make it right Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-07-01cherry pickDream-Master
026fcfcbbadc8c3163f13b64192fed6ea05343fc Clean reset of Datastick so remaining old data does not break assemblyline.
2017-07-01cherry pickBlood-Asp
a0031717d11db2c8c7f55ed0dc0de84ff8dc2a26 Make assembly line use cheaper circuit techs. #1114
2017-07-01cherry pickBlood-Asp
2385f04b41065e0f229f1bf53d81b8a8f094a742 Fix cover and mode spelling
2017-07-01fix cheese as dough #1123Blood-Asp
2017-07-01remove Flawless Gems because they used for long Rods recipesDream-Master
2017-07-01Not possible to get advanced circuits if you arent already in hv #1581Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1581
2017-06-29bump versionDream-Master
2017-06-29not need itDream-Master
2017-06-29Fixed 2 formulas #1122Dream-Master
2017-06-29Trying to fix PE polymerizing recipe #1126Dream-Master
2017-06-29Rework naq/mnq depleated fuel rod usageTechnus
2017-06-29Add missing importTechnus
2017-06-29Cleanup materials whitespace.Technus
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-28Revert "Ammonia recipe is imbalanced #1567"Dream-Master
This reverts commit c73d573496e5eacf0a2cfe4dd656090e28557a09.
2017-06-28bump versionDream-Master
2017-06-28Ammonia recipe is imbalanced #1567Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1567
2017-06-27Fixed Dual Fuel Rod namesDream-Master
2017-06-27cherry pickJohannes Gäßler
4061f8f397d40fb3a4e363d86f47bd631a2da539 Corrected Plutonium Isotope: 244 -> 239
2017-06-26change solar Boiler recipe againDream-Master
2017-06-25recipe fixesDream-Master
2017-06-25Ender IO alloy dusts (Reminder) #1553Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1553
2017-06-25Change Solar Boiler recipeDream-Master
2017-06-25spellingDream-Master
2017-06-25Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-06-25NO CHANGES DONE Merge branch 'unstable_BLOOD' into experimentalTechnus
# Conflicts: # src/main/java/gregtech/api/GregTech_API.java # src/main/java/gregtech/api/enums/Materials.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/util/GT_Recipe.java # src/main/java/gregtech/common/GT_RecipeAdder.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java # src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java # src/main/java/gregtech/nei/NEI_GT_Config.java
2017-06-25fix spellingDream-Master
2017-06-25Revert "Fixed recipes robot arm and Sensors using wrong circuits"Dream-Master
This reverts commit 87b88798669c934416df08096377a7a075cf59e9.
2017-06-25change picDream-Master
2017-06-25Fixed recipes robot arm and Sensors using wrong circuitsDream-Master
2017-06-24remove vent casing recipes because in the core modDream-Master
2017-06-24bump versionDream-Master
2017-06-24Merge branch 'BrickedBlastFurnace' into experimentalDream-Master
2017-06-24cherry pickJohannes Gäßler
51574479e928a91d724d85ff9e38d2de65fe6fd4 Made the Large Chemical Reactor cheaper, added more Cell Materials Large Chemical Reactor Circuits: Elite -> Advanced Inert Machine Casing: Clean Stainless Steel Casing -> Solid Steel Casing Fluid Cells can now also be made from Steel and Polytetrafluoroethylene Fixed the name of Plastic and PTFE Fluid Pipes.
2017-06-24cherry pickJohannes Gäßler
4b77ca671312ae6a5f2e5c726397ec98622dd36c Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic Acid
2017-06-24cherry pickJohannes Gäßler
6f3d92f3fab34444e8a8cc32bee9f80efde0eaaf Added a config option for easier EV+ Cables
2017-06-24Made the Large Chemical Reactor cheaper, added more Cell MaterialsJohannes Gäßler
Large Chemical Reactor Circuits: Elite -> Advanced Inert Machine Casing: Clean Stainless Steel Casing -> Solid Steel Casing Fluid Cells can now also be made from Steel and Polytetrafluoroethylene Fixed the name of Plastic and PTFE Fluid Pipes.
2017-06-24Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic AcidJohannes Gäßler
2017-06-24Merge pull request #1115 from SLiMylya/asslineBlood-Asp
NEI GUI AssemblyLine
2017-06-24NEI GUI AssemblyLineSLiMylya
2017-06-24recipes fixes (Sensor, Emitter)Dream-Master
2017-06-24cherry pickJohannes Gäßler
c0c498fb8cec35d35cc5fd2b8524cd5510082a9b Added Bricked BF config, fixed Primitive BF class hierarchy Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-23Add new Circuit PartsDream-Master
2017-06-23Sensor and Emitter recipe changesDream-Master
2017-06-23bump versionDream-Master
2017-06-23hopfully fixedDream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1550 Missing Item Name #1550