aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-10-17Change the range of oil drillsAntifluxfield
2017-10-16what the heck is this?Dream-Master
2017-10-09Fix EBF tooltipTechnus
2017-10-09Add tier infoTechnus
2017-10-07cherry pickDream-Master
Commit: f5abfcefe8d77e2c3c6284bff72de25c0a0ef774 [f5abfce] The right method to find out whether the machine should break the block.
2017-10-07cherry pickAntifluxfield
0802fdbd0272c4251c4615026643c8eadcf7fe70 9d8ac82535b0099ef70e8995bca51f62f39f9f94 e725c455b3d9025caeebdbf12cc9d25f238f74bb 3db38a5c53a771aeb37a8cf2568f79c49bb38c21 aef60bbf3b6752963b51c9c4e27b6ba03f75ba8c ef41455fe59f2915c94c204b97cee19aa2ddcd3b 4372034ff4edc9e58629d63123b84c29e6e0e516 Drillers fix #1230 https://github.com/Blood-Asp/GT5-Unofficial/pull/1230
2017-10-06cherry pickDream-Master
32d4998ec6b2a9e6d8b14450748a9ae256d311a1 Fixed small bug - basic miner cant work using battery in inner slot. #1232 https://github.com/Blood-Asp/GT5-Unofficial/pull/1232/files
2017-10-06cherry pickDream-Master
c40f01930ea256adcdb858e0214deb517989b676 3f0224f55faab43cdebc19015d3132e30b9a766c Fix AssLine structure check #1226 https://github.com/Blood-Asp/GT5-Unofficial/pull/1226/files re enable Fluid Naguadah Cells
2017-10-04Powergeneration #1933Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1933
2017-10-04Move Large Chem Reactor casing texture index to GT rangeTechnus
2017-10-01Optimize imports, optimize random number generation, make turbines loose ↵Technus
0.75 or normal durability in loose fitting mode.
2017-10-01LHE, turbine, steam turbine changes.Technus
2017-09-27add Deprecated recipes @Technus can you please check if i did right. I need ↵Dream-Master
to add a new recipe in the adder because you cant use two Boolean in one recipe
2017-09-27try to fix old chemical recipes removeDream-Master
2017-09-27cherry pickDream-Master
Commit: 00831784660573b54248a8213cae1d64619a2b98 [0083178] rename Biomass again to Forestry Biomass. Change a brewing recipe a bit to can using Fluids that not registered at GT (FluidStack) Add new recipes for Forestry Biomass and remove old ones.
2017-09-15Added cleanroom debug messages. Enable debug messages in gregtech.cfgRichard Hendricks
2017-09-14lang code update cherrypickAntifluxfield
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-13tool tip fixesDream-Master
2017-09-12Enable Ores in Marble and Basalt too. Update a few filesDream-Master
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
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-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-10[1.5.1.2] Double recipe from wooden slab #1928Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1928
2017-09-08fix derpDream-Master
2017-09-081909: Fix oregen issue with empty chunks. Problem was caused by not using ↵Richard Hendricks
threadsafe techiniques on ArrayList. Also add and fix some more debug messages, including messages to show a vein being genererated in the air, and if an orevein failed to be chosen after 256 tries.
2017-09-04cherry pickDream-Master
820b335d831f60e1936c462d0cb8e7dba3c13fae 733d77481757b6b1619408ea6f4766f770b45419 e2017c72c30c4eac9fff231482da660b7eccd370 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 612cece6299ed698146d041d1277b52fa6e65df1 820b335d831f60e1936c462d0cb8e7dba3c13fae Add new zpm and uv battery #1147
2017-09-04cherry pickDream-Master
848a57291a2145680e0a87f7178b416e03f1ffaa Correct description of regulator #1168
2017-09-04cherry pickDream-Master
c09f6b5bdd47e51c3d5ec41d9947f1f94bfb0267 Fix the Tooltip of Pumps #1191
2017-09-04cherry pickTechlone
4b36ca77be9997df93074353820ac6ec66af6643 6691f1e86c91aa524f40f01ba7406410728825fc 4724bbe403fc5c608811300d1e337066667935bc Fix the Generated Item Pipes #1192 Improve fluid regulator #1193
2017-09-04cherry pickDream-Master
78e03914a34fee288f23fdd4bd8ec9600e16e502 d5b0dcfa505e0cb5b6143633730bf5d1dc476e79 f6482e63ae4d4415c2e894118729d4aacb499c13 eb749f64cac9db103d4c61002d8f663e23b3f435 Multi-lines tooltip support #1199
2017-08-28Refactor ebf code to match bloody codeTechnus
2017-08-26cherry pick part 1Johannes Gäßler
Commit: 01da9150f662d010db07f8729f5ec696a4f935fd [01da915] Added missing Tetraitromethane, Polymerization recipes
2017-08-24move the fluid filter recipes.Dream-Master
enable the fluid plastic (was molten) add a circuit to the recipes probably fix this (1.5.1.1) BrainTech duct tape uncraftable. #1877 https://github.com/GTNewHorizons/NewHorizons/issues/1877
2017-08-21Fixed Large Chemical Reactor GUI, was wrongly using default beforeJohannes Gäßler
2017-08-21chery pickDream-Master
Commit: c2e4ebea6ead832c1916249bc8166605a5b530e0 [c2e4ebe] Fixed EV Pumps using the wrong Rubber
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-19cherry pickJohannes Gäßler
Commit: 967c3c07af627f92200111013b5a7d0e6a176de1 [967c3c0] Reduced Oxygen consumption of Plastic Production by 50%
2017-08-19Macerating glass into glass dust #1849Johannes Gäßler
https://github.com/GTNewHorizons/NewHorizons/issues/1849
2017-08-19Restore api for assemblerTechnus
2017-08-15Change the cleanroom option to work with 6 inputs tooDream-Master