aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-06-14cherry pickDraknyte1
d1eea59fe744c1b5b2c5dae324b6887f985a6569 Made the Cleanroom optional. This disables the Low Grav option if the Cleanroom is disabled.
2017-06-14cherry pickBlood-Asp
96b1cb31ced61270a1289da6da4cdd99f75eeb3a improve cleanroom tooltip
2017-06-14make reinforced blocks prevent monsterspawnsBlood-Asp
2017-06-14Merge branch 'Oil-Refinery-update' into experimentalDream-Master
2017-06-14Revert "Quick fixes"Dream-Master
This reverts commit 4a08587c07dd9c0f2a6bc783d7e8108a85438fd6.
2017-06-14cherry pickDream-Master
1b753d3528c7a149c23838eb3c4ce0d8f55036a6 Reworking DataOrb and DataStick
2017-06-14cherry pickTechlone
156bb2b06b942f35efa6719c856a9911b1f9f62e Tooltips changing
2017-06-11Quick fixesBlood-Asp
2017-06-11Quick fixesBlood-Asp
2017-06-09cherry pickJohannes Gäßler
74c41614a5e8a6cb49e62a225669a1e1d07bc87b
2017-06-06Oil Cracking Update from Johannes GaesslerDream-Master
2017-06-06cherry pick: from TechloneDream-Master
7cb51ae461815bfd767aa0bf64f8ff075de5624d c5402ee38998cc086ceb36fbce6c54aba6d9d79c 7c48590a49242bb26eddafa26d2cd7b4ce3546d8 75a33be210cda273ef9e6cc9cbbf739dd913907e b187410005771f1762f3bb5c94c0c5cd26dd06db
2017-06-05fix typoDream-Master
Pyrolyse oven quest consumes pieces #1455 https://github.com/GTNewHorizons/NewHorizons/issues/1455
2017-06-05cherry pickDream-Master
e42ddd911a60fd58e1c5908b2206ad6afc1a9f96
2017-06-05Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5Johannes Gäßler
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
2017-06-04Monocrystalline Silicon BouleBlood-Asp
2017-06-04Cleanroom outputs in redstone its cleannes/efficiency.Blood-Asp
2017-06-03Fix Pollution bugBlood-Asp
2017-06-02Make Casings and reinforced blocks transfer redstone signalsBlood-Asp
cherry pick : b0049786b7d31efed3a54995d917335f0f8061c9
2017-06-01Fix comb processing recipes #1052Blood-Asp
2017-06-01Make multiblocks consider all fluid inputsJohannes 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 login armor crashBlood-Asp
2017-06-01Make internal RS reciever work as machine controller coverBlood-Asp
2017-05-30Fixed a bug where the LCM could have a mMaxProgressTime of zero.Johannes Gäßler
2017-05-29Make the error more descriptiveTechnus
2017-05-29Reduce casing requirementTechnus
2017-05-29Rework Heat Exchanger for 10x boostTechnus
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-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 Salt Water and Distillery circuit settings 1Dream-Master
Add Tube Wire Item for automate Tubes
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-15Add low grav to proc array, - assuming that proc array is always considered ↵Technus
in a clean room, added circuit assembler to proc array
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-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-13I prefer Power output texture for it.Technus
2017-05-13that makes it look better?Technus
2017-05-13Why does one change the machine state TWICE in the same tick...Technus