aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
AgeCommit message (Collapse)Author
2017-06-01Merge branch 'unstable' into ChemistryUpdateJohannesGaessler
2017-05-31Fix comb processing recipes #1052Blood-Asp
2017-05-31Fix multiblock recipe search fix #1044Blood-Asp
2017-05-31Fix spelling #1043Blood-Asp
2017-05-31fix #1041Blood-Asp
2017-05-31Make Internal wireless redstone work as machine controllerBlood-Asp
2017-05-31Add recipe for very heavy oilBlood-Asp
2017-05-31Added recipes for oil desulfurization with Fluids and Cells swapped.Johannes Gäßler
2017-05-31Change Automaintain defaultBlood-Asp
2017-05-31Merge pull request #1051 from JohannesGaessler/unstableBlood-Asp
[5.09.29] EBF recipe fix followup
2017-05-31Merge pull request #1058 from Georggi/patch-4Blood-Asp
Auto Maintenance Hatch tweaks
2017-05-31Merge pull request #1060 from JohannesGaessler/MaterialFormulaFixBlood-Asp
Material formula fix
2017-05-31Merge pull request #1067 from antifluxfield/unstableBlood-Asp
Wrong behavior of Player Detector
2017-05-31Disable switching armor gui because of broken syncBlood-Asp
2017-05-31Catch broken items on recipe moveBlood-Asp
2017-05-31Catch login armor crashBlood-Asp
2017-05-30Fixed a bug where the Chemical Reactor still only had one output slot inJohannes Gäßler
it's machine inventory, causing the second output to be voided.
2017-05-30Fixed a bug where the LCM could have a mMaxProgressTime of zero.Johannes Gäßler
2017-05-27Update GT_Cover_PlayerDetector.javaantifluxfield
2017-05-27Update GT_Cover_PlayerDetector.javaantifluxfield
2017-05-25Fixed stocheometrically incorrect Chloroform recipe.Johannes Gäßler
2017-05-18Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-05-18Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-05-16I guess I wanted to put it here for some reasonYuriy Shnitkovskiy
2017-05-16Added config for automationYuriy Shnitkovskiy
2017-05-16Auto Maintenance Hatch tweaksYura
Fixed #958 and #1053, allowed robots\pipes to interact with it.
2017-05-16Moved the Biomass -> Ethanol recipes to the simplified chemical recipes.Johannes Gäßler
2017-05-14Bugfix: I had accidentally copied the IC2 Biogas recipes instead ofJohannes Gäßler
moving them.
2017-05-14Moved old IC2 Biogas recipes to the simplified recipes.Johannes Gäßler
2017-05-13Merge branch 'LargeChemicalReactor' into ChemistryUpdateJohannes Gäßler
2017-05-13Corrected several chlorination recipes in terms of stoichiometricsJohannes Gäßler
2017-05-13Changed the Layout of the LCM to 3x3x3, tweaked the name of casings andJohannes Gäßler
the descriptions of multiblocks to make them consistent.
2017-05-13Fixed a bug that caused there to be two identical recipes for TiF4Johannes Gäßler
2017-05-13Added a new recipe map for the LCR, expanded the API to allow for customJohannes Gäßler
NEI stack positioning. Refactored the name of the Large Boiler Fake Fuels so they're in line with other names. Fixed a bug where the LCM was checking for the wrong casing type.
2017-05-12Added crafting recipes for the LCHJohannes Gäßler
2017-05-12Merge branch 'ChemistryUpdate' into LargeChemicalReactorJohannes Gäßler
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-10Changed multiblocks so they all consider all inputs for finding recipesJohannes Gäßler
2017-05-09Added new textures for the LCM, using them nowJohannes Gäßler
2017-05-09Implemented checkRecipeJohannes Gäßler
2017-05-08Reverted an erroneous name change for nitration mixtureJohannes Gäßler
2017-05-08Deleted prints used for debuggingJohannes Gäßler
2017-05-08Implemented checkMachine for the LCR, added machine casingsJohannes Gäßler
2017-05-07Created a non-functional first draft for the Large chemical ReactorJohannes Gäßler
2017-05-07Reverted erroneous previous commit.Johannes Gäßler
2017-05-06Created a first draft for the Large Chemical ReactorJohannes Gäßler
2017-05-06Fixed the Electric Blast Furnace not recognizing recipes when there isJohannes Gäßler
more than one Fluid input. Also added a String representation for GT_FluidStack that was used for debugging.
2017-05-04Small tweak to Rocket Fuel to ensure that production cost > burn valueJohannes Gäßler
2017-05-04Added a graphic for acids, made the javadoc more descriptiveJohannes Gäßler
2017-05-03Added an svg for misc chemical recipes, tweaked several recipesJohannes Gäßler
2017-05-03Added distillation recipe for Phenol, tweaked the graphic for plasticsJohannes Gäßler