aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-30Update GT_MetaTileEntity_AssemblyLine.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_AssemblyLine.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_AssemblyLine.javaAntifluxfield
2017-06-30Make Data Access Hatch part of AssLineAntifluxfield
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-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-25Extra fix for: https://github.com/Blood-Asp/GT5-Unofficial/issues/1098Technus
2017-06-25Add refreshing codeTechnus
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-25Assline recipes part1Technus
2017-06-25Revert "NEI GUI AssemblyLine"Daniel
2017-06-24Added a config option for easier EV+ CablesJohannes Gäßler
2017-06-24NEI GUI AssemblyLineSLiMylya
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-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.
2017-06-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-18Merge branch 'ChemistryUpdate' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
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-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-17Fixed Imp. Compressor Dynamite amount possibly becoming zeroJohannes Gäßler
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-16Added Interface classes for the BBF, increased slots to 3/3Johannes Gäßler
2017-06-15Fix hiding of unused ores. #1062Blood-Asp
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes 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-15Improve fog density calculationBlood-Asp
2017-06-14pollution smogBlood-Asp
2017-06-14Fixed a bug where an Assembler recipe would be added if the output isJohannes Gäßler
null
2017-06-14Made the Cleanroom optional.Draknyte1
This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14improve cleanroom tooltipBlood-Asp
2017-06-14fix for timber changesBlood-Asp
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-13wood plank compressor recipe #1013Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-13Port GT6 timber changesBlood-Asp
2017-06-13meh...Blood-Asp
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-11Changed the Primitive Blast Furnace so that it uses the new Recipe MapJohannes Gäßler
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-09Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc.Johannes Gäßler
Made it so that GT_Values.NI and GT_Values.NF are consistently used when applicable. Nerfed Silicone Rubber so that you only get 3/7 as much as from a regular plastic. The idea is that Silicone Rubber is more versatile than PVC or SBR, but also more expensive. Changed the Distillation Tower description so that it aligns with the new behavior.
2017-06-08Implemented Bricked Blast Furnace, added corresponding texturesJohannes 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-08fix wrong center chunk coordinatesTechlone
2017-06-07experimental worldgen change fixBlood-Asp
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07Merge branch 'advminer2_improvements' of ↵Techlone
https://github.com/Techlone/GT5-Unofficial into advminer2_improvements
generated by cgit (git 2.46.0) at 2025-03-12 23:25:48 +0000