Aidan Brady
|
8cec8af952
|
Perhaps fixed a few bugs
|
2013-11-11 23:19:51 -05:00 |
|
Aidan Brady
|
80097e4d1b
|
Some work on bins, currently crashing if you try to craft
|
2013-11-11 22:52:12 -05:00 |
|
Aidan Brady
|
1ac243f091
|
Work on bins! :)
|
2013-11-11 19:27:36 -05:00 |
|
Aidan Brady
|
f6704dc5ea
|
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
|
2013-11-11 17:23:14 -05:00 |
|
Aidan C. Brady
|
9c53f1be66
|
Some work on bins, fix tank bug
|
2013-11-11 17:08:13 -05:00 |
|
Aidan C. Brady
|
4b5c8498a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-11 14:38:03 -05:00 |
|
Aidan C. Brady
|
3c0c5bef0d
|
Major Universal Cable improvements, started work on Bin
|
2013-11-11 14:37:56 -05:00 |
|
Aidan Brady
|
5ad16564a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-10 19:35:52 -05:00 |
|
Aidan Brady
|
e277ee36c0
|
Fix some pathfinder bugs
|
2013-11-10 19:35:45 -05:00 |
|
Aidan C. Brady
|
99f53a1322
|
Some fancy sounds and tooltips
|
2013-11-10 18:54:30 -05:00 |
|
Aidan Brady
|
cc57fad0c2
|
Once again rewrote pathfinder. Idle paths are still fairly CPU intensive
|
2013-11-10 12:27:58 -05:00 |
|
Aidan Brady
|
dfd2985357
|
Transporters first try to send the item back home before idling
|
2013-11-09 15:30:30 -05:00 |
|
Aidan Brady
|
5a08cb1b90
|
Fix a possible crash
|
2013-11-09 10:56:47 -05:00 |
|
Aidan C. Brady
|
9883c9535c
|
Rest index when mode switched
|
2013-11-08 11:15:52 -05:00 |
|
Aidan C. Brady
|
51ad429973
|
Coming along with round robin mode :)
|
2013-11-08 11:13:51 -05:00 |
|
Aidan C. Brady
|
7cc72e65b3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-08 07:53:40 -05:00 |
|
Aidan C. Brady
|
8f33094e10
|
Start on RR algorithm
|
2013-11-08 07:53:32 -05:00 |
|
Aidan Brady
|
1aec33d8ec
|
Added configuration option to turn off strict input colors
|
2013-11-07 21:27:12 -05:00 |
|
Aidan Brady
|
7053f4a30a
|
Whoops!
|
2013-11-07 19:17:24 -05:00 |
|
Aidan Brady
|
9fdcb13faa
|
Gas Tank recipe shows up in NEI
|
2013-11-07 19:15:58 -05:00 |
|
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
|
b6446032ae
|
Attempt to clean up pathfinder
|
2013-11-07 08:47:18 -05:00 |
|
Aidan Brady
|
86e920fc0b
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-06 22:37:48 -05:00 |
|
Aidan Brady
|
daeb09c7fd
|
Fix Energy Cubes up/down render
|
2013-11-06 22:37:41 -05:00 |
|
Aidan C. Brady
|
67e2672197
|
Fix a few issues with min/max
|
2013-11-06 21:33: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
|
d2894d0c9d
|
Began work on a more advanced ItemStack filter system, with min and max pull ranges
|
2013-11-06 17:19:02 -05:00 |
|
Aidan C. Brady
|
b1f2a61e20
|
Minor changes, nothing noticeable
|
2013-11-06 16:04:34 -05:00 |
|
Aidan Brady
|
a80b18b412
|
Remove printlns
|
2013-11-05 20:39:54 -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
|
88d0d3125e
|
Fix side color thingy!
|
2013-11-04 21:27:41 -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
|
3b746e4a1d
|
Fix wrenching
|
2013-11-04 16:59:19 -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 |
|
Matt Chance
|
716c0b0c8b
|
Fix crash when using a wrench on a GasTank
|
2013-11-03 17:53:11 -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
|
2ecc48021d
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-03 11:38:39 -05:00 |
|
Aidan Brady
|
6d734c26e3
|
New models and fixes!
|
2013-11-03 11:38:36 -05:00 |
|
Ben Spiers
|
8fe921eebe
|
Add config option to allow powering Railcraft and other MJ machines without BC loaded. Hopefully won't cause bugs...
|
2013-11-03 10:26:43 +00: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 Brady
|
c281fcb14b
|
Fix up a bunch of issues. This should fix epicbastion's problem honestly.
|
2013-11-01 19:14:02 -04:00 |
|
Aidan C. Brady
|
35a83f5ffc
|
Fix crash!
|
2013-11-01 14:04:05 -04:00 |
|
Aidan C. Brady
|
cb30b11d64
|
Killed the rest of the references
|
2013-11-01 11:38:33 -04:00 |
|
Aidan C. Brady
|
9b4bd09958
|
Remove the rest of the Theoretical Elementizer references
|
2013-11-01 11:36:29 -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
|
64c37f4d94
|
Hopefully fixed that pesky crash
|
2013-11-01 09:38:32 -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
|
2b37fe367a
|
Fix output algorithm
|
2013-10-31 08:37:33 -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
|
43ee7f68df
|
Fix hashCode() crash
|
2013-10-30 23:50:38 -04:00 |
|
Aidan C. Brady
|
abe549bf13
|
Started some work on more filter tab information.
|
2013-10-30 23:48:50 -04:00 |
|
Aidan Brady
|
f9350c40f8
|
Fixed a few bugs!
|
2013-10-30 21:59:36 -04:00 |
|
Aidan Brady
|
102b0ffeda
|
Fixed output randomization
|
2013-10-30 20:38:41 -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 Brady
|
2c49ca40ed
|
Began work on automatic machine item ejection (much smaller project than transporters!)
|
2013-10-29 22:15:39 -04:00 |
|
Aidan C. Brady
|
6837b1fb66
|
Bumped version!
|
2013-10-29 19:31:26 -04:00 |
|
Aidan C. Brady
|
e155dfd17f
|
Logistical Sorters use energy
|
2013-10-29 19:17:37 -04:00 |
|
Aidan C. Brady
|
70bed1ba97
|
Fixed bug causing ghost items and crash
|
2013-10-29 18:54:36 -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 C. Brady
|
013a2a7aa4
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-10-29 11:10:08 -04:00 |
|
Aidan C. Brady
|
a3afca5b64
|
Fixed up pathfinder, fixed most bugs and began work on a restriction transporter
|
2013-10-29 11:10:01 -04:00 |
|
Aidan Brady
|
df896ec3f3
|
Fixed that pesky crash, thanks Vaygrim!
|
2013-10-28 22:17:34 -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
|
a2443f902d
|
Fix generator names
|
2013-10-28 14:48:41 -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 C. Brady
|
2fb13e1f3d
|
Fix pick block crash on sorter
|
2013-10-28 07:14:21 -04:00 |
|
Aidan Brady
|
8478096bc7
|
Minor fix
|
2013-10-27 20:21:21 -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
|
def9764b0d
|
Remove IAccessibleGui
|
2013-10-27 00:10:17 -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
|
b49defae88
|
Fixed some things!!
|
2013-10-25 17:11:15 -04:00 |
|
Aidan C. Brady
|
8d9ee35679
|
Sorter work - hopefully outputs items now! :D
|
2013-10-25 16:07:25 -04:00 |
|
Aidan C. Brady
|
e9c038cd24
|
More progress on Logistical Sorter
|
2013-10-25 09:51: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
|
6b6a834a09
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-10-24 11:38:29 -04:00 |
|
Aidan C. Brady
|
61f8a06d48
|
Fixed pathfinding, hopefully fixed crash and build failure
|
2013-10-24 11:38:23 -04:00 |
|
Aidan Brady
|
54ac6bac5c
|
Deleted old files
|
2013-10-23 22:50:10 -04:00 |
|
Aidan C. Brady
|
ab8361f9e8
|
Just about finished rendering! :D
|
2013-10-23 20:34:33 -04:00 |
|
Aidan C. Brady
|
84f7bd1f85
|
Finished core code for item tags, onto rendering!
|
2013-10-23 17:56:35 -04:00 |
|
Aidan C. Brady
|
61c7b3e4cd
|
Started adding color tags for transport, shouldn't be too hard!
|
2013-10-23 08:50:27 -04:00 |
|
Aidan C. Brady
|
9983ee4a70
|
Killed a few lines of code that were the result of two crashes.
|
2013-10-23 08:16:29 -04:00 |
|
Aidan Brady
|
da71396128
|
Functional inventory management :D
|
2013-10-22 22:47:46 -04:00 |
|
Aidan C. Brady
|
4f773bbbf9
|
Began adding inventory algorithms.
|
2013-10-22 22:29:25 -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
|
8cc6d3222a
|
Fix up bounds
|
2013-10-22 11:20:04 -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 C. Brady
|
b4e53a5c54
|
More work on logistical transporters, getting these logistics down!
|
2013-10-21 20:54:28 -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
|
f3838a1f7e
|
Hopefully fixed BuildCraft powerHandler bug
|
2013-10-19 23:36:09 -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
|
f646ecdff6
|
Kill connection if unable to trace IP
|
2013-10-18 20:24:12 -04:00 |
|
Aidan Brady
|
9ed6614e5b
|
More, shorter retries
|
2013-10-18 20:21:52 -04:00 |
|
Aidan Brady
|
ea21ad0061
|
Synchronization and better connection management
|
2013-10-18 20:17:40 -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
|
17d0e20bdb
|
Fix server crash
|
2013-10-16 13:49:31 -04:00 |
|
Aidan C. Brady
|
a5a4c7a65a
|
Prevent possible server crash
|
2013-10-15 19:57:18 -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
|
15dc84bd5f
|
Stupid obfuscation
|
2013-10-14 15:07:30 -04:00 |
|
Aidan C. Brady
|
9d94e55ece
|
Hopefully fixed crash
|
2013-10-14 14:59:48 -04:00 |
|
Aidan C. Brady
|
3caf04ef4a
|
Fix IC2 error
|
2013-10-14 14:34:05 -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 |
|