aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2016-06-12Make processing array use all input stacksLogan Perkins
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-25Rearranged two achievements. Fixes #478Muramasa
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-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-29Fix Butput Bus :PBlood-Asp
2016-04-28Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into ↵MauveCloud
experimental
2016-04-28Improved brittle charcoal handling.MauveCloud
2016-04-27Improved output bus handlingMauveCloud
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-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-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-11Update ProcessingPipeMedium.javaAlkalus
Apparently it has a newline at the end.
2016-04-11Update ProcessingPipeSmall.javaAlkalus
Apparently it has a newline at the end.
2016-04-11Update ProcessingPipeLarge.javaAlkalus
Apparently it has a newline at the end.
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-11Merge branch 'UpToDateGTPRBranch' of ↵Draknyte1
https://github.com/draknyte1/GT5-Unofficial into UpToDateGTPRBranch
2016-04-11Should fix any issues.Draknyte1
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. :)
2016-04-10Changed a few things to make the Soft Hammer more noticeable from the Hard ↵Draknyte1
Hammer. Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407 # Conflicts: # src/main/java/gregtech/api/enums/OrePrefixes.java # src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java # src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
2016-04-04Re Fix #472 #219Léa Gris
2016-04-04Fix #472 #219Léa Gris
2016-04-02made EV charger recipe oredictBlood-Asp
2016-03-28advminer2Blood-Asp
2016-03-28small fixes to distillation tower and advMiner2Blood-Asp
2016-03-27Show all ingot fluid extractions and all iron/copper arc furnace recipesBlood-Asp
2016-03-27Stop disassembler destroying not electric GT toolsBlood-Asp
2016-03-27Rebalance oil processing and improve pipe coveringBlood-Asp