aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
AgeCommit message (Collapse)Author
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
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-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-25Add tickDiff for tick diff detection using totalWorldTime, should prevent ↵Technus
spontaneous wire combustion
2017-08-18Null checkTechnus
2017-08-18Fix string nbt string issueTechnus
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-12Make blood compatibleTechnus
2017-08-12Fix NPE, GREG why u no crash game!Technus
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
2017-08-03Fix one missing spot in deprecated api.Technus
(for texture change use that is)
2017-08-03Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-08-03Rework texturing again.Technus
2017-08-03Made it so that Multiblocks will look for empty Output HatchesJohannes Gäßler
2017-08-02Merge branch 'experimental' into circuit-changes-2.0Dream-Master
2017-08-02Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-08-02Expand to add proper texture paging support.Technus
2017-08-01cherry pickDream-Master
Commit: 4bfbdcdb1dea4d4e4786e351b591096fb7646351 [4bfbdcd] Made it so that if two inputs are equal an Integr. Circuit (0) is added
2017-08-01cherry pickDream-Master
Commit: ecf7b4aa504315528810f3a66867788810b00ab0 [ecf7b4a] Empty slots are only used as IntCirc(0) if no other IntCirc is in input
2017-08-01Made it so that empty slots are treated as Integ. Circ. with config 0Johannes Gäßler
2017-07-30Merge branch 'experimental' into experimental-testDream-Master
2017-07-30Texture overhaul,Technus
allows for more textures to be added for casing, with extra byte of data for paging. Just change the value of mTexturePage at the same time you change mMachineBlock.
2017-07-28Revert "Texture overhaul,"Technus
This reverts commit 3274784db6f35e858ee408e1e35aac3a2afe1213.
2017-07-28Texture overhaul,Technus
allows for more textures to be added for casing, with extra byte of data for paging. Just change the value of mTexturePage at the same time you change mMachineBlock.
2017-07-24cherry pickDream-Master
https://github.com/Blood-Asp/GT5-Unofficial/pull/1170 4995bc3a4e9a60987d121a09a91e856a9d97be82 beaa54eb4153e11935f6107d53272c88453e3e3d 8fa91db261def5087ff4dcf25de899de36457a98 f95d89a5e6b1ab6b3e7fab5e56f9b51e21ae78e3 f816fbbd97e8440b346e73f266ec4c452d518e77 a687bcd24ee1ff97ad6d86f84f1748e1cd0129a4 306160fb69b41376644d793803c67b85bc125af3 480f2f1413989cd155fa19310d5b6f8871c8ce6e a0c6ec45daf3203b32f0d31baef93217eb2feaf0
2017-07-21Add a low grav and a clenroom recipe option to gt. Add a option to add botheDream-Master
2017-07-19add 6 slots to the mixerDream-Master
2017-07-07cherry pickDream-Master
a6046ddfad81dca9b1c63d5f171b9ccd137f7288 5d8bcb0af35e57da789fc6b2126cb6931c092c4a 7d074d985f1f24a12354ed1d605eba92620bbc03 Fixed inventory misalignment when updating 5.09.30 -> 5.09.31 #1135
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-06-17Optimize importsTechnus
2017-06-17Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/enums/ItemList.java # src/main/java/gregtech/api/enums/Textures.java # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant1.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant4.java # src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java # src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-17Merge pull request #1074 from Techlone/advminer2_improvementsBlood-Asp
AdvMiner2 renamed; new tiers of OreDrillingPlant
2017-06-17Changes reverting part1Technus
2017-06-16Things cleanupTechnus
2017-06-16Merge branch 'unstable_BLOOD' into reMergeTechnus
# Conflicts: # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
generated by cgit (git 2.46.0) at 2025-03-06 21:44:22 +0000