aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-09-03Merge pull request #1184 from GTNewHorizons/texture_overhaulBlood-Asp
Texture overhaul
2017-09-03Merge pull request #1170 from JohannesGaessler/PyrometallurgyUpdateBlood-Asp
Pyrometallurgy update
2017-09-03Merge branch 'unstable' into patch-5Blood-Asp
2017-09-03Merge pull request #1195 from Techlone/fix_inconsistent_wordgenBlood-Asp
Fix inconsistent worldgen
2017-09-03Merge pull request #1193 from Antifluxfield/patch-4Blood-Asp
Improve fluid regulator
2017-09-03Merge pull request #1191 from Antifluxfield/patch-2Blood-Asp
Fix the Tooltip of Pumps
2017-09-03Merge pull request #1168 from Antifluxfield/patch-1Blood-Asp
Correct description of regulator
2017-09-03Merge pull request #1147 from SLiMylya/addnewbatteryBlood-Asp
Add new zpm and uv battery
2017-08-21Use "/n " as seperatorAntifluxfield
2017-08-21Fixed Large Chemical Reactor GUI, was wrongly using default beforeJohannes Gäßler
2017-08-21Multi-line tooltip of #1193Antifluxfield
2017-08-19Merge branch 'unstable' into PyrometallurgyUpdateJohannes 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/loaders/oreprocessing/ProcessingOre.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2017-08-19Fixed Steam Macerators using constant EUt, recipe timeJohannes Gäßler
2017-08-19Adding tooltipAntifluxfield
2017-08-19Fix inconsistent worldgenTechlone
2017-08-17Update GT_Cover_FluidRegulator.javaAntifluxfield
Improve the screwdriver-rightclick behavior.
2017-08-16Fix Tooltip of PumpAntifluxfield
Add the missing bracket
2017-08-12Pump tooltipsMuramasa-
2017-08-11implements #1061Muramasa-
2017-08-11Some tooltip info #1183Muramasa-
2017-08-11maybe correct #1137Muramasa-
2017-08-11Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScalingBlood-Asp
Pyrolyse oven coil scaling
2017-08-11Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowupBlood-Asp
Cracking Balance Followup
2017-08-11Merge pull request #1156 from Antifluxfield/distillery-recipe-fix-altBlood-Asp
Another Distillery recipe fix
2017-08-11Merge pull request #1153 from JohannesGaessler/MultiblockFluidIOFixBlood-Asp
Multiblock Fluid IO fix
2017-08-11Merge pull request #1144 from Dimach/unstableBlood-Asp
Fixed coloring of pyrolyse oven.
2017-08-07Reverted changes to Mercury Ore Washing.Johannes Gäßler
2017-08-07Reverted the change that gated Plastic at MV. It's available at LV againJohannes Gäßler
2017-08-06Fixed a bug with ghost Items left behind in the Large Chemical ReactorJohannes Gäßler
2017-08-06Removed Burn Value for Carbon Dust.Johannes Gäßler
2017-08-06Added the Large Chemical Reactor Controller inventory to the item inputJohannes Gäßler
2017-08-05Enabled Coal/Charcoal/Coal Coke Blocks for the Primitive Blast FurnaceJohannes Gäßler
2017-08-04Fixed a bug with ghost Items left behind in the Large Chemical ReactorJohannes Gäßler
2017-08-03More compatible attemptTechnus
2017-08-02Expand to add proper texture paging support.Technus
2017-08-02Find a better way to handle those dustsAntifluxfield
2017-07-28Texture overhaul,Technus
allows for more textures to be added for casing, with extra byte of data for paging. Just change the value of mTexturePage at the same time you change mMachineBlock.
2017-07-27Fixed a bug where every Fluid was put out at the top of the EBFJohannes Gäßler
2017-07-26Added a config for the converion rate of Direct Smelting: 1 <-> 2/3Johannes Gäßler
2017-07-24Adjusted GT_Pollution JavadocJohannes Gäßler
2017-07-24Pyrolyze Oven processing speed now depends on Coil TierJohannes Gäßler
2017-07-24Pyrolyze Oven now accepts all Coils, transformed umlauts in doc to asciJohannes Gäßler
2017-07-24Implemented Fluid Output for the EBFJohannes Gäßler
Regular Fluids are put out at the bottom layer. CO2, CO, and SO2 are put out at the top layer and their amount scales with the tier of the EBF's Muffler Hatch
2017-07-23Changed Galena Formula: Pb3Ag3S2 -> PbS, added PbS -> Pb direct smeltingJohannes Gäßler
Also added the corresponding pyrometallurgical recipes.
2017-07-23Implemented Roasting and Carbothermic Reduction for the EBF.Johannes Gäßler
2017-07-22Correct descriptionAntifluxfield
The cost is actually tripled at: https://github.com/Blood-Asp/GT5-Unofficial/blob/unstable/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java#L95
2017-07-20Removed Burn Value for Carbon Dust.Johannes Gäßler
2017-07-17Added the Large Chemical Reactor Controller inventory to the item inputJohannes Gäßler
2017-07-17add config EnableZPMandUVBatteries default falseSLiMylya
2017-07-14Update GT_RecipeAdder.javaAntifluxfield