aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
AgeCommit message (Collapse)Author
2017-09-22Adding Fake Player for all drills and pumpsAntifluxfield
2017-09-13cherrypickTechnus
2017-09-11Fix l10n of Item DistributorAntifluxfield
2017-09-03Merge branch 'unstable' into CircuitChemistryUpdateFollowupBlood-Asp
2017-09-03Merge pull request #1174 from Dimach/unstable-3Blood-Asp
Added new function to GT scanner
2017-08-19Merge remote-tracking branch 'origin/unstable' intoJohannes Gäßler
CircuitChemistryUpdateFollowup Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-13Reverted the changes to basic machine processing.Johannes Gäßler
Basic Machines no longer automatically add an integrated circuit to their input.
2017-08-11Show dim id with scannerMuramasa-
2017-08-11Merge pull request #1157 from Dimach/unstable-1Blood-Asp
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
2017-08-01Added a line to the NEI handler that hints at leaving IntCirc(0) emptyJohannes Gäßler
2017-07-28Added new function to GT scanner - print voltage and amperage of electric ↵Dimach
cable at last second.
2017-07-15Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.Dimach
2017-07-11Added an option to findRecipe() to only return recipes with enough inputJohannes Gäßler
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-01Fix cover and mode spellingBlood-Asp
2017-06-29DoneDimach
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-25Assline recipes part1Technus
2017-06-25Revert "NEI GUI AssemblyLine"Daniel
2017-06-25Added simple ItemDistributor implementation, changed MoveOneItemStackJohannes Gäßler
2017-06-24NEI GUI AssemblyLineSLiMylya
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-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-13Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-10Added a Recipe Map for Primitive Blast FurnacesJohannes Gäßler
The Recipe Map is not yet in use.
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-05Add missing translation lines. #772Blood-Asp
2017-06-03Added two changes accidentally not added to the previous commit.Johannes Gäßler
2017-06-02Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" ↵Techlone
message for II-IV tiers change build.gradle for debugging in IDEA
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-01Cherry-Pick c12e474Technus
https://github.com/GTNewHorizons/GT5-Unofficial/commit/c12e474c23ca02fb3479312850f6ae07e623d8b9
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01AdvMiner rewriting; now it's Ore Drilling PlantTechlone
Four tiers of Ore Drilling Plant I - radius is 3 chunks MV+ (default) II - radius is 4 chunks HV+ III - radius is 6 chunks EV+ IV - radius is 9 chunks IV+ New behavior: - pick pipes after mining finish - extract ore block before moving down
2017-05-31Catch broken items on recipe moveBlood-Asp
2017-05-30Implemented SBR recipes, Added method for LCM recipes, adjustedJohannes Gäßler
polymerization Polymerization now requires Titaniumtetrachloride instead of Titanium Dust; Can only be performed in a LCM. Adjusted the visual representation of LCM recipes in NEI
2017-05-25Fixed IC2 steam compatibility for crackingJohannes Gäßler
2017-05-25Removed debugging print accidentally left in from the previous versionJohannes Gäßler
2017-05-24Expanded Materials class for cracked Fluids, changed cracking recipesJohannes Gäßler
Fluid cracking can be done with either Steam or Hydrogen and at 3 different severities for a total of six different recipes. Cracking severity is controlled with a programmed circuit. Removed the previously used liquids for cracked light fuel/heavy fuel Changed the Distillation Tower recipes so they can utilize up to 11 fluid outputs
2017-05-16Changed the NEI GUI of the Distillation Tower to show up to 12 outputs.Johannes Gäßler
Also added a currently unused GUI for 9x9 recipes.
2017-05-13Fixed a bug that caused there to be two identical recipes for TiF4Johannes Gäßler
2017-05-13Added a new recipe map for the LCR, expanded the API to allow for customJohannes Gäßler
NEI stack positioning. Refactored the name of the Large Boiler Fake Fuels so they're in line with other names. Fixed a bug where the LCM was checking for the wrong casing type.
generated by cgit (git 2.46.0) at 2025-03-13 01:26:52 +0000