aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2017-07-01Merge pull request #1129 from Antifluxfield/PlayerDetector-fixBlood-Asp
Player detector fix
2017-07-01Merge pull request #1130 from Antifluxfield/AssemblyLine_upgradeBlood-Asp
Assembly line upgrade
2017-07-01Merge pull request #1128 from Dimach/oil-fixBlood-Asp
Removed divider that already applied in Gt_UndergroundOil.
2017-06-30Update GT_MetaTileEntity_MultiBlockBase.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_MultiBlockBase.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_Hatch_DataAccess.javaAntifluxfield
2017-06-30Update Textures.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_Hatch_DataAccess.javaAntifluxfield
2017-06-30Update ItemList.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_Hatch_DataAccess.javaAntifluxfield
2017-06-30Update GT_GUIContainer_1by1.javaAntifluxfield
2017-06-30Update GT_GUIContainer_2by2.javaAntifluxfield
2017-06-30Update GT_GUIContainer_3by3.javaAntifluxfield
2017-06-30Update GT_GUIContainer_4by4.javaAntifluxfield
2017-06-30Delete GT_GUIContainer_DataAccess.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_MultiBlockBase.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_MultiBlockBase.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_Hatch_DataAccess.javaAntifluxfield
2017-06-30Create GT_GUIContainer_DataAccess.javaAntifluxfield
2017-06-30Update GT_MetaTileEntity_Hatch_DataAccess.javaAntifluxfield
2017-06-30Check for DataItemsAntifluxfield
2017-06-30Make Data Access Hatch a MultiBlock partAntifluxfield
2017-06-30Adding Data Access HatchAntifluxfield
2017-06-29Adding Data Access HatchAntifluxfield
2017-06-29DoneDimach
2017-06-29Player Detector fix #2Antifluxfield
2017-06-29Trying to fix #1112Antifluxfield
A simple duct-tape of this issue.
2017-06-28Fixed 2 formulaeAntifluxfield
TiC2Cl2 => TiCl4; HPO4 => H3PO4.
2017-06-27Corrected Plutonium Isotope: 244 -> 239Johannes 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-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-25Optimize imports - intelliJ one button actionTechnus
2017-06-25Assline recipes part1Technus
2017-06-25Revert "NEI GUI AssemblyLine"Daniel
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-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-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 pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
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-16Fix buffer and regulator RS signalsBlood-Asp
2017-06-15Hitboxes when holding soldering iron #1095Blood-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-14pollution smogBlood-Asp
2017-06-14Returned BioFuel to its previous state, added BioDiesel instead.Johannes Gäßler
There are artifacts for fluids called BioFuel, therefore the change.
2017-06-14fix for timber changesBlood-Asp
generated by cgit (git 2.46.0) at 2025-03-13 17:18:54 +0000