aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-24Added a config option for easier EV+ CablesJohannes 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-23Added Bricked BF config, fixed Primitive BF class hierarchyJohannes Gäßler
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
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-23Fixed several Material formulasJohannes Gäßler
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-22Fixed NitrationMixture FluidStacks, Glyceryl recipe stocheometryJohannes Gäßler
2017-06-22Moved the Casings for the Large Chemical Reactor again.Johannes Gäßler
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.
generated by cgit (git 2.34.1) at 2026-05-28 12:01:02 +0000