aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-10-08Small fix to Plunger behaviour.Alkalus
2017-09-14Merge pull request #1218 from GTNewHorizons/updateUOBlood-Asp
Revert acciential change to UO
2017-09-14Revert acciential change to UOTechnus
2017-09-15Improve i18n of tooltipAntifluxfield
2017-09-13Add config for AE2Tunnel. Defaul off for now until fix.Blood-Asp
2017-09-13more descriptive argument nameTechnus
2017-09-13Optimize a bitTechnus
2017-09-13cherrypickTechnus
2017-09-13Minor change, can catch potential errors when the extraction val per tick is ↵Technus
insane
2017-09-13tooltip againBlood-Asp
2017-09-12Hard remove ores that might be exploitable by MRF laser drillBlood-Asp
2017-09-12Fix TooltipBlood-Asp
2017-09-12Fix #1201Blood-Asp
2017-09-12Merge fixBlood-Asp
2017-09-12Merge pull request #1211 from Antifluxfield/patch-2Blood-Asp
Fix localization of Item Distributor
2017-09-12Merge branch 'unstable' into odp_speed_improvingBlood-Asp
2017-09-12Merge branch 'unstable' into drillers-upgradeBlood-Asp
2017-09-11Fix l10n of Item DistributorAntifluxfield
2017-09-11Fix NPE of fluid checkAntifluxfield
2017-09-11Fix NPE of fluid check.Antifluxfield
2017-09-10missclickJohn
2017-09-10Now ODP Mk(N) is faster than Mk(N-1)Techlone
2017-09-04Fix logic when working in void dimensionsAntifluxfield
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-16Clean up importsAntifluxfield
2017-08-16Move the Data-Access codes only to those who really needs them.Antifluxfield
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-