Commit Graph

2045 Commits (master)

Author SHA1 Message Date
Arona Jones 46982ef0f7 Begin to utilise new fluidutils methods, and refine fluid management within our tile entities 2015-09-03 13:54:50 +01:00
Arona Jones 0946a5af29 Add fuel and biodiesel to theliquid boiler's fuel list. 2015-09-03 13:43:46 +01:00
Arona Jones c7b3800a3c Delete UniversalWrench, and make spanner implement IUniversalWrench directly 2015-09-03 12:03:02 +01:00
Arona Jones b174ad57a2 Fix some itemResource names being messed up. 2015-09-03 11:22:38 +01:00
SkySom 78c3adf34d Working on the Steam Chisel 2015-09-03 01:18:43 -04:00
SkySom f136342a9d Merged 2015-09-02 20:29:28 -04:00
SkySom 2b0f3e0028 Armor checking now mostly working
Incompatibilities not working. Otherwise fine.
2015-09-02 19:55:37 -04:00
Arona Jones dffe29cae6 Merge pull request #311 from BrassGoggledCoders/dev
Merge branch 'dev' into 'master'.
2015-09-02 22:56:12 +01:00
Arona Jones f7bf7683d3 Add a config option to disable deeps generation completly. Workaround for #282. 2015-09-02 22:54:01 +01:00
Arona Jones ec4aa05c5e Fix #310: TC Clusters not giving enough ingots.
Also move cluster recipes to CompatLayer
2015-09-02 22:53:29 +01:00
SkySom ac5f554665 Still some issues with the slot logic
Overall works for adding and removing mods. Still working on the logic
as to whether something can be added or not.
2015-09-01 00:27:01 -04:00
Arona Jones c7ee5c98fe Rename IChiselable to IEngravable 2015-08-31 15:22:39 +01:00
Arona Jones 1837dc07be Liquid boiler gui work 2015-08-31 15:19:36 +01:00
Arona Jones 96ab969707 Liquid Boilers functional (ish) 2015-08-31 15:19:36 +01:00
Arona Jones 741f9453b8 Merge branch 'boilerexpansion' 2015-08-31 00:54:02 +01:00
Arona Jones bca84d3433 Liquid boiler is almost functional. 2015-08-30 13:38:50 +01:00
Arona Jones c5fb8a77a4 Further bashing at fixing dimension crashes. 2015-08-30 02:42:03 +01:00
Arona Jones e646132553 Further work on the liquid boiler 2015-08-29 14:58:12 +01:00
Arona Jones dfe7c3a79e Hatch is functional (but not pretty :P) 2015-08-29 14:45:46 +01:00
Arona Jones f98ea71fba Begin implementing the liquid boiler 2015-08-29 14:19:46 +01:00
Arona Jones 63757e0c40 Enable Freezeboots, Superfreezeboots and Autofeeder modules. All but superfreezeboots function correctly. 2015-08-29 12:28:48 +01:00
Arona Jones f6cb61f08b Autocleanup 2015-08-29 11:16:50 +01:00
Arona Jones 6bd97b22f6 Uncomment and add (terrible) standin textures for coins, uncraftable items intended for use as currency by servers. 2015-08-29 11:13:46 +01:00
Arona Jones d42f901e51 Double whales size, and increase their health. 2015-08-29 11:13:45 +01:00
Arona Jones 388d1bb7ed Turn down the whale spawn rate considerably 2015-08-29 11:13:45 +01:00
Arona Jones 52ff30d6c8 Recipes for whale stuffs 2015-08-29 11:13:45 +01:00
Arona Jones 13d7cbbf9b Fixed custom buckets 2015-08-29 11:13:44 +01:00
Arona Jones fd841b8aa0 Whalebone armor model textures 2015-08-29 11:01:18 +01:00
SkySom c6a5589584 Got Gui working. Container and tile still iffy
http://imgur.com/5vtP1e8
2015-08-29 05:43:03 -04:00
SkySom bdcbe6d2e4 New Armor Editor GUI 2015-08-29 03:01:52 -04:00
SkySom 65bda861af Moved GuiHandler to Boilerplate 2015-08-28 23:57:46 -04:00
Arona Jones 37ace0c764 Whoops, I failed at resolving the merge conflict :p 2015-08-28 12:03:06 +01:00
Arona Jones 802296eab3 Fix #304: Stray pixels 2015-08-28 12:00:02 +01:00
Arona Jones d86623c03e Whales & Whale Oil functional, except for whale oil buckets 2015-08-28 12:00:01 +01:00
Arona Jones f819bcf606 Add a cook time bar to the refinery gui. It doesn't actually work yet, but its there... 2015-08-28 12:00:01 +01:00
Arona Jones 58f17593e2 Refinery is now functional 2015-08-28 11:58:42 +01:00
SkySom 856248dee7 Moved from the switch statement to the interface
For most things at least. No good way to handle gui's opened via key
press
2015-08-27 22:17:23 -04:00
Arona Jones 08589f676b Should fix itemResource recipes. 2015-08-25 00:33:24 +01:00
Arona Jones 955b78b68f Ore dictionary uranium blocks 2015-08-25 00:25:24 +01:00
Arona Jones 6381fc0085 BREAKING Move over obsidian/etherium stuff to BrassUtils.
Also deleted Shielded Canisters, decided I didn't like them...
2015-08-25 00:24:45 +01:00
Arona Jones f97251a3f3 Tmp reinforced canister textures 2015-08-23 23:46:15 +01:00
Arona Jones fdfbcdfc49 Change anything checking for the orginal steam canister item to checking for ItemCanister 2015-08-23 23:46:15 +01:00
Arona Jones 04c15aae18 Adding null checks to try and help with deeps crashes 2015-08-23 23:46:15 +01:00
Arona Jones fb78a53df1 Add a double capacity reinforced steam canister 2015-08-23 23:46:15 +01:00
Arona Jones 030e7c137b Prevent steam drill from mining indestructible blocks (bedrock!) 2015-08-23 23:46:13 +01:00
Arona Jones 9d1e79c32b Merge pull request #301 from Zvarpensg/master
Try #2 to fix the crowbar. Also nullcheck
2015-08-23 23:45:53 +01:00
SkySom d60cef1e1d Try #2 to fix the crowbar. Also nullcheck
Note: Figured out why it "worked" locally. I already had the file in lib
so I never hit that code to actually test it like I thought I was.
Lesson learned, always make sure you properly test code copied from
Stack Overflow. You're types may be different from theirs. Pretty sure
at this point if it doesn't work, I give up.

And yeah also random null check because stacks can be null and there
were some. And shit crashed.
2015-08-23 01:47:18 -04:00
Arona Jones 3c736bc2ac I'm bad at fixing merge conflicts 2015-08-22 10:22:56 +01:00
Arona Jones fd604ca5aa Well that's not going to work. (Revert commit e24eeb7595) 2015-08-22 10:19:40 +01:00
Arona Jones 5901525a86 Starting to get hatch rendering figured out 2015-08-22 10:16:51 +01:00