aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-29Add missing importTechnus
2017-06-29Cleanup materials whitespace.Technus
2017-06-29Revert the commitAntifluxfield
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-29Removed divider that already applied in Gt_UndergroundOil.Dimach
2017-06-29Fixed a bug where the Bricked Blast Furnace didn't need a casing.Johannes Gäßler
I forgot to actually implement checking whether the casing blocks are Firerick blocks.
2017-06-29Change Back the messageAntifluxfield
Something I've done wrong...
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-28Trying to fix PE polymerizing recipeAntifluxfield
These recipe confilcts with the PE polymerizing recipe with oxygen. Just add an Integrated Circuit in the recipe.
2017-06-28Fixed 2 formulaeAntifluxfield
TiC2Cl2 => TiCl4; HPO4 => H3PO4.
2017-06-28Added the state of the ItemDistributor to the NBTTadCompoundJohannes Gäßler
2017-06-27Fixed Dual Fuel Rod namesDream-Master
2017-06-27cherry pickJohannes Gäßler
4061f8f397d40fb3a4e363d86f47bd631a2da539 Corrected Plutonium Isotope: 244 -> 239
2017-06-27Corrected Plutonium Isotope: 244 -> 239Johannes Gäßler
2017-06-27Added configurable weights to the ItemDistributor sides.Johannes Gäßler
2017-06-26Fixed Dual Fuel Rod names, Tungstencarbide, removed some EBF Ash outputsJohannes Gäßler
2017-06-26Merge branch 'unstable_blood' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/MaterialBuilder.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-26change solar Boiler recipe againDream-Master
2017-06-26Fixed typo: Firerick -> FirebrickJohannes Gäßler
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/blocks/GT_Block_Casings4.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Merge branch 'OilRefining' into unstableJohannes Gäßler
Conflicts: 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
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-25Extra fix for: https://github.com/Blood-Asp/GT5-Unofficial/issues/1098Technus
2017-06-25Add refreshing codeTechnus
2017-06-25Add GUI assetTechnus
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-25Assline recipes part3Technus
2017-06-25Assline recipes part2Technus
2017-06-25Assline recipes part1Technus
2017-06-25spellingDream-Master
2017-06-25Merge pull request #1117 from Technus/revert-1115-asslineBlood-Asp
Revert "NEI GUI AssemblyLine"
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 "NEI GUI AssemblyLine"Daniel
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-25Added simple ItemDistributor implementation, changed MoveOneItemStackJohannes Gäßler
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-24Created a non-functional first draft of the Item DistributorJohannes Gäßler