Commit graph

744 commits

Author SHA1 Message Date
Aidan Brady
a57f5c4fd7 Merge branch 'master' into development 2013-12-18 19:20:54 -05:00
Aidan Brady
f7f9da8ae9 Fixed Digital Miner crash, made things efficient, fixed dupe bug 2013-12-18 18:57:15 -05:00
Aidan Brady
4cd1c8f4f7 Fix a few crashes 2013-12-18 18:39:49 -05:00
Aidan Brady
8f24e5c18f Got connection types to save/load, NONE sides will now not connect or emit to acceptors 2013-12-18 16:23:07 -05:00
Aidan Brady
c5269cc1ab Fix a few crashes, begin actual side-based implementation 2013-12-18 16:09:30 -05:00
Aidan Brady
4d6a2a31b1 Removed println 2013-12-18 14:36:25 -05:00
Ben Spiers
52939f763b Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work. 2013-12-18 18:42:05 +00:00
Aidan C. Brady
fa10c2ecb1 Add upgrade modifier config 2013-12-18 13:19:08 -05:00
Aidan C. Brady
4964c1689f Tiny cleanup 2013-12-18 12:39:37 -05:00
Aidan C. Brady
854c909c4c Merge branch 'master' into development 2013-12-18 12:07:52 -05:00
Aidan C. Brady
65c201d829 Add try/catch to prevent OreDict iteration GUI render crash 2013-12-18 12:05:09 -05:00
Aidan C. Brady
6ae1177c8e Fix that horrible Digital Miner bug once and for all 2013-12-18 11:52:24 -05:00
Aidan C. Brady
345f5f7b30 Remove println 2013-12-18 11:45:13 -05:00
Aidan C. Brady
5372bc66d6 More intelligent client-side scales 2013-12-18 11:19:30 -05:00
Aidan Brady
0317f81e06 Attempt to fix client render 2013-12-18 07:24:59 -05:00
Aidan Brady
31d9275c7a Fixed split energy calculations, fixed gas rendering 2013-12-17 22:37:21 -05:00
Aidan C. Brady
4d84386b8e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-17 22:25:58 -05:00
Aidan C. Brady
1152470dd6 Hopefully fixed an issue 2013-12-17 22:25:54 -05:00
Aidan Brady
7c0b26880c Fixed jetpack kicking players 2013-12-17 20:58:30 -05:00
Aidan C. Brady
25699f969d Fix client update 2013-12-17 20:55:53 -05:00
Aidan C. Brady
fed49fbb05 Cleanup, fix a few things 2013-12-17 20:42:52 -05:00
Aidan C. Brady
4f5c26b0d2 Fixed a bunch of bugs - think that Pressurized Tubes and Mechanical Pipes are done for the most part 2013-12-17 20:28:25 -05:00
Aidan C. Brady
e7cc127bb2 Removed now-useless checks 2013-12-17 18:27:44 -05:00
Aidan C. Brady
dc6128a88c Fixed bad check 2013-12-17 18:21:13 -05:00
Aidan C. Brady
cf0ad408dd Work on Mechanical Pipes 2013-12-17 18:20:18 -05:00
Aidan C. Brady
a601def4f6 More rendering; for some reason mech pipes are screwing up cache load 2013-12-17 15:54:06 -05:00
Aidan C. Brady
350ad4c22e Rendering looks cool :) 2013-12-17 15:36:25 -05:00
Ben Spiers
ed2a5233ae Fix models for large transmitters 2013-12-17 20:02:29 +00:00
Ben Spiers
b4b8ddf62a Clean up unused imports 2013-12-17 20:02:29 +00:00
Ben Spiers
8199408e75 Side-specific changeable models. They don't behave differently yet but that should be possible now without too much trouble. 2013-12-17 20:02:29 +00:00
Aidan C. Brady
4a7b862fb7 Use defined scale to calculate when to send updates, atm 100 possible packet stages 2013-12-17 14:57:19 -05:00
Aidan C. Brady
60e2666a29 Render defined scale properly 2013-12-17 14:45:30 -05:00
Aidan C. Brady
ffd683a3f3 Fixed rendering 2013-12-17 14:39:30 -05:00
Aidan C. Brady
a309e88b2b Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-17 14:02:34 -05:00
Aidan C. Brady
6f26d01d6b Fix tiny fluid cache issue 2013-12-17 14:02:28 -05:00
Aidan Brady
a3529a12d7 Fix a few bugs 2013-12-17 13:23:29 -05:00
Aidan C. Brady
4e74995143 Got some serious work done on Gas and Fluid network logistics 2013-12-17 12:53:33 -05:00
Ben Spiers
3a97630f55 Add new shapes to small model. 2013-12-17 02:21:30 +00:00
Aidan Brady
cd80bfc6cd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 19:08:58 -05:00
Aidan Brady
b78b1dc850 EnergyNetwork distribution merge/split complete, will do fluid and gas stuff tomorrow 2013-12-16 19:08:52 -05:00
Ben Spiers
01818d4e26 Fix up the redstone switching/cover blocking support a bit. 2013-12-16 23:55:42 +00:00
Aidan Brady
7730649ab3 Pushing this before I forget - lots of printlns! 2013-12-16 18:39:58 -05:00
Aidan Brady
bdf4efecda Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 17:54:32 -05:00
Aidan Brady
6598295e3e Work on Universal Cable split logistics, I think I got this @unpairedbracket 2013-12-16 17:54:27 -05:00
Ben Spiers
b0e2401b06 Fix a StackOverflow 2013-12-16 21:34:02 +00:00
Aidan C. Brady
5272d169c4 Fixed a few bugs in the split() method and added in some new functionality for splitting of energy/fluid/gas! Unpairedbracket, shouldn't hurt you unless you modified split() 2013-12-16 15:00:57 -05:00
Aidan C. Brady
869660d8bf Glowstone armor now glows 2013-12-16 12:21:49 -05:00
Aidan C. Brady
00b666a779 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 11:16:17 -05:00
Aidan C. Brady
a93d51a4a1 Added a handy double split tool to ListUtils, may be useful to you in network splitting @unpairedbracket; takes in a double, divides it into a defined amount of segments, giving the top element the remains 2013-12-16 11:16:10 -05:00
Ben Spiers
ab6da7571d Improve the FluidNetwork's reporting of stored/flowing fluid a bit 2013-12-16 15:57:04 +00:00