aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
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-25Revert "NEI GUI AssemblyLine"Daniel
2017-06-24NEI GUI AssemblyLineSLiMylya
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-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
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
2017-06-14why does the client crash when using isClientSide() ???Blood-Asp
2017-06-14quickfix for server side crashBlood-Asp
2017-06-13missed one fileBlood-Asp
2017-06-13Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect.Blood-Asp
2017-06-13Fix translation of coversBlood-Asp
2017-06-13Port GT6 timber changesBlood-Asp
2017-06-13meh...Blood-Asp
2017-06-13Reworking DataOrb and DataStickTechlone
2017-06-12At last one free face.Blood-Asp
2017-06-12Only open machine gui if front is free.Blood-Asp
2017-06-12Cables and pipes now change hitboxes dynamicly depending on connections or ↵Blood-Asp
covers
2017-06-07formattingTechlone
2017-06-07Merge branch 'unstable' into advminer2_improvementsTechlone
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
2017-06-07Quick fixesBlood-Asp
2017-06-07Merge branch 'refs/heads/pr/1077' into unstableBlood-Asp
# Conflicts: # src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
2017-06-07Merge pull request #1076 from vlad20012/int-overflow-fixBlood-Asp
Fixed stored energy integer overflow
2017-06-06Check general redstoneoutput for nullBlood-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-05Missing in item pipeTechnus
2017-06-05Implemented Bio Diesel, Glyceryl Trinitrate, adjusted alcohol fuel valueJohannes Gäßler
Bio Diesel can be produced from Seed Oil or Fish Oil. Bio Diesel Production yields Glyceryl as a byproduct, which can be used for Dynamite production. Alcohols have their fuel value reduced by 20000 per Oxygen atom Increased the potency of Dynamite in the Implosion Compresser so that dynamite recipes actually show up. In return Dynamite now needs more Glyceryl Trinitrate: 150 -> 500
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-04More redstone changesBlood-Asp
2017-06-04Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-04Fixed a bug where foils were missing for some cable Materials.Johannes Gäßler
2017-06-04Implemented Polyphenylene Sulfide, Sodium Persulfate, made NaOH a solidJohannes Gäßler
Removed the previously added Material AnyDielectric because it cannot be sensibly used. Added Polydimethylsiloxane, Polystyrene, and Styrene-Butadiene Rubber to the list of Materials with plastic-like local names. Added foils for Polyvinylchloride, Styrene-Butadiene Rubber. Fixed a bug where foils were missing for Polyvinyl Chloride
2017-06-04wire/pipe hiding/reduced sizeTechnus
2017-06-04Missing overrideTechnus
2017-06-04Fixed stored energy integer overflowvlad20012
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-031ddc91aTechnus
2017-06-03Made rubber consistent, rewrote WireProcessing, implemented ht cablesJohannes Gäßler
All rubbers are now made by first producing the polymer and then vulcanizing it with Sulfur (equivalent to natural rubber). Rewrote WireProcessing to reduce the amount of duplicate code. Implemented recipes that utilize a combination of a dielectric and a synthetic rubber to make cables. This halves total insulation cost for below-EV cables and reduces it to 75% for EV+ cables (conductive polymer not yet implemented).
2017-06-03Added two changes accidentally not added to the previous commit.Johannes Gäßler
2017-06-03Increased the input slots of the assembler from 2 to 6.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-01Added methods for adding Distillery recipes with a solid output.Johannes Gäßler
Universal Distillation recipes now utilize the solid output. Fixed the chemical formula for Tetranitromethane and fluid name for NitroDiesel
generated by cgit (git 2.46.0) at 2025-07-19 03:37:51 +0000