aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
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-07Rebalanced Fermented Biomass in face of the Methane Fuel Value changeJohannes Gäßler
Now also yields Fertilizer, Ammonia, and Carbon Dioxide.
2017-06-06forgot to commit the oredict changesBlood-Asp
2017-06-06Porting of GT6 prospection + Marble/Basalt compatibility, more oredicts for ↵Blood-Asp
marble/basalt, chisel compat #1050
2017-06-06Fixed a bug where the order of DT fluid outputs was actually reversedJohannes Gäßler
2017-06-06Changed the ID of the LCM again because of GTNH collision: 1200 -> 1169Johannes Gäßler
2017-06-06Check general redstoneoutput for nullBlood-Asp
2017-06-06Fix Nitric Acid name #1079Blood-Asp
2017-06-06Correcting Steel Boiler Tooltip #1080Blood-Asp
2017-06-06Fix vents as covers. Ventcovers now speed up machines 1-3% #1065Blood-Asp
2017-06-05Attempt to prevent worldgen loops with other mods #1063 #828Blood-Asp
2017-06-05Improved large boiler tooltip #877Blood-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-05Thiccness changes doneTechnus
2017-06-05Adjust pipe thiccnesTechnus
2017-06-05this actually changes the raytracer boxes reusing the collision boxesTechnus
2017-06-05Missing in item pipeTechnus
2017-06-05fix OsmiridiumCasing recipe in AssemblerTechlone
fix ODP changing state when the tip meets itself fix cleaning of oreBlockPositions when a mining column was broken
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-04Changed the MetaGeneratedItem ID of the Large Chem Reactor: 1177 -> 1200Johannes Gäßler
2017-06-04Merge branch 'ChemistryUpdate' of ↵Johannes Gäßler
https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate
2017-06-04Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5Johannes Gäßler
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
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-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom controller outputs efficency as redstone signal #948Blood-Asp
2017-06-031ddc91aTechnus
2017-06-03Fix Pollution bugBlood-Asp
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-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
2017-06-02Made it so that low-tech cables can be made with higher-tech insulationJohannes Gäßler
To prevent transmutation unpackaging no longer refunds Paper/Black Carpet/Rubber Sheets.
2017-06-02Fix compressed meteoric iron recipe. #1071Blood-Asp
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
2017-06-01Merge branch 'unstable' into advminer2_improvementsTechlone
2017-06-01OreDrill state savingTechlone
2017-06-01Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵Techlone
- need check this
2017-06-01Teleporter and Energy Transmitter fixesBlood-Asp
2017-06-01Cleanup and some commentaryDaniel
2017-06-017bd71feDaniel