aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2017-07-25Merge branch 'GTNHexperimental' into experimental-testDream-Master
2017-07-25Adapted GT5U Pyrolyse Oven changes for GTNHJohannes Gäßler
The Pyrolyse Oven accepts all Coils. Processing speed scales linearly with Coil tier.
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-22Removed Burn Value for Carbon Dust.Johannes Gäßler
2017-07-22Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-07-22fix pyrolyze - dynamic recipe adding for logWood oredict, change texture IDTechnus
2017-07-21Add a low grav and a clenroom recipe option to gt. Add a option to add botheDream-Master
2017-07-21Add option if clean room is disabled set clean room requirements to false.Dream-Master
2017-07-20remove EV and IV Miner because to op and no one would use Ore Drill plantsDream-Master
2017-07-20Add more miner tiers EV and IVDream-Master
2017-07-20Add HV MinerDream-Master
2017-07-19Add 6 Slots to the mixerDream-Master
2017-07-19Revert "try to ignore unification for steve carts metals"Dream-Master
This reverts commit 4275b75df56171f9886cadf73ee66e1abb62071d.
2017-07-19try to ignore unification for steve carts metalsDream-Master
SteveCarts with Reinforced tools cant be repaired #1672 https://github.com/GTNewHorizons/NewHorizons/issues/1672
2017-07-19add chances backDream-Master
2017-07-19this should workDream-Master
2017-07-19fix derpDream-Master
2017-07-19Add low gravity to CentrifugeDream-Master
2017-07-17LV Pump can be crafted with paper rings #1670Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1670
2017-07-17Added the Large Chemical Reactor Controller inventory to the item inputJohannes Gäßler
2017-07-17Merge branch 'experimental' of ↵Technus
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2017-07-17Remove smog "shader"Technus
2017-07-09Quick fix item distributerDream-Master
2017-07-09Fix superchest guiTechnus
https://github.com/GTNewHorizons/NewHorizons/issues/1621
2017-07-09Possible fix of Super chest #1621Dream-Master
https://github.com/GTNewHorizons/NewHorizons/issues/1621
2017-07-06cherry pickDream-Master
424b356feeb02cb3735b928b4b16fdf54631bcae 835dd2daccc5894a40b75a2110911a8c3e1878b9 98e214b873840c97778bb5bf5377673f76fd457d 0334a19993931a421376ce3aad50191edff3814b 0375e11debad5b9c997a91da3d07f85e37dc0616 480132b25f85bb350b04e949174ebc9ade85f185 Added LV and MV miners. #1142
2017-07-04Update GT_RecipeAdder.javaAntifluxfield
2017-07-02change Pyroluse Overn using now Cupronickel Coils tooDream-Master
2017-07-02reverse Recipe adder changesDream-Master
2017-07-02try thisDream-Master
2017-07-02cherry pickDream-Master
Assembly line upgrade #1130 @Antifluxfield can you review this changes. Thanks
2017-07-02cherry pickJohannes Gäßler
34058f0e1e65f12ab5d7f97fc3469a4de1264bb2 Fixed Diluted Sulfuric Acid recipes, PTFE Pipe Casing name
2017-07-02cherry PickDream-Master
9fc84fc1e74bdf81b33ff84d008a1614115a69f1 ff0017de19f80dd70fa646ea8b6464110e64677b c21e9cfc41ea0129aae7ff8bc41aea7eaf73629f @Antifluxfield Please look if i make it right Thanks
2017-07-02cherry pickJohannes Gäßler
Item Distributor #1132
2017-07-01cherry pickDream-Master
026fcfcbbadc8c3163f13b64192fed6ea05343fc Clean reset of Datastick so remaining old data does not break assemblyline.
2017-07-01cherry pickBlood-Asp
2385f04b41065e0f229f1bf53d81b8a8f094a742 Fix cover and mode spelling
2017-06-29Add missing importTechnus
2017-06-29Fix a bug where the bricked blast furnace didnt need casingJohannes Gäßler
2017-06-25spellingDream-Master
2017-06-25fix spellingDream-Master
2017-06-25Revert "Fixed recipes robot arm and Sensors using wrong circuits"Dream-Master
This reverts commit 87b88798669c934416df08096377a7a075cf59e9.
2017-06-25Fixed recipes robot arm and Sensors using wrong circuitsDream-Master
2017-06-24cherry pickJohannes Gäßler
6f3d92f3fab34444e8a8cc32bee9f80efde0eaaf Added a config option for easier EV+ Cables
2017-06-24cherry pickJohannes Gäßler
c0c498fb8cec35d35cc5fd2b8524cd5510082a9b Added Bricked BF config, fixed Primitive BF class hierarchy Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead of Ash.
2017-06-23Add new Circuit PartsDream-Master
2017-06-22cherry pickJohannes Gäßler
14b9332d141ff652cf728ea16a7d44274f0e1bef Moved the Casings for the Large Chemical Reactor again. As it turns out overwriting Casings 4.4 and 4.5 was not a good idea because even though there is no actual Casing at those IDs, the textures are in use. I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127. I did not use IDs 80-95 because there seem to already be some textures there. I did not use IDs 96-111 because they seem to already be in use by Technus.
2017-06-19Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into ↵Dream-Master
BrickedBlastFurnace
2017-06-19Minor change, full revert.Technus
2017-06-18Revert worldgen changes.Technus
2017-06-17Implemented crafting recipes for the Bricked Blast FurnaceJohannes Gäßler
fixed Glass Hammering consuming 40x more energy than intended Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16 ticks instead of 16EUt, 10 ticks. Renamed Dense Bricks -> Firebricks