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
|
5372bc66d6
|
More intelligent client-side scales
|
2013-12-18 11:19:30 -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
|
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
|
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
|
ffd683a3f3
|
Fixed rendering
|
2013-12-17 14:39:30 -05:00 |
|
Aidan Brady
|
a3529a12d7
|
Fix a few bugs
|
2013-12-17 13:23:29 -05:00 |
|
Ben Spiers
|
3a97630f55
|
Add new shapes to small model.
|
2013-12-17 02:21:30 +00:00 |
|
Aidan C. Brady
|
869660d8bf
|
Glowstone armor now glows
|
2013-12-16 12:21:49 -05:00 |
|
Ben Spiers
|
1534d1cb14
|
Make a start on Multipart Transporters.
|
2013-12-16 14:00:43 +00:00 |
|
Aidan C. Brady
|
c44b63fa3a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-16 07:23:39 -05:00 |
|
Aidan C. Brady
|
3741488322
|
Hopefully fix CME
|
2013-12-16 07:23:33 -05:00 |
|
Aidan Brady
|
50b98674ed
|
Fix crashes
|
2013-12-15 23:01:36 -05:00 |
|
Aidan Brady
|
2404e7416a
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2013-12-15 19:08:16 -05:00 |
|
Aidan Brady
|
8b0d18e469
|
Tiny cleanup
|
2013-12-15 19:08:13 -05:00 |
|
Aidan C. Brady
|
37a1a0ab40
|
Jetpack and gas mask practically done :)
|
2013-12-15 18:54:43 -05:00 |
|
Aidan Brady
|
d21ef524a0
|
Work on jetpacks/scuba stuff
|
2013-12-15 16:07:30 -05:00 |
|
Aidan Brady
|
8057d605a1
|
Merge branch 'master' into development
|
2013-12-15 14:19:57 -05:00 |
|
Aidan Brady
|
a6887eb813
|
Fixed tank crash
|
2013-12-15 00:43:47 -05:00 |
|
Aidan Brady
|
907bd10b0f
|
Merge branch 'master' into development
|
2013-12-14 22:50:48 -05:00 |
|
Aidan Brady
|
c73259f092
|
Killed off old TE API, moved PipeUtils to proper loc
|
2013-12-14 22:50:37 -05:00 |
|
Aidan C. Brady
|
1e1eabfd5e
|
Even more localization, fixed a few tiny bugs
|
2013-12-14 15:13:12 -05:00 |
|
Aidan Brady
|
0a0f3a1779
|
Minor cleanup
|
2013-12-13 07:02:13 -05:00 |
|
Aidan Brady
|
c85bb7f9cc
|
Add missing renderer
|
2013-12-12 23:36:55 -05:00 |
|
Aidan Brady
|
74d41073a6
|
Fixes, but getting an error for some reason
|
2013-12-12 23:08:16 -05:00 |
|
Aidan Brady
|
11c7efd8fc
|
Merge branch 'api-change' into multipart-experimental-new
|
2013-12-12 22:36:00 -05:00 |
|
Aidan Brady
|
0e35aca15a
|
Rendering enhancements
|
2013-12-12 22:31:27 -05:00 |
|
Ben Spiers
|
55dd8f5bf9
|
Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor
|
2013-12-13 01:58:25 +00:00 |
|
Aidan Brady
|
2d5b633168
|
Work on stuff
|
2013-12-12 20:35:37 -05:00 |
|
Aidan Brady
|
9ecb7c20fd
|
More work on Infuser
|
2013-12-12 19:04:02 -05:00 |
|
Aidan C. Brady
|
338da4d92c
|
Work on a more intuitive form of accepting gas in items and blocks
|
2013-12-12 16:54:55 -05:00 |
|
Ben Spiers
|
98c8068a0f
|
Get Mechanical Pipe rendering working a bit better.
|
2013-12-12 20:23:03 +00:00 |
|
Aidan Brady
|
31f8566a1f
|
Merge branch 'master' into multipart-experimental-new
Conflicts:
common/mekanism/common/Mekanism.java
|
2013-12-12 08:43:21 -05:00 |
|
Ben Spiers
|
c1318d998b
|
Merge, hopefully without screwing too much up.
|
2013-12-12 01:56:05 +00:00 |
|
Aidan Brady
|
5a241ce8ee
|
Work on GUIs
|
2013-12-11 20:24:37 -05:00 |
|
Aidan C. Brady
|
7e48fa2743
|
Work on container code
|
2013-12-11 16:34:54 -05:00 |
|
Aidan C. Brady
|
a4e8158448
|
Add GUIs for T3 ore processing machinery
|
2013-12-10 18:51:16 -05:00 |
|
Aidan Brady
|
250ddadcf0
|
Dictionary! :)
|
2013-12-09 20:52:49 -05:00 |
|
Aidan Brady
|
add3cf0bf6
|
Bug fixes!
|
2013-12-09 17:54:59 -05:00 |
|
Aidan Brady
|
ac31fc2b4e
|
More work on networking system, unstable
|
2013-12-09 17:34:53 -05:00 |
|
Aidan Brady
|
26f0f83574
|
Work on initial data system for jetpacks/gasmasks
|
2013-12-09 17:08:47 -05:00 |
|
Aidan Brady
|
44a69da8a1
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-09 17:00:29 -05:00 |
|
Aidan Brady
|
7506b8fed8
|
Fix particles
|
2013-12-09 17:00:21 -05:00 |
|
Aidan C. Brady
|
54a10af2d7
|
A few tiny fixes
|
2013-12-09 17:00:08 -05:00 |
|
Aidan C. Brady
|
5661b20b27
|
A few fixes
|
2013-12-09 11:56:48 -05:00 |
|