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
|
c3f023c9e2
|
Merge pull request #736 from VeryBigBro/patch-1
Update ru_RU.lang
|
2013-12-21 09:23:08 -08:00 |
|
Aidan Brady
|
32a371c40d
|
Fixed teleporters
|
2013-12-21 12:22:17 -05:00 |
|
Anton
|
e163d5e6bd
|
Update ru_RU.lang
some work
|
2013-12-21 19:54:29 +03: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 |
|