Aidan Brady
|
84f4eaee76
|
Christmas fun :)
|
2013-12-24 14:38:12 -05:00 |
|
Aidan Brady
|
8323ea6415
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-24 13:28:27 -05:00 |
|
Aidan Brady
|
df95a64409
|
Finish merge
|
2013-12-24 13:28:20 -05:00 |
|
Aidan Brady
|
fd26b9b11b
|
Work on a little Christmas surprise
|
2013-12-24 13:25:31 -05:00 |
|
Aidan C. Brady
|
9498b01475
|
Finished off the Chemical Injection Chamber, just need sounds
|
2013-12-24 12:39:27 -05:00 |
|
Aidan C. Brady
|
4cf33562c6
|
Merge branch 'master' into development
|
2013-12-24 12:19:24 -05:00 |
|
Aidan C. Brady
|
9fbbc8381f
|
Separated OreDict management from Mekanism, added proper recipes for Chemical Injection Chamber
|
2013-12-24 11:55:40 -05:00 |
|
Aidan C. Brady
|
bd1e3234ff
|
Fixed crash
|
2013-12-24 11:20:22 -05:00 |
|
Aidan C. Brady
|
a41760affd
|
Chemical Injection Chamber initial work
|
2013-12-24 00:23:30 -05:00 |
|
Aidan C. Brady
|
9cc243a244
|
Properly use IFluidBlock.drain() when draining fluid blocks
|
2013-12-23 23:20:53 -05:00 |
|
Aidan C. Brady
|
9ed16f3006
|
A few fixes, please update!
|
2013-12-23 20:23:37 -05:00 |
|
Aidan C. Brady
|
52319ed31e
|
A few fixes, please update!
|
2013-12-23 20:23:23 -05:00 |
|
Aidan C. Brady
|
6df7544540
|
Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs.
|
2013-12-23 17:06:22 -05:00 |
|
Aidan C. Brady
|
b060c2c005
|
Fix silly upgrade GUI bug
|
2013-12-22 23:24:20 -05:00 |
|
Aidan C. Brady
|
6b420d07d2
|
Support for items/blocks with multiple OreDict entries
|
2013-12-22 18:28:49 -05:00 |
|
Aidan Brady
|
d4fc39274e
|
Threaded VoiceConnection, made client connection fire with server-configured port
|
2013-12-22 16:49:04 -05:00 |
|
Aidan C. Brady
|
b73cf8f8ed
|
Remove back crafting
|
2013-12-22 16:03:23 -05:00 |
|
Aidan C. Brady
|
90985663bb
|
Sync server configs with client
|
2013-12-22 01:49:55 -05:00 |
|
Aidan Brady
|
ced44e97fc
|
A few fixes, dynamic distance calculating as called by ILogisticalTransporter. Off to bed, more work tomorrow!
|
2013-12-22 01:21:40 -05:00 |
|
Aidan Brady
|
0f7e8eec31
|
A few fixes
|
2013-12-22 01:07:47 -05:00 |
|
Aidan Brady
|
87ce53f3fe
|
Removed more UE stuff
|
2013-12-22 01:04:35 -05:00 |
|
Aidan Brady
|
3210153f38
|
Add delay to bin eject, removed old transmitters from creative tab, fixed descriptions of transmitters
|
2013-12-22 00:53:27 -05:00 |
|
Aidan Brady
|
4812b432fd
|
A few fixes, added recipes for balloons
|
2013-12-22 00:42:46 -05:00 |
|
Aidan Brady
|
96fdb4d168
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-21 21:06:48 -05:00 |
|
Aidan Brady
|
6c87a8e288
|
Add Pos3D because vectors
|
2013-12-21 21:06:39 -05:00 |
|
Ben Spiers
|
a70ce09442
|
Move Multipart initialisation to fix converter registration.
|
2013-12-22 01:43:18 +00:00 |
|
Aidan Brady
|
6cf6ba2b09
|
Transporters can now auto-pull items from adjacent sides, fixed recalculation logic with differing side types
|
2013-12-21 19:54:12 -05:00 |
|
Aidan Brady
|
f25bc6f941
|
Fixed saving
|
2013-12-21 15:58:59 -05:00 |
|
Aidan Brady
|
198305ff39
|
Fixed transfer issue
|
2013-12-21 14:54:12 -05:00 |
|
Aidan Brady
|
d6ad61114e
|
Attempting to find an energy transfer issue
|
2013-12-21 14:27:35 -05:00 |
|
Aidan Brady
|
235c3f20a2
|
Killed off old UE references
|
2013-12-21 12:51:55 -05:00 |
|
Aidan Brady
|
32a371c40d
|
Fixed teleporters
|
2013-12-21 12:22:17 -05:00 |
|
Aidan Brady
|
bbbd5dea73
|
Fix some rendering bugs
|
2013-12-21 01:31:52 -05:00 |
|
Aidan Brady
|
f2a3923c18
|
Got things working
|
2013-12-21 01:13:09 -05:00 |
|
Aidan Brady
|
5c3943bd5d
|
More logic
|
2013-12-21 00:58:56 -05:00 |
|
Aidan Brady
|
516dfb9ffb
|
Bits of work on transporter logic
|
2013-12-21 00:32:15 -05:00 |
|
Aidan Brady
|
15aa17e441
|
Connections complete, colors now update renderer properly
|
2013-12-20 21:34:16 -05:00 |
|
Aidan Brady
|
d3661b3cd8
|
Got colors working, need to fix connections
|
2013-12-20 21:05:44 -05:00 |
|
Aidan Brady
|
2cf6fdc18c
|
Lots more work
|
2013-12-20 19:12:33 -05:00 |
|
Aidan Brady
|
7bb6b2761b
|
Base code done, onto actual implementation
|
2013-12-20 18:29:22 -05:00 |
|
Aidan Brady
|
2fcbbcfa6a
|
Loads of work on transporters
|
2013-12-20 18:14:31 -05:00 |
|
Aidan Brady
|
f2d202d90f
|
Work on transporters
|
2013-12-20 17:46:24 -05:00 |
|
Aidan Brady
|
40e2d3b7fc
|
Bump version, work on multipart transporters
|
2013-12-20 16:47:09 -05:00 |
|
Aidan C. Brady
|
0ab803feeb
|
Rename Object3D to Coord4D, work on balloons
|
2013-12-20 16:09:09 -05:00 |
|
Aidan Brady
|
48af6f8fcc
|
Balloons :)
|
2013-12-20 13:27:54 -05:00 |
|
Aidan Brady
|
0367e62b34
|
Custom particles for different colors when breaking balloon
|
2013-12-20 01:17:54 -05:00 |
|
Aidan Brady
|
510debc0fb
|
Kill induction module and start on balloons :)
|
2013-12-20 01:05:41 -05:00 |
|
Aidan Brady
|
6b5f8833f0
|
Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy
|
2013-12-19 18:21:12 -05:00 |
|
Aidan Brady
|
fbed46c0d9
|
More fixes
|
2013-12-19 16:55:41 -05:00 |
|
Aidan Brady
|
abaef2fd6d
|
Work on connections
|
2013-12-19 16:32:00 -05:00 |
|
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 |
|