Commit Graph
1289 Commits
Author SHA1 Message Date
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 afe8969c37 Added energy management to turbine and turbine valves 2016-01-23 00:40:30 -05:00
aidancbrady 769a8fd480 Multiblock protocol works, begin turbine tile code 2016-01-22 23:46:16 -05:00
aidancbrady c341e6290b Stuff now renders normally 2016-01-22 20:23:20 -05:00
aidancbrady 8e1adc97ea Turbine assets completed, added blocks in-game. Still need to add special effect rendering, but that will come later 2016-01-22 20:08:37 -05:00
aidancbrady 9cbc96a88e Textures for turbine components! Still need to texture turbine structure blocks. 2016-01-22 19:36:39 -05:00
aidancbrady cfa2c1e4d9 Hopefully finalized multiblock form code, started on bringing the new blocks in-game 2016-01-22 17:46:04 -05:00
aidancbrady 8cab2ebe8c Rename Turbine Rod to Turbine Rotor, work on multiblock form code 2016-01-22 17:22:20 -05:00
aidancbrady 0c025e1033 Structural Glass is now real, started on core turbine multiblock code 2016-01-22 15:41:34 -05:00
Ben Spiers a0114b5112 More client work.
ClientTickHandler actually wasn't that bad!
2016-01-22 18:05:47 +00:00
Ben Spiers 622985f3fb Merge branch 'v9' into 1.8.9 2016-01-22 16:49:28 +00:00
aidancbrady bb9c203fae After some very frustrating fixes, added Rotational Complex (with debug max rotation) and got turbines to properly rotate 2016-01-22 00:04:44 -05:00
aidancbrady 6e9ee32df1 Turbines now render and look fancy, fixed some multiblock code 2016-01-21 20:36:40 -05:00
Ben Spiers 245d5ed471 Base fixes 2016-01-22 00:20:45 +00:00
Ben Spiers d4ca659ed0 More Client fixes 2016-01-22 00:20:29 +00:00
Ben Spiers 4384dbe376 More API stuff, make Pos3D actually override the Vec3 methods 2016-01-22 00:20:01 +00:00
Ben Spiers 956dab666d Work on client stuff a bit. 2016-01-19 20:26:45 +00:00
Ben Spiers fce1acae09 Fix up some api stuff that broke 2016-01-19 19:58:54 +00:00
aidancbrady 51c9ca061c Merge branch 'development' into v9
* development:
  Use apache library
2016-01-19 14:41:25 -05:00
aidancbrady dc7f5cfc9b Merge branch 'master' into development
* master:
  Use apache library
2016-01-19 14:41:13 -05:00
aidancbrady bfd32a1c3e Use apache library 2016-01-19 14:41:05 -05:00
Ben Spiers 39dc016908 Merge branch 'v9' into 1.8.9 2016-01-19 17:57:19 +00:00
aidancbrady bc57033fb9 Merge branch 'development' into v9
* development:
  Fix a small transporter bug
2016-01-18 17:18:24 -05:00
aidancbrady 17425b998f Merge branch 'master' into development
* master:
  Fix a small transporter bug
2016-01-18 17:18:12 -05:00
aidancbrady 1540cd2230 Fix a small transporter bug 2016-01-18 17:18:05 -05:00
aidancbrady 609ed4e3a1 Turbine Rods and Turbine Blades added in-game, multiblock functionality and interaction complete- still need to finish model and rendering stuff 2016-01-17 17:21:06 -05:00
aidancbrady 4c2b470213 Renamed Wind Turbine to Wind Generator, started work on turbine rods/blades for Industrial Turbine 2016-01-17 15:59:02 -05:00
aidancbrady 66cc62a600 Merge branch 'development' into v9
* development:
  Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods
2016-01-17 13:59:50 -05:00
aidancbrady c1c15ae707 Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods 2016-01-16 11:29:37 -05:00
Ben Spiers 4247ba136a Fix compile errors in API package 2016-01-16 14:35:01 +00:00
Ben Spiers 1dfba5e6c9 Fix the compile errors in MekTools 2016-01-14 19:25:23 +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 e747937760 Fixed Solar Generator desert bonus 2016-01-13 23:40:48 -05:00
aidancbrady 7f21516841 Fixed factory tab lighting 2016-01-13 23:15:58 -05:00
aidancbrady 2a78265419 Changed name of boiler to fix conflicts 2016-01-13 18:02:47 -05:00
aidancbrady 3f158d26da Fixed cable crash 2016-01-13 17:00:25 -05:00
aidancbrady c03c7e0f7a Fixed Reactor Port not accepting items 2016-01-13 16:21:08 -05:00
aidancbrady 0efbd28c8f Updated Box Blacklist parser to be more intuitive 2016-01-13 16:08:14 -05:00
aidancbrady e950c645e7 Fixed Solar Evaporation Plant memory leaks 2016-01-13 10:53:16 -05:00
aidancbrady a8efb3b0de Better Solar Evaporation Plant algorithm- much less CPU intensive and fixes all the weird building bugs 2016-01-13 00:10:13 -05:00
aidancbrady 0961b7e042 Reactors now scale steam and water tank capacity to injection rate 2016-01-12 19:07:29 -05:00
aidancbrady 0e1a08474c Removed test recipe registration 2016-01-12 18:48:35 -05:00
aidancbrady 9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00
aidancbrady ab5fe0c819 Fixed IMC recipe deletion 2016-01-11 21:13:36 -05:00
aidancbrady 0b984148b4 Fixed blocks not being harvested by items with one damage level 2016-01-11 21:00:32 -05:00
aidancbrady a72e043947 WAILA bounding block support 2016-01-11 20:55:16 -05:00
aidancbrady 72193075ab More efficient transporter tree searching 2016-01-11 20:45:13 -05:00
aidancbrady b6306d0779 More sound fixes 2016-01-09 13:37:37 -05:00