aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
AgeCommit message (Collapse)Author
2017-07-01Fix cover and mode spellingBlood-Asp
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-25Optimize imports - intelliJ one button actionTechnus
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-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-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-13wood plank compressor recipe #1013Blood-Asp
2017-06-13Tooltips changingTechlone
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-06Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for ↵Blood-Asp
marble/basalt, chisel compat #1050
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-05Added Rape Crop as a new source of Seed OilJohannes Gäßler
2017-06-05Made it so that rubber-related recipes accept more than one rubber typeJohannes Gäßler
LV, MV, HV recipes accept all rubbers. EV+ recipes accept only synthetic rubbers. Affected items: Pump, Conveyor Module, Plunger, Because it is not easily possible to have this functionality for the Assembly Line, the Assembly Line still accepts only one type of rubber for each recipe.
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-05-31Fix comb processing recipes #1052Blood-Asp
2017-05-31Disable switching armor gui because of broken syncBlood-Asp
2017-05-31Catch login armor crashBlood-Asp
2017-04-19Added a lot of (petro)chemistry stuff, expanded the APIJohannes Gäßler
Created an adapter class for creating materials. Materials now have bit flags for automatic gas/fluid creation. Added a new convenience method for adding distillery recipes. Recipes now show the exact recipe duration instead of the duration rounded down to the nearest int. Added new Materials with relevant recipes: Acetic Acid, Acetone, Calcium Acetate, Charcoal Byproducts, Carbon Monoxide, Ethanol, Ethylene, Methanol, Methyl Acetate, Polyvinyl Acetate, Propene, Sulfuric Ethylene, Vinyl Acetate Made vinegar visible.
2017-03-31catch most modular armor crashesBlood-Asp
2017-03-31Add assemblyrecipes for all circuits per oredictBlood-Asp
2017-03-22Fix spelling of wafersBlood-Asp
2017-03-16Fix for negative-coordinate vein generation, adjustments to recipes for ↵MauveCloud
stone dust, sand, and flint
2017-03-16Cleanup code and fix incorrect merge.Dimach
2017-03-08Fix rubber plates in modular armor bootsBlood-Asp
2017-03-08Better circuit tooltipsBlood-Asp
2017-03-05Moar circuit balanceBlood-Asp
2017-03-01Some recipe fixes.Blood-Asp
2017-03-01Remove rubber from steamageBlood-Asp
2017-03-01More circuit balancingBlood-Asp
2017-02-28Circuit changesBlood-Asp
2017-01-10Fix #851vlad20012
2016-12-23Play plunger sound when clearing fluids from GT machinesBlood-Asp
2016-12-23Reduce damage sense takes when harvesting ic2 crops compared to other usesBlood-Asp
2016-12-17Merge pull request #803 from dgabehar/unstableBlood-Asp
Crash with Modular Exoskeleton #769
2016-12-15Added check to ensure that fluid is set trying to provide air to player ↵Doug Gabehart
during onArmorTick Looking at how to fill helmet tank from air cell
2016-12-15Fixed processing power issue where values continually increased up to infinityDoug Gabehart
2016-12-14More stability improvements. (Null value and checks to ensure keys exist)Doug Gabehart
2016-12-14Fixed issue with Modular Armor inventory not saving properly after removing ↵Doug Gabehart
the call to closeScreen Added null and key checks when determining if a full radiation or electrical armor set is configured
2016-12-14Removed player.closeScreen call to fix graphics glitch when switching armor tabsDoug Gabehart
2016-12-14Added updateArmorStats method which includes additional checks to ensure ↵Doug Gabehart
that values are not null and the key in question exists in mStats Removed player.closeScreen call in mouseClicked to prevent display glitch when switching armor gui tabs; (mouse focus from returning to 2x2 crafting grid)
2016-12-13Replace all literal numbers referring to tool types with named constantsDavid Vierra
2016-12-07Fixed #786.Dimach
2016-11-02Modular Armor configsBlood-Asp
2016-10-30Modular Armor changes 1Blood-Asp
2016-10-26Improve harvest range of sense to 5x5x5(now working)Blood-Asp
2016-10-19Make Dough by throwing flour into filled cauldronBlood-Asp
2016-10-19Cleanup recipe classesBlood-Asp
2016-10-16Fix recipes for forestry wood covers.Blood-Asp