aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
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-25Rearranged two achievements. Fixes #478Muramasa
2016-05-25Adding the New Turbines from Gt 5.09 and some Assembler recipeDream-Master
2016-05-25More fixes for #507Muramasa
2016-05-24Fixes #507Muramasa
2016-05-24Fixes #501Muramasa
2016-05-24Crash FixMuramasa
2016-05-24Redone Tooltips and some scanner infoMuramasa
2016-05-23DerpMuramasa
2016-05-23Cleanup + ImprovementMuramasa
2016-05-22Ethanol fixDream-Master
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-20My client likes to uncheck filesMuramasa
2016-05-20Basically a rewriteMuramasa
2016-05-18Added configuration file to enabling processing of oresOneEyeMaker
2016-05-12Added missing assembler recipes for casingsMauveCloud
Added missing assembler recipes for casings: Basic Machine Casing, UV Machine Casing, Heat Proof Machine Casing, Cupronickel Coil Block, Kanthal Coil Block, Nichrome Coil Block, Superconducting Coil Block, Solid Steel Machine Casing, Frost Proof Machine Casing, Robust Tungstensteel Casing, Clean Stainless Steel Casing, Stable Titanium Casing, Fusion Casing, Turbine Casing, Stainless Steel Turbine Casing, Titanium Turbine Casing, Tungstensteel Turbine Casing
2016-04-30Change Neutronium Material and add Droconium EFB recipes.Dream-Master
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
2016-04-28Improved brittle charcoal handling.MauveCloud
2016-04-28Require Titanium Pipe CasingMuramasa
2016-04-28More FixesMuramasa
TODO: Require Dynamo back centered (Currently anywhere) Require Muffler top centered (Currently anywhere) Implement output calculation Implement coolant requirement (Water or IC2Coolant?) Possible add different tiers of diesel generator?
2016-04-28More Cleanup and finalizingMuramasa
2016-04-27Improved output bus handlingMauveCloud
2016-04-28Main Commit for Large Diesel GeneratorMuramasa
2016-04-27Merge pull request #493 from Muramasa-/TurbineCasingRebalanceBlood-Asp
Turbine casing rebalance
2016-04-26Added Crop Calculator support.MauveCloud
2016-04-19Missed a fileMuramasa
2016-04-19Remove Diesel TurbineMuramasa
2016-04-19Main CommitMuramasa
2016-04-19Update GT_MetaGenerated_Item_01.javaTechnus
2016-04-19Update GT_MetaGenerated_Item_01.javaTechnus
2016-04-19Changed Motor recipes.Technus
2016-04-18Adding GT:NH CapesTechnus
2016-04-18Adding GT:NH CapesTechnus
2016-04-18fix #466Dream-Master
Machines higher than IV have a recipe conflict
2016-04-17fix #565Dream-Master
Change Motors to have max 4 cable instead of 16
2016-04-17Adding Multismelter paraller count info to scanner,Technus
Adding EBF Heat Capacity to scanner, reformatting rest of scanner msgs to be unified
2016-04-17Revert "Turbine Rebalance"Muramasa
This reverts commit ddc0c4299e8d3c703b6b93f876ce38f961d08236.