aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-09-11Fix l10n of Item DistributorAntifluxfield
2017-09-03Merge branch 'unstable' into CircuitChemistryUpdateFollowupBlood-Asp
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-24Added missing Tetraitromethane, Polymerization recipesJohannes Gäßler
2017-08-21Use "/n " as seperatorAntifluxfield
2017-08-21Fixed EV Pumps using the wrong RubberJohannes Gäßler
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-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-19Reduced Oxygen consumption of Plastic Production by 50%Johannes Gäßler
2017-08-19Fixed Steam Macerators using constant EUt, recipe timeJohannes Gäßler
2017-08-19Old chemical recipes are now enabled by default, marked as deprecatedJohannes 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-13Reverted the changes to basic machine processing.Johannes Gäßler
Basic Machines no longer automatically add an integrated circuit to their input.
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-02Multiblock Chemical Reactor now also automatically adds an Int. Circ.Johannes Gäßler
2017-08-02Reenabled regular Rubber for the EV Conveyor BeltJohannes Gäßler
2017-08-02Expand to add proper texture paging support.Technus
2017-08-02Find a better way to handle those dustsAntifluxfield
2017-08-01Adapted the Large Chemical Reactor recipes for the Int. CircuitsJohannes Gäßler
2017-08-01Moved Synthetic Rubber requirement: EV -> IV, made it more convenientJohannes Gäßler
Cable insulation works as it did before for EV cables. IV+ Cables can be insulated with only molten Silicone. Insulation now also works with whole Dusts at 4x the batch size.
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