aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
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 #1197 from JohannesGaessler/FluidCannerCostReductionBlood-Asp
Fluid Canner cost reduction
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 #1192 from Antifluxfield/patch-3Blood-Asp
Fix the Generated Item Pipes
2017-09-03Merge pull request #1191 from Antifluxfield/patch-2Blood-Asp
Fix the Tooltip of Pumps
2017-09-03Merge pull request #1174 from Dimach/unstable-3Blood-Asp
Added new function to GT scanner
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-21Use "/n " as seperatorAntifluxfield
2017-08-21Fixed Large Chemical Reactor GUI, was wrongly using default beforeJohannes Gäßler
2017-08-21Fixed LCM desulfurization recipes in combination with CirChemUpdateFUJohannes Gäßler
2017-08-21Multi-line tooltip of #1193Antifluxfield
2017-08-21Improve tooltipAntifluxfield
Now the metaitems can automatically seperate its tooltip to multiple lines with "////".
2017-08-20Fixed desulfuriation recipes colliding with hydro-cracking recipesJohannes Gäßler
2017-08-19Fixed Titaniumtetrachloride temperatureJohannes Gäßler
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-19Reduced the cost of Fluid CannersJohannes Gäßler
Circuits: 2 -> 1 Pumps: 2 -> 1 Glass: 2 -> 4
2017-08-19Fixed Steam Macerators using constant EUt, recipe timeJohannes Gäßler
2017-08-19Adding tooltipAntifluxfield
2017-08-19Fix inconsistent worldgenTechlone
2017-08-17Fix use of RedstoneAlloy resulting in broken recipeMuramasa-
2017-08-17Update GT_Cover_FluidRegulator.javaAntifluxfield
Improve the screwdriver-rightclick behavior.
2017-08-16Fix the Generated Item PipesAntifluxfield
Correct the factor.
2017-08-16Fix Tooltip of PumpAntifluxfield
Add the missing bracket
2017-08-12Pump tooltipsMuramasa-
2017-08-11Show dim id with scannerMuramasa-
2017-08-11implements #1061Muramasa-
2017-08-11Some tooltip info #1183Muramasa-
2017-08-11maybe correct #1137Muramasa-
2017-08-11Merge pull request #1172 from JohannesGaessler/MoreItemPipeMaterialsBlood-Asp
More Item Pipe Materials
2017-08-11Merge pull request #1171 from JohannesGaessler/PyrolyzeOvenCoilScalingBlood-Asp
Pyrolyse oven coil scaling
2017-08-11Merge pull request #1176 from Dimach/unstable-4Blood-Asp
Added new info to batbuffer nuclear control panel and fixed bug
2017-08-11Merge pull request #1162 from JohannesGaessler/CrackingBalanceFollowupBlood-Asp
Cracking Balance Followup
2017-08-11Merge pull request #1159 from JohannesGaessler/AshRebalanceBlood-Asp
Ash rebalance
2017-08-11Merge pull request #1158 from JohannesGaessler/StoneDustRebalanceBlood-Asp
Stone Dust Rebalance
2017-08-11Merge pull request #1157 from Dimach/unstable-1Blood-Asp
Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
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 #1149 from joakibj/fix-orebasalticmineralsandBlood-Asp
Fix oreBasalticMineralSand properly being mapped to "ore" prefix
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-07Made the tooltips for Multiblock Hatches more descriptive.Johannes Gäßler
2017-08-07Fixed a bug where the Nugget amount did not scale with the configJohannes Gäßler
2017-08-07Reverted the Galena formula: PbS -> Pb3Ag3S2Johannes Gäßler
2017-08-07Reverted the change that gated Plastic at MV. It's available at LV againJohannes Gäßler
2017-08-07Replaced Tin with Wrought Iron as Item Pipe MaterialJohannes Gäßler
2017-08-06Fluid can now also be locked via cells, added a chat messageJohannes Gäßler