aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
AgeCommit message (Collapse)Author
2017-11-05Merge pull request #1269 from MauveCloud/unstableBlood-Asp
Removed oredict registration of AnyIron, AnyCopper, etc.
2017-11-05Merge pull request #1251 from Antifluxfield/l10n_improveBlood-Asp
Localization improve
2017-11-05Added a failsafe for invalid Modular armour components.Alkalus
2017-11-02Removed oredict registration of AnyIron, AnyCopper, etc.MauveCloud
2017-10-19l10n improve 2Antifluxfield
2017-10-08Actually fix the plunger behaviour this time.Alkalus
2017-10-08Small fix to Plunger behaviour.Alkalus
2017-09-03Merge branch 'unstable' into CircuitChemistryUpdateFollowupBlood-Asp
2017-09-03Merge branch 'unstable' into patch-5Blood-Asp
2017-09-03Merge pull request #1193 from Antifluxfield/patch-4Blood-Asp
Improve fluid regulator
2017-08-21Use "/n " as seperatorAntifluxfield
2017-08-21Fixed EV Pumps using the wrong RubberJohannes Gäßler
2017-08-21Multi-line tooltip of #1193Antifluxfield
2017-08-19Adding tooltipAntifluxfield
2017-08-02Reenabled regular Rubber for the EV Conveyor BeltJohannes Gäßler
2017-08-01Added a line to the NEI handler that hints at leaving IntCirc(0) emptyJohannes Gäßler
2017-07-31Changed Vacuum Freezer Circuits: Elite -> Data/ExtremeJohannes Gäßler
2017-07-31Added a new Basic Circuit: MicroprocessorJohannes Gäßler
Produced similarly to the Integrated Processor, but yields 2 Basic Circuits instead of 1 Good Circuit.
2017-07-31Overhauled the Wetware Circuit recipesJohannes Gäßler
They no longer need beer. Also the basic Wetware Processor only needs 1 Wetware Circuit Board.
2017-07-26Overhauled Fiberglass Circuit BoardJohannes Gäßler
Renamed: Fiberglass Circuit Board -> Fiber-Reinforced Circuit Board Fiber-Reinforced Boards are now made by combining Epoxy Resin with either Glass Fiber or Carbon Fiber. Glass Fiber is produced from Borosilicate Glass, which is in turn produced from Glass and Boron. To make this feasible Salt and Rock Salt now yield Borax as a byproduct.
2017-07-25Added a new Circuit board tier: Plastic Circuit BoardJohannes Gäßler
2017-07-17add config EnableZPMandUVBatteries default falseSLiMylya
2017-07-09update changeSLiMylya
2017-07-08add batterySLiMylya
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
generated by cgit (git 2.46.0) at 2025-03-11 17:46:00 +0000