aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-14Correct offset.Technus
2017-09-14Neat feature...Technus
2017-09-14Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental # Conflicts: # src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
2017-09-14Optimize wire codeTechnus
2017-09-14Moving average wire fixTechnus
2017-09-14Update GT_MetaPipeEntity_Cable.javaDaniel
2017-09-14Another wire fix...Technus
2017-09-13Another cable fix attemptTechnus
2017-09-13more descriptive argument nameTechnus
2017-09-13Optimize a bitTechnus
2017-09-13Add more uo methods for reading easily, make consumption scaleableTechnus
Makes the code more A ok
2017-09-13Minor change, can catch potential errors when the extraction val per tick is ↵Technus
insane
2017-09-13change oremix again to have more GalenaDream-Master
2017-09-13Now Galena Mix have more silver in it.Dream-Master
2017-09-13tool tip fixesDream-Master
2017-09-13Revert "cherry pick"Dream-Master
This reverts commit 493cce8427b46fd27c77e822297491acb9b42fe6.
2017-09-13Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-09-13Add debug cableTechnus
2017-09-13Fix oil drill recipesDream-Master
https://github.com/Blood-Asp/GT5-Unofficial/commit/0d0d8270ee2771164173ac56e58a79145c2271df
2017-09-13ids all ready occupied 3rd tryDream-Master
2017-09-13ids all ready occupied second tryDream-Master
2017-09-13ids all ready occupiedDream-Master
2017-09-12bump vresionDream-Master
2017-09-12cherry pickDream-Master
51a4389f7c78fd5581d3844e2b57c2bf8f45f0ed Hard remove ores that might be exploitable by MRF laser drill
2017-09-12Enable Ores in Marble and Basalt too. Update a few filesDream-Master
2017-09-12cherry pickDream-Master
c2fa20a2ce23bc6a0f1779c04599bffb14a46c84 Rebalance Nitric Acid production cost vs usage
2017-09-12cherry pickDream-Master
36eecf6196e419a1ff6c18fb82a41f952d5e538d Rebalance charcoal byproduct destillation
2017-09-12cherry pickDream-Master
3f74245a5b7a7da7b713d21477bf269a5f6d0a30 Can‘t get achievement #1208 https://github.com/Blood-Asp/GT5-Unofficial/issues/1208
2017-09-12cherry pickDream-Master
d61f8ed6f193ec32a9914ce76cd8ac903fe57476 Crash with Gregtech 5.0.9.31pre4 without forestry installed. #1201 https://github.com/Blood-Asp/GT5-Unofficial/issues/1201
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
dae15665ccb54a0a8d6a76ffcc7d48eae0abec15 Odp speed improving #1209 https://github.com/Blood-Asp/GT5-Unofficial/pull/1209
2017-09-12cherry pickDream-Master
ded594c86c701a0ff1f2282b4d6bff9cc7b1b9f6 c6d39f12fdf85edbeadc725e0b398fa70eb15bd0 Patched ME energy tunnel, now they can emit GT energy. #1200 https://github.com/Blood-Asp/GT5-Unofficial/pull/1200
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-12cherry pickDream-Master
61d058201244d9dd6f19ed72c863722b7da0ad14 bab71c5349799ba77ac42f80c54725a999fab40c Fix #1206 #1210 Fix NPE of fluid check. https://github.com/Blood-Asp/GT5-Unofficial/pull/1210
2017-09-12Merge pull request #33 from MineAnPlay/patch-1Martin Robertz
Change back to old Rotor Solder Materials #1951
2017-09-12Change back to old Rotor Solder Materials #1951MineAnPlay
From multiples of 18 to multiples of 16 because obtaining multiples of 16 is easier.
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-11revertDream-Master
2017-09-11bump versionDream-Master
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-10fixed wildcard value in GravisuitDream-Master
2017-09-10[1.5.1.2] Advanced Nanochestplate/Jetpack recepies #1938Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1938
2017-09-10[1.5.1.2] Double recipe from wooden slab #1928Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1928
2017-09-09bump versionDream-Master
2017-09-08fix derpDream-Master