aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
AgeCommit message (Expand)Author
2017-11-05Merge pull request #1269 from MauveCloud/unstableBlood-Asp
2017-11-05Merge pull request #1251 from Antifluxfield/l10n_improveBlood-Asp
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
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
2017-07-31Overhauled the Wetware Circuit recipesJohannes Gäßler
2017-07-26Overhauled Fiberglass Circuit BoardJohannes Gäßler
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
2017-06-25Merge branch 'BrickedBlastFurnace' into unstableJohannes Gäßler
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-18Merge remote-tracking branch 'origin/unstable' into OilRefiningJohannes Gäßler
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
2017-06-15Merge remote-tracking branch 'origin/unstable' into ChemistryUpdateJohannes Gäßler
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 m...Blood-Asp
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
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
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 stone...MauveCloud
2017-03-16Cleanup code and fix incorrect merge.Dimach
2017-03-08Fix rubber plates in modular armor bootsBlood-Asp