aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
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
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-28Main Commit for Large Diesel GeneratorMuramasa
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-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.
2016-04-17Turbine RebalanceMuramasa
Added 3 new turbine casings to rebalance the turbines. Also changed turbine controller recipes to fit the rebalance. Large Steam: Steel Turbine Casing Large HP Steam Turbine: Stainless Steel Turbine Casing Large Gas Turbine: Steel Turbine Casing Large Diesel Turbine: Titanium Turbine Casing Large Plasma Turbine: Tungstensteel Turbine Casing
2016-04-17Fixed newMetaEntity using Plasma GeneratorMuramasa
2016-04-17Large Diesel GeneratorMuramasa
Added large diesel generator to the game. It replicates the Large Plasma Generator but it's nominal output is 1/8 that plasmas is. Plasma Nominal: Optimal Steam Flow * 40 Diesel Nominal: Optimal Steam Flow * 5
2016-04-16Merge pull request #7 from GTNewHorizons/MultiSmelter-RebalanceTechnus
Less power consumption for SUPERCONDUCTORs
2016-04-16Less power consumption for SUPERCONDUCTORsTechnus
Will use max 2input hatches
2016-04-16Update GT_MetaTileEntity_ElectricBlastFurnace.javaTechnus
2016-04-16fixDream-Master
2016-04-16Merge pull request #5 from GTNewHorizons/MultiSmelter-RebalanceMartin
Rebalance MultiSmelter to match proc. arrays
2016-04-16Update GT_Item_Casings_Abstract.javaTechnus
2016-04-16Update GT_Item_Casings1.javaTechnus
2016-04-16Initial commitTechnus
Adding superconductor coil block support with base temperature 9000.
2016-04-16Update GT_MetaTileEntity_MultiFurnace.javaTechnus
2016-04-16Update GT_MetaTileEntity_MultiFurnace.javaTechnus
2016-04-16Rebalance MultiSmelter to match proc. arraysTechnus
added tier 4 coils for whole stack smelting
2016-04-11Adding assembly line recipe checkBlood-Asp
2016-04-11Adding assembly line recipesBlood-Asp
2016-04-11CleanupBlood-Asp
2016-04-11Added Assembly Line MultiblockBlood-Asp
2016-04-11Submitting PR's is a pain.Draknyte1
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
2016-04-10Update GT_MetaGenerated_Tool_01.javaAlkalus
left a : not a ;
2016-04-10Made these up to date with latest experimental commit, as mine were slightly ↵Draknyte1
out of date. :)