aboutsummaryrefslogtreecommitdiff
path: root/src/main
AgeCommit message (Collapse)Author
2017-06-01Fix comb processing recipes #1052Blood-Asp
2017-06-01fix #1041Blood-Asp
2017-06-01Make multiblocks consider all fluid inputsJohannes Gäßler
2017-06-01Removed debugging prints accidentally left in the previous commitJohannes Gäßler
2017-06-01Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-06-01Update GT_Cover_PlayerDetector.javaantifluxfield
2017-06-01Update GT_Cover_PlayerDetector.javaantifluxfield
2017-06-01Disable switching armor gui because of broken syncBlood-Asp
2017-06-01Catch broken items on recipe moveBlood-Asp
2017-06-01Catch login armor crashBlood-Asp
2017-06-01Make internal RS reciever work as machine controller coverBlood-Asp
2017-05-31cherry pickDream-Master
3c45c2accb08c37016ccd3f3217c09d18beb3326
2017-05-30cherry PickJohannes Gäßler
038e51535b9138ac06c4f3df80b67da755e7914b
2017-05-30Fixed a bug where the LCM could have a mMaxProgressTime of zero.Johannes Gäßler
2017-05-30Minor cleanupTechnus
2017-05-29Make the error more descriptiveTechnus
2017-05-29Enable ALL components if dreamcraft loadedTechnus
2017-05-29Reduce casing requirementTechnus
2017-05-29Change recipe a bit.Technus
2017-05-29Rework Heat Exchanger for 10x boostTechnus
2017-05-28removed it from gt code and pack it in the core mod.Dream-Master
2017-05-28https://github.com/GTNewHorizons/NewHorizons/issues/1155Dream-Master
Railcraft recipes to GT Code #1155
2017-05-28Add Blaze BlockDream-Master
2017-05-28fixed derpsDream-Master
2017-05-28removed empty shape plateDream-Master
2017-05-28added new molds for Stick, round, long stick, ring, bolt, screwDream-Master
2017-05-28If logWood it is ok.Technus
2017-05-28Change print methodTechnus
2017-05-28Add debug codeTechnus
2017-05-28Add Meta ID check to charcoal pile igniterTechnus
2017-05-28Enable Natura Wood for Pile IgniterDream-Master
2017-05-26remove more iconsDream-Master
2017-05-26pumps now have the right item icons (Luv-UV)Dream-Master
removed unused icons
2017-05-25e304e8f9deca16ce05e48c64f7ec8b88a79d6189Dream-Master
Fixed stocheometrically incorrect Chloroform recipe.
2017-05-24change Bronze Multi Boiler recipe backDream-Master
remove Heat Vent recipe and put it in the Core Mod
2017-05-22Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial ↵Technus
into mergeGTNH
2017-05-22fix typoTechnus
2017-05-22fixed recipe derp in the chemical reactorDream-Master
Add rutile to the Polymerizations recipes Super Conducter Wire have to be lossless
2017-05-22some fixesDream-Master
2017-05-21Revert "chemical reactor test"Dream-Master
This reverts commit 614c29ef4659f0e885e3894d98f51d121ad3348d.
2017-05-21chemical reactor testDream-Master
2017-05-20Fixed MaterialStack String representations sometimes missing bracketsJohannes Gäßler
2017-05-20MetalMixture need EV(Titan Level)Dream-Master
2017-05-20Fixed Salt Water and Distillery circuit settings 1Dream-Master
Add Tube Wire Item for automate Tubes
2017-05-20not workingDream-Master
2017-05-20change circuits to settings 5 to get EthylenDream-Master
change titanium to rutile
2017-05-20derp fixDream-Master
2017-05-20change pipe meta item idDream-Master
2017-05-20Merge branch 'ChemistryUpdate' into mergeGTNHJohannes Gäßler
Conflicts: src/main/java/gregtech/GT_Mod.java src/main/java/gregtech/api/enums/ItemList.java src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java src/main/java/gregtech/api/util/GT_Recipe.java src/main/java/gregtech/common/GT_Proxy.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/blocks/GT_Block_Casings2.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-18Make the save/load the same as in bloodaspTechnus