aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2016-06-21Merge pull request #534 from Muramasa-/DieselGeneratorBlood-Asp
Bug Fixes
2016-06-21Fix fced86e11af35318bf3ef4129dd5a6584ad079e0 hiding almost all metaitemsBlood-Asp
2016-06-21reverse commitDream-Master
2016-06-21even with Blood asp experimental branchDream-Master
2016-06-21remove allDream-Master
2016-06-21Bug fixes for my commitsMuramasa
Removed commented out old turbine texture code Fixed Diesel Engine "Fuel Value" unit to EU/L Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes. Forgot to add recipe for Engine Intake. Redone the Gas/HPSteam turbine recipes. Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but not enough for the engine to run Updated Engine GUI
2016-06-19Update GT_MetaTileEntity_ProcessingArray.javaLogan Perkins
2016-06-20Corrected Wood Plates burn valueBlood-Asp
2016-06-20Fix infinite miningpipes exploit from advanced miner 2Blood-Asp
2016-06-20Fix wrong energy values for comp and crop processingBlood-Asp
2016-06-19Plunger also emptys input tank after output tank is emptyBlood-Asp
2016-06-19Make distillation tower work with different fluids in input hatchesBlood-Asp
2016-06-19Fixed Entchanted Books in magic absorberBlood-Asp
2016-06-19Fixed Magic Energy Absorber efficiency calculationBlood-Asp
2016-06-19Added missing machines to processing arrayBlood-Asp
2016-06-19Changed Bittle charcoal tool back to axeBlood-Asp
2016-06-19EnderIO Wrench SupportBlood-Asp
2016-06-19Blacklist Unstable Ingots from unificationBlood-Asp
2016-06-19Merge pull request #500 from Muramasa-/DieselGeneratorBlood-Asp
Large Diesel Generator
2016-06-19Fix #469 #508Techlone
2016-06-12Final commitMuramasa
2016-06-12Make processing array use all input stacksLogan Perkins
2016-06-01Possibly final commitMuramasa
2016-05-30Minor FixTechnus
Actually makes the smelt at once cap bigger.
2016-05-27Merge pull request #518 from Muramasa-/TweaksAndFixesBlood-Asp
Crash Fix / Various Tweaks
2016-05-27Merge pull request #515 from OneEyeMaker/OreProcessingBlood-Asp
Added configuration file, that enables processing of ores
2016-05-27Merge pull request #511 from MauveCloud/experimentalBlood-Asp
Added missing assembler recipes for casings
2016-05-26Fixed incomplete redo of brittle charcoal adventure fixMauveCloud
(had reverted after improper testing with axe instead of shovel, then neglected to check rebuilding with gradle after re-implementing fix in source)
2016-05-26Reinforced Block and Brittle Charcoal fixesMauveCloud
Added fixes for #503 and #436
2016-05-26isPlasmaCellUsed additional null checkMuramasa
2016-05-26Fixes #268. Shows plasma cells that have a fusion recipeMuramasa
2016-05-26wrongly remove CodeDream-Master
2016-05-25fixDream-Master
2016-05-25Adding Assembly Line (no Assembler Casing recipe yet)Dream-Master
2016-05-25Adding the New Turbines from Gt 5.09 and some Assembler recipeDream-Master
2016-05-25More fixes for #507Muramasa
2016-05-24Crash FixMuramasa
2016-05-24Redone Tooltips and some scanner infoMuramasa
2016-05-23DerpMuramasa
2016-05-23Cleanup + ImprovementMuramasa
2016-05-22Change Fuel and Nitro diesel valuesDream-Master
change Burn value of Lignite coal 4x Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
2016-05-22Thaumcraft Aspect fixDream-Master
2016-05-22fixDream-Master
2016-05-22Merge branch 'Scan-termals-of-EBF'Dream-Master
Conflicts: build.properties src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2016-05-22Fix #591Dream-Master
Added EBf recipes for Ender io Materials with oxy and without
2016-05-20Basically a rewriteMuramasa
2016-05-18Added configuration file to enabling processing of oresOneEyeMaker
2016-04-29Fix Butput Bus :PBlood-Asp
2016-04-29Implemented Output CalculationMuramasa
2016-04-28Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into ↵MauveCloud
experimental