Calclavia
|
665b857b94
|
Changed the battery recipe
|
2013-11-20 20:40:58 +08:00 |
|
Calclavia
|
132dcef0f6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 20:28:06 +08:00 |
|
Calclavia
|
7694967d40
|
Fixed #427 - Tesla coil having no recipe
|
2013-11-20 20:27:51 +08:00 |
|
Calclavia
|
e986b3e664
|
Can't believe Aidan never used constants for Mekanism's versions
|
2013-11-20 20:26:51 +08:00 |
|
Calclavia
|
49e19b6793
|
Copy and paste derp
|
2013-11-20 20:21:40 +08:00 |
|
Calclavia
|
ce458d2e77
|
Revert "Fixed #433 - Electric bolt render NPE"
This reverts commit 92993e832d.
|
2013-11-20 20:21:10 +08:00 |
|
Aidan Brady
|
85f759e5e6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 07:20:38 -05:00 |
|
Aidan Brady
|
2d1dabd6b2
|
Fix a few crashes
|
2013-11-20 07:20:32 -05:00 |
|
Calclavia
|
92993e832d
|
Fixed #433 - Electric bolt render NPE
|
2013-11-20 20:18:12 +08:00 |
|
Aidan Brady
|
7f9acda277
|
Aw yeah. This GUI…is coming together.
|
2013-11-19 22:27:28 -05:00 |
|
Aidan Brady
|
515cbf38c8
|
Fixes!
|
2013-11-19 22:13:35 -05:00 |
|
Aidan C. Brady
|
fc1cb7926c
|
Added in some descriptive text to the GUI.
|
2013-11-19 20:15:03 -05:00 |
|
Aidan C. Brady
|
73bf81ceaa
|
GUI is coming together! Still need to add reset button and map button actions, but layout is there.
|
2013-11-19 19:30:56 -05:00 |
|
Aidan C. Brady
|
d02d0ceadf
|
GUI work, kinda functions, but not really
|
2013-11-19 18:56:53 -05:00 |
|
Aidan C. Brady
|
7a74fb86ba
|
More work!
|
2013-11-19 18:16:26 -05:00 |
|
Aidan C. Brady
|
87f5bbcde2
|
Work on networking and GUIs of Digital Miner
|
2013-11-19 17:39:16 -05:00 |
|
Aidan C. Brady
|
c9deba55df
|
Provide replace stacks
|
2013-11-19 15:38:18 -05:00 |
|
Aidan C. Brady
|
3939000190
|
More work!
|
2013-11-19 12:29:50 -05:00 |
|
Aidan C. Brady
|
86b6474f35
|
Beginning foundations of Digital Miner.
|
2013-11-19 12:13:37 -05:00 |
|
Aidan Brady
|
ba66b6fc9f
|
Work on miner!
|
2013-11-18 22:15:03 -05:00 |
|
Aidan C. Brady
|
995207bcab
|
Start work on Miner, make the Bin only eject items when front side is clicked!
|
2013-11-18 15:33:14 -05:00 |
|
Aidan C. Brady
|
2594918bee
|
Double-click inserting on Bins
|
2013-11-18 14:50:59 -05:00 |
|
Aidan Brady
|
52d42e99f2
|
Fix ItemProxy leak
|
2013-11-17 23:37:02 -05:00 |
|
Aidan Brady
|
cc5d4281a2
|
Fix container item issue
|
2013-11-17 20:14:00 -05:00 |
|
Aidan Brady
|
0e0594a69b
|
Electric Chest charges when in inventory
|
2013-11-17 19:56:16 -05:00 |
|
Aidan Brady
|
a63a8902f2
|
Sounds should be fixed.
|
2013-11-17 19:25:52 -05:00 |
|
Aidan Brady
|
f988c54134
|
Hopefully the final fix
|
2013-11-17 19:16:40 -05:00 |
|
Aidan Brady
|
147fb7609d
|
Try removing extra url junk
|
2013-11-17 19:07:18 -05:00 |
|
Aidan Brady
|
40dd6798ea
|
Attempted sound fixes
Guaranteed not to work :)
|
2013-11-17 19:03:44 -05:00 |
|
Aidan Brady
|
6a4750f90b
|
Hopefully fixed sounds…
|
2013-11-17 13:39:40 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
Aidan Brady
|
8a79352563
|
Debugging sound system
|
2013-11-17 13:23:19 -05:00 |
|
Aidan Brady
|
17d36cad4d
|
Fixes and enhancements for TE
|
2013-11-17 10:55:20 -05:00 |
|
Aidan Brady
|
ae0edd50dc
|
Fix Universal Cable TE support, fix build.xml
|
2013-11-16 19:08:47 -05:00 |
|
Aidan Brady
|
67db8c522a
|
Fix TE support :)
|
2013-11-16 18:56:01 -05:00 |
|
Aidan Brady
|
e9382e64a9
|
Fixes!
|
2013-11-16 17:23:50 -05:00 |
|
Aidan C. Brady
|
f2fd5c382f
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-16 16:55:27 -05:00 |
|
Aidan C. Brady
|
57b1343311
|
Batteries are less buggy and more efficient
|
2013-11-16 16:55:20 -05:00 |
|
Aidan Brady
|
a2f667baf5
|
Fixed! :D
|
2013-11-16 13:38:34 -05:00 |
|
Aidan C. Brady
|
5954d51ad4
|
TE item support fixes
|
2013-11-16 12:56:43 -05:00 |
|
Aidan C. Brady
|
0616f28950
|
Fix test build
|
2013-11-16 12:49:41 -05:00 |
|
Aidan C. Brady
|
43440ebc4e
|
Register Induction module :)
|
2013-11-16 12:30:40 -05:00 |
|
Aidan C. Brady
|
19b6d30f4c
|
Fix crash
|
2013-11-16 12:27:43 -05:00 |
|
Aidan C. Brady
|
cc48b614ba
|
Remove wire
|
2013-11-16 12:26:49 -05:00 |
|
Aidan C. Brady
|
dc59bebc33
|
Fixed EM Contractor
|
2013-11-16 12:12:17 -05:00 |
|
Aidan C. Brady
|
15e3369f15
|
Fix TE crash (temp)
|
2013-11-16 11:06:17 -05:00 |
|
Aidan C. Brady
|
ed637e4eed
|
Follow Mekanism naming standards
|
2013-11-16 11:05:04 -05:00 |
|
Aidan C. Brady
|
53323279c7
|
MekanismInduction module - done!
Still need to configure the build
|
2013-11-16 10:21:37 -05:00 |
|
Aidan C. Brady
|
3d4625ddb9
|
Block-ID & Metadata based machine types, preparing for RI merge
|
2013-11-15 14:59:26 -05:00 |
|
Aidan C. Brady
|
3193f786cd
|
Official Redstone Flux support complete!
(As far as I know at least)
|
2013-11-15 12:06:03 -05:00 |
|
Aidan Brady
|
ec98b19ffb
|
Begin work on official TE2 integration :)
(Items done!)
|
2013-11-14 21:58:32 -05:00 |
|
Aidan Brady
|
8101ee2e26
|
A few fixes
|
2013-11-14 16:31:02 -05:00 |
|
Aidan C. Brady
|
be3063def5
|
Minor rendering enhancements
|
2013-11-14 08:12:09 -05:00 |
|
Aidan C. Brady
|
33283f5428
|
GL_LIGHTING
|
2013-11-14 07:48:18 -05:00 |
|
Aidan Brady
|
a29b637a0a
|
Minor tool cleanups
|
2013-11-13 22:43:58 -05:00 |
|
Aidan Brady
|
d08c6da830
|
Fixed tool harvest levels
|
2013-11-13 17:21:00 -05:00 |
|
Aidan Brady
|
c209f8233a
|
Bins are done :)
|
2013-11-13 16:19:41 -05:00 |
|
Aidan C. Brady
|
c9b5c7b51f
|
Some work on rendering, fixed sound error
|
2013-11-13 14:59:11 -05:00 |
|
Aidan C. Brady
|
f24c12044d
|
Merge branches 'master' and 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-13 08:12:34 -05:00 |
|
Aidan C. Brady
|
b04ff8d5cc
|
Bins only have accessible slots on top and bottom
|
2013-11-13 08:12:25 -05:00 |
|
Aidan Brady
|
4d55db7a73
|
Some work on Bin item rendering
|
2013-11-12 22:43:06 -05:00 |
|
Aidan C. Brady
|
8e08c9adb8
|
Once and for all fixed ConcurrentModificationException
|
2013-11-12 20:19:06 -05:00 |
|
Aidan C. Brady
|
3b64a043df
|
Bins can eject and accept items in block form, transporter support untested
|
2013-11-12 20:14:21 -05:00 |
|
Aidan C. Brady
|
1e336047d2
|
Bin block-based inventory work
|
2013-11-12 19:18:22 -05:00 |
|
Aidan C. Brady
|
e6ed263aa3
|
More bin work! :D
|
2013-11-12 18:42:55 -05:00 |
|
Aidan C. Brady
|
fe0631844b
|
Some work on Bins
|
2013-11-12 16:45:48 -05:00 |
|
Aidan C. Brady
|
42fe1f3d69
|
Bin inventory management works! I have no idea how I managed this...
|
2013-11-12 11:01:16 -05:00 |
|
Aidan Brady
|
2a4a1cd291
|
Some more work on Bin crafting management. Don’t know if this is gonna work guys…
|
2013-11-11 23:57:33 -05:00 |
|
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 |
|