Aidan Brady
|
c02c53475d
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-07 16:59:43 -05:00 |
|
Aidan Brady
|
1df2209f25
|
Use proper obfuscation
|
2013-11-07 16:59:37 -05:00 |
|
Aidan C. Brady
|
d1089148f9
|
Don't accept a max over 64
|
2013-11-07 09:16:11 -05:00 |
|
Aidan Brady
|
daeb09c7fd
|
Fix Energy Cubes up/down render
|
2013-11-06 22:37:41 -05:00 |
|
Aidan Brady
|
1f59e441b8
|
Fix a few things
|
2013-11-06 19:44:52 -05:00 |
|
Aidan Brady
|
44addd9c75
|
Untested max/min support
|
2013-11-06 19:32:00 -05:00 |
|
Aidan Brady
|
8fdfe8d1ea
|
Items render smaller
|
2013-11-06 17:52:30 -05:00 |
|
Aidan Brady
|
51813050b0
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-05 20:35:05 -05:00 |
|
Aidan Brady
|
961537a560
|
Revert to old Crusher texture
|
2013-11-05 20:35:02 -05:00 |
|
Aidan C. Brady
|
f27381453c
|
Updated BuildCraft API, implemented full-fledged BC energy support, allowed Logistical Transporters to connect to BuildCraft machines, allowed Logistical Transporters to output to double chests, fixed energy leak
|
2013-11-05 20:07:38 -05:00 |
|
Aidan C. Brady
|
e2e9c791a2
|
Fix robit render!
|
2013-11-05 07:49:26 -05:00 |
|
Aidan Brady
|
1ff600b4a9
|
Added configurable restrictive input colors to all configurable machines, added some dandy sound effects
|
2013-11-04 21:11:09 -05:00 |
|
Aidan Brady
|
d825154bf6
|
Fixed Pressurized Tube connection render to Gas Tanks
|
2013-11-04 16:03:08 -05:00 |
|
Aidan C. Brady
|
99a603549a
|
BioGenerator fancy biofuel render :D
|
2013-11-04 15:39:49 -05:00 |
|
Aidan Brady
|
01a6174fdb
|
Lots of things!
|
2013-11-03 16:54:33 -05:00 |
|
Aidan Brady
|
c3fa020561
|
New Electric Pump model!
|
2013-11-03 12:07:23 -05:00 |
|
Aidan Brady
|
6d734c26e3
|
New models and fixes!
|
2013-11-03 11:38:36 -05:00 |
|
Aidan Brady
|
65012d8427
|
Fix up inventory insert calculation
|
2013-11-03 00:14:54 -04:00 |
|
Aidan Brady
|
dcea9fa8f5
|
Item rendering :D
|
2013-11-02 21:19:01 -04:00 |
|
Aidan Brady
|
64fe3a21ea
|
Fix typo, start work on fancy Energy Cube rendering :)
|
2013-11-02 21:07:55 -04:00 |
|
Aidan Brady
|
d1a1e3375a
|
New Metallurgic Infuser model, more efficient active state management
|
2013-11-02 19:06:56 -04:00 |
|
Aidan Brady
|
2a73dc3332
|
Gave the Solar Generator a new model
|
2013-11-02 12:00:29 -04:00 |
|
Aidan C. Brady
|
289a2ee227
|
Configurable machine output colors
|
2013-11-02 01:31:32 -04:00 |
|
Aidan Brady
|
799142198a
|
Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :)
|
2013-11-01 23:51:10 -04:00 |
|
Aidan Brady
|
8db9c734d7
|
Sorter no longer requires energy, gave sorter new fancy model, improved the way items retreat from dead ends
|
2013-11-01 22:36:06 -04:00 |
|
Aidan C. Brady
|
cb30b11d64
|
Killed the rest of the references
|
2013-11-01 11:38:33 -04:00 |
|
Aidan C. Brady
|
91a8839203
|
Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal.
|
2013-11-01 11:33:00 -04:00 |
|
Aidan C. Brady
|
f0b6799409
|
Machines eject into transporters.
|
2013-10-31 14:46:14 -04:00 |
|
Aidan C. Brady
|
a00a557f2b
|
Preload sounds on game startup, immediately fire updateScreen() on OreDict filter calculation, added restriction transporter recipe
|
2013-10-31 14:26:04 -04:00 |
|
Aidan C. Brady
|
fa92b707c9
|
Immediately load stacks if new filter calculation performed
|
2013-10-30 23:54:29 -04:00 |
|
Aidan C. Brady
|
abe549bf13
|
Started some work on more filter tab information.
|
2013-10-30 23:48:50 -04:00 |
|
Aidan Brady
|
04d9b3dc68
|
Some fixes
|
2013-10-30 20:35:11 -04:00 |
|
Aidan C. Brady
|
656f74983f
|
Lots of progress on ejectors and GUIs
|
2013-10-30 15:22:43 -04:00 |
|
Aidan C. Brady
|
e155dfd17f
|
Logistical Sorters use energy
|
2013-10-29 19:17:37 -04:00 |
|
Aidan C. Brady
|
4962dd62b3
|
Fix silly GUI crash
|
2013-10-29 18:20:34 -04:00 |
|
Aidan C. Brady
|
9496f7dfa3
|
Rewrote pathfinder, added in Restrictive Transporters, added option to have null color in filters, added default outputting filter for sorter
whoo!
|
2013-10-29 18:13:30 -04:00 |
|
Aidan Brady
|
001ce431dc
|
Scrolling :)
Next is adding something similar to RP's "restriction tube!"
|
2013-10-28 21:08:37 -04:00 |
|
Aidan C. Brady
|
2f3160c986
|
Better packet management for Logistical Transporters, smoother-looking item movement
|
2013-10-28 14:42:28 -04:00 |
|
Aidan C. Brady
|
d8a4ecb986
|
Don't launch VoiceClient unless VoiceServerEnabled is set to true
|
2013-10-28 07:16:22 -04:00 |
|
Aidan Brady
|
a63573d80f
|
Added transporter recipe, items now drop when necessary
|
2013-10-27 19:27:33 -04:00 |
|
Aidan C. Brady
|
cb555e90a6
|
Filters are now editable by GUI!
|
2013-10-27 18:24:16 -04:00 |
|
Aidan C. Brady
|
a500d0f592
|
Edit/delete filter packets
|
2013-10-27 17:47:17 -04:00 |
|
Aidan C. Brady
|
5e7c01c1af
|
Client/server GUI communication logistics
|
2013-10-27 17:29:34 -04:00 |
|
Aidan C. Brady
|
f60106f0e9
|
Filter panel buttons render!
|
2013-10-27 15:00:22 -04:00 |
|
Aidan C. Brady
|
4272c4cb6d
|
Fix up custom slot render, got scroll bar working
|
2013-10-27 11:44:19 -04:00 |
|
Aidan Brady
|
340ccd1e87
|
Slightly better packet management, removed Control Panel
|
2013-10-27 00:08:39 -04:00 |
|
Aidan Brady
|
f4ced367cd
|
Add option to disable voice server
|
2013-10-26 23:55:11 -04:00 |
|
Aidan Brady
|
0bab44a522
|
Fixes, filters technically work now!
|
2013-10-26 23:46:39 -04:00 |
|
Aidan Brady
|
9b378f1fff
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-10-26 23:23:14 -04:00 |
|
Aidan Brady
|
3dab655328
|
Fix possible NPE
|
2013-10-26 23:23:11 -04:00 |
|
Aidan C. Brady
|
4a042cfdc2
|
Some work on networking logistics of GUI
|
2013-10-26 20:23:38 -04:00 |
|
Aidan C. Brady
|
a8d6386bb5
|
GUIs are cool :D
|
2013-10-26 19:04:33 -04:00 |
|
Aidan C. Brady
|
3a9a518188
|
Major GUI work!
|
2013-10-26 13:25:51 -04:00 |
|
Aidan Brady
|
51f24f058a
|
Worked on that GUI, I think I've got down how this is gonna work
|
2013-10-26 00:02:57 -04:00 |
|
Aidan Brady
|
8bb6b7ac43
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
|
2013-10-25 21:36:33 -04:00 |
|
Aidan Brady
|
b405c42e2f
|
Remove useless InventoryNetwork
|
2013-10-25 21:34:55 -04:00 |
|
Aidan C. Brady
|
b8935f8f7a
|
Started on sorter GUI!
|
2013-10-25 18:08:13 -04:00 |
|
Aidan C. Brady
|
5a748c5ff6
|
More work on the Logistical Sorter!
|
2013-10-25 08:51:13 -04:00 |
|
Aidan C. Brady
|
51289b82c2
|
Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves.
|
2013-10-25 00:23:38 -04:00 |
|
Aidan C. Brady
|
609d9c5d17
|
Fixed server connection issue!
|
2013-10-24 17:14:09 -04:00 |
|
Aidan C. Brady
|
61f8a06d48
|
Fixed pathfinding, hopefully fixed crash and build failure
|
2013-10-24 11:38:23 -04:00 |
|
Aidan C. Brady
|
ab8361f9e8
|
Just about finished rendering! :D
|
2013-10-23 20:34:33 -04:00 |
|
Aidan C. Brady
|
9fabab18a3
|
Just about done with rendering, next steps are final bug fixes and inventory management implementations
|
2013-10-22 21:13:23 -04:00 |
|
Aidan C. Brady
|
89eda12200
|
Got more things working!
|
2013-10-22 11:08:28 -04:00 |
|
Aidan C. Brady
|
c7dcea6a06
|
Rendering is partially-functional; I have an idea to make this more efficient, will do later
|
2013-10-22 07:54:09 -04:00 |
|
Aidan C. Brady
|
33c8f960f3
|
Some work on rendering, still really incomplete
|
2013-10-21 23:46:24 -04:00 |
|
Aidan C. Brady
|
ed5c30fb0a
|
More work, fixing client crashes
|
2013-10-21 23:03:54 -04:00 |
|
Aidan Brady
|
4b82ab6cc1
|
Work on transporters, don't use them unless you like buggy item transport pipes that currently do nothing
|
2013-10-20 22:47:20 -04:00 |
|
Aidan C. Brady
|
5b44e0f409
|
Synchronized network code, should be thread safe.
|
2013-10-20 00:04:11 -04:00 |
|
Aidan C. Brady
|
e150df8743
|
Fixed NEI, fixed TNT dupe
|
2013-10-19 12:55:21 -04:00 |
|
Aidan C. Brady
|
8c51e4dd25
|
Fixed possible VoiceInput crash
|
2013-10-19 12:35:55 -04:00 |
|
Aidan Brady
|
61d046b518
|
Hopefully fixed walkie talkies
|
2013-10-18 20:05:47 -04:00 |
|
Aidan Brady
|
d8a806ebab
|
Debugging walkie talkies, don't use this build unless you like console spam
|
2013-10-18 19:09:08 -04:00 |
|
Aidan C. Brady
|
0350eef398
|
Minor changes
|
2013-10-18 07:33:27 -04:00 |
|
Aidan C. Brady
|
1b717267f3
|
Moved client-sensitive info over to MekanismClient
|
2013-10-14 23:36:07 -04:00 |
|
Aidan C. Brady
|
c0651a9377
|
Fixed walkie talkies stacking, they now glow when in on state
|
2013-10-14 16:13:32 -04:00 |
|
Aidan C. Brady
|
15cba39b30
|
Fixed capes :)
|
2013-10-14 15:54:10 -04:00 |
|
Aidan C. Brady
|
9d94e55ece
|
Hopefully fixed crash
|
2013-10-14 14:59:48 -04:00 |
|
Aidan C. Brady
|
fb2be7df86
|
More cleanups, now to update to forge build 931
|
2013-10-14 14:25:04 -04:00 |
|
Aidan C. Brady
|
5dbfd15a0e
|
Cleaned up code
|
2013-10-14 14:08:15 -04:00 |
|
Aidan C. Brady
|
0feba0d9b3
|
Fixed key handler, added complete keybind support, added proper error messages, more work on walkie talkies.
|
2013-10-14 13:27:38 -04:00 |
|
Aidan C. Brady
|
cafe2a7dfb
|
Much more server work
|
2013-10-14 12:44:07 -04:00 |
|
Aidan C. Brady
|
fbedc1915f
|
More core work
|
2013-10-13 23:27:49 -04:00 |
|
Aidan C. Brady
|
34f1053354
|
The beginnings of a voice server
|
2013-10-13 22:50:21 -04:00 |
|
Aidan C. Brady
|
0d7b2414ce
|
Walkie Talkie foundation! :D
|
2013-10-13 12:31:26 -04:00 |
|
Ben Spiers
|
3c73914337
|
Merge branch 'master' of github.com:aidancbrady/Mekanism
|
2013-10-12 15:39:01 +01:00 |
|
Aidan C. Brady
|
9735363dc1
|
Update IC2 API, minor enhancements and fixes
|
2013-10-08 18:06:25 -04:00 |
|
Aidan C. Brady
|
155978aefd
|
Forgot to commit change!
|
2013-10-08 17:47:45 -04:00 |
|
Aidan C. Brady
|
bf1150e2cb
|
Fixed minor GUI issues, recipe type interface is now a GuiElement
Oh, I'm not dead btw
|
2013-10-08 17:47:03 -04:00 |
|
Ben Spiers
|
e05479a909
|
Update every applicable API, remove some unused imports
|
2013-09-30 22:37:16 +01:00 |
|
Ben Spiers
|
a4222a86f0
|
Update obf
Conflicts:
common/mekanism/client/render/tileentity/RenderUniversalCable.java
|
2013-09-28 03:06:41 +01:00 |
|
Aidan C. Brady
|
a73bf9e9d4
|
Necessary null check
|
2013-08-29 13:03:32 -04:00 |
|
Aidan C. Brady
|
86b8499bb5
|
A bit more organizing, nothing API related
|
2013-08-26 18:57:08 -04:00 |
|
Aidan C. Brady
|
6af0b1abd7
|
Screw it, package organization (sorry, that's an API update)
|
2013-08-26 18:49:32 -04:00 |
|
Aidan C. Brady
|
13a47bbc96
|
Final changes in upgrade GUI modularization, will work on factory recipe type GUI modularization next
|
2013-08-26 18:28:55 -04:00 |
|
Aidan Brady
|
08fda4cdd5
|
Upgrade refactoring, CURRENTLY BROKEN
|
2013-08-25 20:54:34 -04:00 |
|
Aidan Brady
|
7f1b3d60f9
|
Tiny cleanup
|
2013-08-25 12:35:12 -04:00 |
|
Aidan C. Brady
|
7a7b398f31
|
Several bugfixes, overhaul of TileEntity-based upgrade management
|
2013-08-24 21:22:45 -04:00 |
|
Ben Spiers
|
8f4b19f87c
|
A slightly surprisingly large number of unused imports
|
2013-08-23 19:25:26 +01:00 |
|
Ben Spiers
|
486e5aa334
|
Make dynamic tanks render gaseous fluids by transparency instead of level.
|
2013-08-22 23:55:06 +01:00 |
|