aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
AgeCommit message (Collapse)Author
2017-09-13Add more uo methods for reading easily, make consumption scaleableTechnus
Makes the code more A ok
2017-09-13Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-09-13Add debug cableTechnus
2017-09-12cherry pickDream-Master
bd305c45b038819de2a0e61166da7344dbc770c7 69d557908f447be138102676309e48e5f95b32b9 Fix localization of Item Distributor #1211 https://github.com/Blood-Asp/GT5-Unofficial/pull/1211
2017-09-12cherry pickDream-Master
11213d18d7345ee29f2efce6c5d421a855bed056 fb163d1be0aa291508bb6513e34cacba3ca06b36 fb508132d91543d5e837dfa4fac09cf5e4b9e7a8 d682ca0d36e3824b1bf73cc800f58c4126bcf104 0f2db4f76a88c26ca08b2da444b264444ce01316 50229e4506687d184c93ed702cdeeecea65e326a f5195f822d9951015c4ef6599e5b4f6544ec0714 fbdb6ceecf60183ab382f043b78b61941157eccf 55af1972b86a82bf6038342aa1a3bf9013d0f164 c0d9d5a268da4b58385ee95e27408e06829c74b8 416890142c0fa62617fc6e4537826689635e9eb3 d532cb67f7bc68243e3d2dc2a12a466ed9c9e2d9 d1671eaf33b3b4223da174e115f35b9bc1f19c5a 4d90afad87375e3f1013a493f4b3b5d4e92bf521 3c397d61697c13f0467e0cb67fb127fff8401f71 64957ccd0f51ef283cc561d52a5439c3752c4e71 b7e0863207253ee758742a22c607c3ccc37af6d3 ae5a1e117d47876de9d2d2e8ea581e15686c5e1a a0eb30d03f8fc311598f628ad45b5365c7391917 505a9c263e88e5519bade6a3167f829e41e13e64 9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2 Drillers upgrade #1163 https://github.com/Blood-Asp/GT5-Unofficial/pull/1163
2017-09-12Next attempt on wires.Technus
2017-09-12Revert "Implement tick counter?"Technus
This reverts commit 0d9d2040bc43f4e18d227b3c51a3edc4f9994747.
2017-09-12Revert "Minor optimization of tick counter"Technus
This reverts commit 9caaa58ea11b6477eaabdd509a554e90f60bc2ac.
2017-09-11Minor optimization of tick counterTechnus
2017-09-11Implement tick counter?Technus
2017-09-11Revert "Revert "Add tickDiff for tick diff detection using totalWorldTime, ↵Technus
should prevent spontaneous wire combustion"" This reverts commit 77cc90a0c9892c6ebf61c403ea4ba071f3ffaea7.
2017-09-11Revert "Add tickDiff for tick diff detection using totalWorldTime, should ↵Technus
prevent spontaneous wire combustion" This reverts commit 3587d3942fb5e5de5821e8207c96a93a7babc31a.
2017-09-04cherry pickDream-Master
820b335d831f60e1936c462d0cb8e7dba3c13fae 733d77481757b6b1619408ea6f4766f770b45419 e2017c72c30c4eac9fff231482da660b7eccd370 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 612cece6299ed698146d041d1277b52fa6e65df1 820b335d831f60e1936c462d0cb8e7dba3c13fae Add new zpm and uv battery #1147
2017-09-04cherry pickDream-Master
78e03914a34fee288f23fdd4bd8ec9600e16e502 d5b0dcfa505e0cb5b6143633730bf5d1dc476e79 f6482e63ae4d4415c2e894118729d4aacb499c13 eb749f64cac9db103d4c61002d8f663e23b3f435 Multi-lines tooltip support #1199
2017-08-31Methanol recipies missing carbon monoxide #1907Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1907
2017-08-29Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-08-29Set proper EBF temps.Technus
2017-08-29fix https://github.com/GTNewHorizons/GT5-Unofficial/issues/28Dream-Master
2017-08-29Add auto output to output busses, and limit the speed to once every 8 ticks ↵Technus
on both fluid and item outputs.
2017-08-27Move the setting out of the temperature to new methodTechnus
Materials disableAutoGeneratedBlastFurnaceRecipes() -> return "this" with disabled auto gen on EBF recipes
2017-08-27add fieldTechnus
2017-08-26cherry pickJohannes Gäßler
Commit: 0189b933e35476bc65bfda0201db657b9689bec1 [0189b93] Revised Hydrochloric Acid recycling, Salt electrolyzation cost Hydrochloric Acid can be recycled at 100% efficiency. The production of Dimethylhydrazine, Tetrafluoroethylene, Polydimethylsiloxane, and Hypochlorous Acid yields Diluted Hydrochloric Acid, which can be recycled at 50% efficiency. The energy cost of 21600 EU per 2 Salt -> Sodium + Chlorine has turned out to be too high. The cost is now 9600 EU.
2017-08-26cherry pick part 1Johannes Gäßler
Commit: 01da9150f662d010db07f8729f5ec696a4f935fd [01da915] Added missing Tetraitromethane, Polymerization recipes
2017-08-25Add tickDiff for tick diff detection using totalWorldTime, should prevent ↵Technus
spontaneous wire combustion
2017-08-20cherry pickJohannes Gäßler
Commit: 1afc8405e8005433903afdf8a3cdcc82d3f05c9a [1afc840] Added multi-step recipes for the Large Chemical Reactor Added recipes for the Large Chemical Reactor that perform several steps of a processing line in a single recipe. Added new method for Chemical rector not using a clenroom
2017-08-19Restore api for assemblerTechnus
2017-08-18Null checkTechnus
2017-08-18Fix string nbt string issueTechnus
2017-08-15Change the cleanroom option to work with 6 inputs tooDream-Master
2017-08-15Fix string localization.Technus
2017-08-13Revert "Getting rubber out of cabel you produced with pvc etc #1804"Dream-Master
This reverts commit 8d048d142ad79878155af71cf68d8e231877702e.
2017-08-13fix derpDream-Master
2017-08-13cherry pickJohannes Gäßler
Commit: a184258c98049a713eca0cf4dcac9f69c41ad5b4 [a184258] Reverted the changes to basic machine processing. Basic Machines no longer automatically add an integrated circuit to their input.
2017-08-13Adding the UHPIC waferDream-Master
2017-08-13Add UHPIC chip for Transformers >uvDream-Master
2017-08-12Make blood compatibleTechnus
2017-08-12Fix NPE, GREG why u no crash game!Technus
2017-08-12Show dim id in scannerDaniel
2017-08-12cherry pickDream-Master
Commit: 2c50b0a82583aa90ded647fa61f2cc0f278ff4d2 [2c50b0a] Merge pull request #1157 from Dimach/unstable-1 Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
2017-08-11Getting rubber out of cabel you produced with pvc etc #1804Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1804
2017-08-09Add new Mold and shape forms for small Gear and Turbine BladesDream-Master
2017-08-08Crafting suggestion #1807Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1807
2017-08-08Output hatch in EBF still dupes fluid #1797Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1797
2017-08-07cherry pickJohannes Gäßler
Commit: c2ededaf5ad11bb69ffd7b7acf8f364b0e10dd85 [c2ededa] Made the tooltips for Multiblock Hatches more descriptive.
2017-08-06Fluid can now also be locked via cells, added a chat messageJohannes Gäßler
2017-08-06Implemented NBT for the Locked FluidJohannes Gäßler
2017-08-06cherry pickJohannes Gäßler
Commit: cbcb04d11717c2884d9565404997d123f3efd85e [cbcb04d] Currently not working as intended
2017-08-05Just in case the number goes negativeJohannes Gäßler
2017-08-04Update commentaryDaniel
2017-08-04Fix rare case of texture not updating when:Technus
Changing texture from page x to page 0 without changing the texture id