Commit graph

3528 commits

Author SHA1 Message Date
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
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
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
aidancbrady
4d65942f11 Server hotfix 2016-01-09 10:07:22 -05:00
aidancbrady
99fc98faf5 Fixed HolidayManager 2016-01-08 12:24:27 -05:00
aidancbrady
faf63dfebc Updated readme, improved Electric Pump calculation 2016-01-08 00:40:37 -05:00
aidancbrady
7016268cbc Better redstone support, fixed fuse sound 2016-01-05 20:35:42 -05:00
aidancbrady
8728531f77 Add short parsing to PacketHandler 2016-01-05 15:35:36 -05:00
aidancbrady
f9681a9942 Quick lib fix 2016-01-04 18:13:46 -05:00
aidancbrady
08eb8be841 A few necessary library additions 2016-01-04 00:33:00 -05:00
aidancbrady
11574e9454 Fixed Reactor Logic Adapter double parse, thanks @habnabit 2015-12-31 15:06:11 -05:00
aidancbrady
3ff2ede090 Updated Electrolytic Separator internals to support redstone control 2015-12-31 14:55:49 -05:00
aidancbrady
bd3bc4402f Fix Metallurgic Infuser upgrade slot conflict 2015-12-31 14:25:26 -05:00
aidancbrady
a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00
aidancbrady
f88a97697f Fixed Gas Tank comparator support 2015-11-27 23:29:55 -07:00
aidancbrady
21fa9fdb26 Cleaned up computer integration 2015-11-27 23:19:29 -07:00
aidancbrady
c2006d5e70 Computer integration fixes 2015-11-27 23:04:43 -07:00
aidancbrady
a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
aidancbrady
fbd692b4e0 Fixed transporter tier calculations 2015-11-27 12:30:49 -07:00
aidancbrady
f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00
aidancbrady
6466463a63 Bumped version 2015-11-26 15:44:42 -07:00
aidancbrady
2b785c95f3 Transmitters now intelligently maintain buffers when transmitter nodes are destroyed 2015-11-26 15:41:22 -07:00
aidancbrady
b248cf4b07 Fixed fluid/gas duplication 2015-11-26 14:40:46 -07:00
aidancbrady
f6154e2cb3 Fixed sorter not behaving nicely with double chests 2015-11-26 13:39:46 -07:00
aidancbrady
de839808d7 Improved chemical machines side config 2015-11-26 10:39:36 -07:00
aidancbrady
a14b0d77ad Fixed Induction Matrix computer integration 2015-11-25 10:34:49 -07:00
aidancbrady
2640cbd50b Fixed injection rate integration 2015-11-25 10:26:50 -07:00