Commit Graph
186 Commits
Author SHA1 Message Date
Ben Spiers 78c2afb5ea Actually get it compiling again.
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
Ben Spiers 32fb03abff Make it a bit easier to see stuff with the weird model issues 2016-03-18 01:28:35 +00:00
aidancbrady 38a68541c4 Tiered Bins, better tier management! 2016-03-16 21:41:55 -04:00
aidancbrady a87b088be6 Work on Formulaic Assemblicator, also added some new fancy models from @CyanideX! 2016-03-14 23:57:37 -04:00
aidancbrady 34d55f72ea More fluid container integration, removed dead code 2016-03-06 02:57:32 -05:00
aidancbrady 13996faacb Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded 2016-03-05 18:28:52 -05:00
aidancbrady 4e41b46df7 Fix up Bin rendering 2016-03-05 15:18:40 -05:00
aidancbrady 866c76bafe Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes 2016-03-05 13:17:58 -05:00
aidancbrady f09010a927 Many more fixes 2016-02-28 19:11:43 -05:00
aidancbrady 7c160cc264 Interface and rendering fixes 2016-02-28 18:11:50 -05:00
aidancbrady c0f465d0cb Boiler rendering and interface, still yet to do statistics 2016-02-28 16:44:05 -05:00
aidancbrady 2451ac4819 Completed merge 2016-02-28 12:32:36 -05:00
aidancbrady 155758398c Continued boiler work 2016-02-28 11:52:52 -05:00
aidancbrady 87438dcc7f Boiler work, added heat info tab, worked on polishing heat interactions among machines 2016-02-27 13:32:48 -05:00
aidancbrady 3c1496740c Tiered Gas Tanks and tiered Fluid Tanks! 2016-02-24 17:01:43 -05:00
Ben Spiers 716aabece5 Fix merge 2016-02-20 22:58:17 +00:00
Ben Spiers b08bca67d4 Merge branch 'v9' into 1.8.9 2016-02-20 22:19:34 +00:00
aidancbrady 84da514b54 Rename Solar Evaporation Plant to Thermal Evaporation Plant 2016-02-18 18:37:38 -05:00
Ben Spiers 4e4d98427b Some more models 2016-02-18 14:13:45 +00:00
Ben Spiers 1a01d5e217 Get a lot more rendering working 2016-02-09 00:14:46 +00:00
Ben Spiers 7b4fefeb60 Fix some of the things that were broken, add more type-specs. 2016-02-08 22:46:06 +00:00
Ben Spiers 93438f29a4 Stop Minecraft complaining about all those textures being missing 2016-02-08 15:54:39 +00:00
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
Ben Spiers 0179ea1f38 Mostly rendering improvements 2016-02-01 23:42:30 +00:00
Ben Spiers 25d0b7441b Merge branch 'v9' into 1.8.9
Forgot to complete the merge so some weird stuff might have ended up in the patch. Oops.
2016-02-01 23:40:35 +00:00
Ben Spiers c5987588b8 Make Coord4D work as a BlockPos better. 2016-01-30 21:50:22 +00:00
Ben Spiers 62e7cc8f65 Merge branch 'v9' into 1.8.9 2016-01-30 00:47:54 +00:00
aidancbrady 88cfee2ab2 Changed Metallurgic Infuser infuse system to use icons for textures 2016-01-29 17:47:41 -07:00
Ben Spiers 671fa97313 More work on rendering
Get some things actually looking right!
2016-01-29 17:10:21 +00:00
aidancbrady a22b33a629 Energy Cubes and Gas Tanks now have configurable item inputs and gas/energy outputs, fixed Portable Tank item output 2016-01-29 00:34:50 -05:00
Ben Spiers dd99f582af State & Render stuffs, get the MInfuser rendering again.
Still no textures. WIP.
2016-01-27 01:36:39 +00:00
Ben Spiers 5e54c0a681 The mod now compiles and runs,
if the following packages are excluded:
client.gui (Haven't worked out guis yet)
client.nei (NEI isn't here yet)
client.render.block (ISBRH doesn't exist any more)
client.render.item (Nor do Item renderers)
common.multipart (Nor does CB's FMP)
generators (Couldn't be bothered, will fix when more of Mek Core works again)
2016-01-25 20:42:29 +00:00
Ben Spiers 18578139c4 Update some APIs
Is IC2 dead? Player's jenkins is down.
2016-01-25 20:25:17 +00:00
Ben Spiers a556fffc4f Fix various client and other stuff 2016-01-25 20:18:28 +00:00
Ben Spiers 3126f144d2 API and other consistency fixes 2016-01-25 04:35:25 +00:00
Ben Spiers 0f40514cc7 Merge branch 'v9' into 1.8.9 2016-01-23 13:50:43 +00:00
Ben Spiers a80f724cc2 Apply various common one-to-one replacements
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
aidancbrady 9cbc96a88e Textures for turbine components! Still need to texture turbine structure blocks. 2016-01-22 19:36:39 -05:00
Ben Spiers a0114b5112 More client work.
ClientTickHandler actually wasn't that bad!
2016-01-22 18:05:47 +00:00
Ben Spiers d4ca659ed0 More Client fixes 2016-01-22 00:20:29 +00:00
Ben Spiers 956dab666d Work on client stuff a bit. 2016-01-19 20:26:45 +00:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 70f440446f Change TESRs to the new generic system.
Some of these will presumably end up in the blockstate model system later.
2016-01-14 19:23:58 +00:00
Ben Spiers 9b8d9d92d6 Start update to 1.8.9
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady 6ab72698dc Finally made my IDEA workspace happy, assets weren't being recognized for some reason 2015-07-18 23:57:50 -07:00
aidancbrady 274b6d1477 Update copyright, minor cleanup 2015-07-06 11:26:48 -07:00
aidancbrady c67bbde36a Fixed Balloon render on player entities 2015-06-17 13:53:30 -04:00
aidancbrady b9f80c0365 Dynamic Tanks are now server friendly, closes #2690 2015-06-17 13:26:47 -04:00