Commit Graph

2045 Commits (master)

Author SHA1 Message Date
Serban Rares e8e44b5f88 Wires can now extract from multiple sides and have GUI. 2015-10-25 19:38:53 +02:00
Serban Rares b8a0aaf407 Extraction can now be changed from GUI for pipes. 2015-10-25 17:15:49 +02:00
Serban Rares 249eed4fb3 One pipe can now extract from multiple machines 2015-10-25 16:24:53 +02:00
Serban Rares 374855f901 Arranged buttons in the change extraction GUI. 2015-10-25 15:12:25 +02:00
Serban Rares fe29f822d3 Added a GUI when shift-clicking pipes with a Spanner. 2015-10-25 14:05:57 +02:00
Serban Rares 0336f7127b Added Baubles to build.gradle
When I set up my workspace I got an error because Baubles didn't exist, so I added it :)
2015-10-21 22:55:39 +03:00
Arona Jones 9ca9844ead Fix #323: oredict for itemResource was messed up 2015-10-20 16:51:03 +01:00
Arona Jones 128b2d7905 Merge branch 'dev' 2015-10-17 12:43:50 +01:00
Arona Jones 31cbe81a4f Update changelog ready for release. I will now include the author of the change in the changelog 2015-10-17 12:42:49 +01:00
Arona Jones bedbbf6296 Steel pipe recipe. 2015-10-17 12:42:28 +01:00
Arona Jones bed0a0465e Rusty/mossy metal recipes 2015-10-17 12:24:20 +01:00
Arona Jones 42a12e8879 Bump version. Add a hotfix digit. 2015-10-17 12:15:35 +01:00
Arona Jones 0f1ca09348 Liquid boiler functional. Displays all fuels as looking like whale oil for now. 2015-10-17 12:11:31 +01:00
Arona Jones e34622f466 Massivly nerf liquid fuels. Too much? 2015-10-17 11:21:02 +01:00
Arona Jones e06b2e14ae Textures, Recipes and names 2015-10-17 10:47:03 +01:00
Arona Jones ab7e02fc6a Switch plating to be just a metal version of carpet. 2015-10-17 10:11:30 +01:00
Arona Jones 14e90b9ced Refinery refinements (heh) 2015-10-15 18:41:53 +01:00
Arona Jones 0425a3f965 Add a recipe for the steel hatch 2015-10-15 18:14:23 +01:00
Arona Jones f6a08e51e6 Add lighter slate generating higher, and deepen gen of old slate 2015-10-15 17:54:39 +01:00
Arona Jones 1c46770b31 Bullets use nuggets not ingots in their recipe 2015-10-09 17:59:22 +01:00
Arona Jones 321e23cba9 Fixed my whalemeat derp 2015-10-09 17:58:37 +01:00
Arona Jones c906ff41bf Some plating stuff 2015-10-09 17:55:43 +01:00
Arona Jones 65d9f3ad67 Begin work on plating 2015-10-04 04:17:36 +01:00
Arona Jones ebbeb6d3b2 Fix Half Sovereign and Mossy/Rusty textures 2015-10-04 03:50:22 +01:00
Arona Jones caedd2fb28 Register intake fx in sounds.json. Might help with #322? 2015-10-04 03:44:31 +01:00
Arona Jones 3d5c714681 Merge branch 'dev' 2015-10-01 07:49:28 +01:00
Arona Jones 4113d05b04 Add a config option to disable deeps portal gen 2015-10-01 07:43:05 +01:00
Arona Jones cdfe13d662 Remove unneeded lang for removed parts 2015-09-25 15:09:25 +01:00
Arona Jones 4d2d0c0274 Create en_PT.lang, not much yet 2015-09-25 15:08:44 +01:00
Arona Jones dcfa3fdc11 Mossy/Rusty metal blocks 2015-09-12 23:10:36 +01:00
Arona Jones cf5bfc5bcf Null checks 2015-09-10 19:33:29 +01:00
Arona Jones d3d79ce3c4 Add note about needing jenkins BP for jenkins builds 2015-09-10 12:15:30 +01:00
Arona Jones c84a1d73a8 Merge branch 'dev' 2015-09-10 12:05:40 +01:00
Arona Jones a85ec75445 More injector work 2015-09-10 11:53:45 +01:00
Arona Jones 14543e0023 Move buckethandler to boilerplate 2015-09-10 11:39:06 +01:00
Arona Jones 8c81e5538e Further work on injection/extraction machine 2015-09-09 18:48:07 +01:00
Arona Jones 8eab7f279c Begin work in injection/extraction machine.
What do we do if we can't get one machine working? Start another, obviously!
2015-09-09 12:01:59 +01:00
Arona Jones 705d976314 Liquid boiler work. Still has some issues.
Notably, it doesn't display fuel level, and it fills steam canisters from the water tank, not the steam tank!
2015-09-09 11:37:10 +01:00
Arona Jones 512e8bdd2c Texture fixes 2015-09-07 21:52:44 +01:00
Arona Jones d7ff59ccd2 Autocleanup 2015-09-07 21:32:43 +01:00
Arona Jones 18edba9a6f Remove copper and brass parts, halving the clutter! 2015-09-07 14:14:12 +01:00
Skylar Sommers 52a6dbdb91 Merge pull request #315 from BrassGoggledCoders/chisel
Chisel
2015-09-06 00:59:45 -04:00
SkySom e1a18d508c What is this I can't even 2015-09-06 00:59:08 -04:00
Arona Jones aebcd87f71 Finish refining combustion boiler GUI 2015-09-04 10:45:38 +01:00
Arona Jones a0232d5670 Fix ore drops being messed up. Closes #314 2015-09-04 10:13:03 +01:00
Arona Jones 1685db6457 Implement Wolfie's cool new coin textures, and diving helmet overlay 2015-09-04 10:12:33 +01:00
SkySom 075693117f Added Optional.Method to be safe 2015-09-03 21:14:51 -04:00
SkySom b564983652 Finished Adding Steam Powered Chisel
Still needs a few changes, but it works
2015-09-03 20:59:14 -04:00
Arona Jones 05beef4b14 Further BaseBoiler updates 2015-09-03 18:58:06 +01:00
Arona Jones 04fc854bc1 Register steam canisters as fluid containers. 2015-09-03 14:05:25 +01:00