aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-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-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-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-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-23hopfully fixedDream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1550 Missing Item Name #1550
2017-06-23Cherry PickJohannes Gäßler
41b93ae85dfe8e15f7d46a09cb49b65991901fed RedAlloy, TungstenCarbide now have the correct formula. Changed the formula of Lignite, it no longer contains Ash Fixed the algorithm for determining whether or not to put brackets around a partial Material.
2017-06-22wrongly removed Casings 6Dream-Master
2017-06-22cherry pickJohannes Gäßler
14b9332d141ff652cf728ea16a7d44274f0e1bef Moved the Casings for the Large Chemical Reactor again. As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-06-22cherry pickJohannes Gäßler
285c6637dd93b54d1bb31c19b1497c554afd7772 Fixed NitrationMixture FluidStacks, Glyceryl recipe stocheometry
2017-06-21concrete goes to core mod recipesDream-Master
2017-06-21remove BBF recipe and changed Bricked Blast furnaceDream-Master
2017-06-20Circuit Assembler progression #1541Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1541
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-19Minor change, full revert.Technus
2017-06-18lower it a bit because methane have a burn value from 104k and biogas from 40kDream-Master
2017-06-18cherry pickJohannes Gäßler
368557ca5e60c0a4d636b80a08c0c606150fff2c Biomass Fermentation: Efficiency 80% -> 100%, Duration 640t -> 150t
2017-06-18Vac Freezer back Elite circuit and Distillation Tower Elite Circuit as wellDream-Master
2017-06-18Revert worldgen changes.Technus
2017-06-18Merge branch 'reMerge' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into reMerge
2017-06-18Show all assline recipes upon picking up debug scannerTechnus
2017-06-18remove unused wrong recipeDream-Master
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks
2017-06-17ChangesTechnus
2017-06-17Put assline Circuits to the Core ModDream-Master
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.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-17Cleaned up to GT_MachineRecipeLoaderTechnus
2017-06-17Cleaned up to ore processingTechnus