tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
699 commits 2 branches 0 tags 102 MiB
Commit graph

402 commits

Author SHA1 Message Date
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
a19c4401af Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-01 09:38:38 -04:00
Aidan C. Brady
64c37f4d94 Hopefully fixed that pesky crash 2013-11-01 09:38:32 -04:00
Aidan Brady
cecff2947c Update IC2 API. 2013-10-31 22:46:16 -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
Aidan C. Brady
cafe2a7dfb Much more server work 2013-10-14 12:44:07 -04:00
Aidan C. Brady
17fdc03e9f Work on server 2013-10-13 23:40:28 -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
Aidan C. Brady
a6ed1c054e Re-added maganese 2013-10-13 01:19:18 -04:00
Aidan C. Brady
9194f71630 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/Mekanism.java
 2013-10-13 01:04:04 -04:00
Aidan C. Brady
b1c2afd68d Add proper IC2 item support, add maganese for future use 2013-10-13 01:01:30 -04:00
Ben Spiers
189c6d4551 L10n support by popular demand. Closes #204 2013-10-12 16:43:56 +01: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
7f4a603f64 Update ic2 API. AGAIN 
Conflicts:
	common/mekanism/common/Mekanism.java
	common/mekanism/common/MekanismHooks.java
 2013-09-28 03:20:43 +01:00
Ben Spiers
a4222a86f0 Update obf 
Conflicts:
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
 2013-09-28 03:06:41 +01:00
Ben Spiers
c53be88a5f Fix a stupid bug. 2013-09-27 22:32:54 +01:00
Ben Spiers
53b659ca12 Merge pull request #264 from DarkGuardsman/master 
could be a fix to concur modification error
 2013-09-20 11:33:46 -07:00
micdoodle8
d70dbe431a Fix concurrent modification exception when unloading chunks. 2013-09-12 17:28:32 -04:00
DarkGuardsman
b021cd6d3f could be a fix to concur modification error 
So far it looks like it is working but more research/testing needs to be
done.
 2013-09-09 02:04:56 -04:00
Calclavia
fe0b7cd757 Added universal cable to ore dict for recipe 2013-09-07 23:21:25 +08:00
Aidan Brady
8509eaf0ad Fixed IC2 integration :) 2013-08-30 15:20:52 -04:00
Aidan Brady
92bee121b2 Update IC2 API 2013-08-29 18:57:13 -04:00
Aidan C. Brady
a73bf9e9d4 Necessary null check 2013-08-29 13:03:32 -04:00
Ben Spiers
9755b47833 Universal cable support for accepting from UE machines. change *Network* to *TransmitterNetwork* in ITransmitter to avoid method name conflicts. 
Not all IConductor methods are properly implemented, doesn't seem to cause problems in my testing. Could probably implement IElectricityNetwork in EnergyNetwork but this seems to work.
 2013-08-27 00:18:12 +01: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 Brady
b540e95381 Fix Gas Tank crash 2013-08-25 12:29:30 -04:00
Aidan Brady
268a1eca6b Refresh UE API 2013-08-25 12:22:31 -04:00
Aidan Brady
13901f60b0 Bit of modularization 2013-08-25 12:17:56 -04:00
Aidan Brady
55fee96644 Updated IC2 API (again), added obsidian 200% ore-to-dust processing 2013-08-25 12:02:25 -04:00
Aidan Brady
9a6f4d6a0e Fix the crashes people are having with checkTransmissionType() 2013-08-25 11:24:07 -04:00
Calclavia
791c60fd77 Updated UE API 2013-08-25 21:37:11 +08:00
Calclavia
e228e11031 Updated BuildCraft API 2013-08-25 21:36:29 +08:00
micdoodle8
9b356038f9 Fix pressurized tubes not connecting to gas transmitters in external mods. 2013-08-25 01:39:55 -04:00
micdoodle8
8e667efd7b Fix canTransferGas() 
Tested and working.
 2013-08-25 01:34:45 -04:00
Ben Spiers
0951acf142 Remove the old one. Forgot to save the file... 2013-08-25 02:47:16 +01:00
Ben Spiers
32c32fb106 Move checkTransmissionType to TransmissionType. 2013-08-25 02:41:03 +01:00
Ben Spiers
d18c9645f9 Fix being able to move the electric chest into a different slot using number keys and crashing everything 2013-08-25 02:41:03 +01:00
Ben Spiers
ecd9f29f07 Don't emit fluid from active pipes. 2013-08-25 02:41:03 +01:00
Aidan C. Brady
7a7b398f31 Several bugfixes, overhaul of TileEntity-based upgrade management 2013-08-24 21:22:45 -04:00
Ben Spiers
081e204dbf Pressurized tubes transfer gas 2013-08-23 19:43:10 +01:00
Ben Spiers
8f4b19f87c A slightly surprisingly large number of unused imports 2013-08-23 19:25:26 +01:00
Ben Spiers
6cf89af4b2 Generalise the EnergyMeter. The name may not be entirely accurate any more. 2013-08-23 19:23:08 +01:00
Ben Spiers
2045c26c7d UE update 2013-08-23 04:19:44 +01:00
Ben Spiers
65776e3516 Fix a bit of wonkiness with pipes, etc. 2013-08-23 04:19:01 +01:00
Ben Spiers
486e5aa334 Make dynamic tanks render gaseous fluids by transparency instead of level. 2013-08-22 23:55:06 +01:00
Ben Spiers
f39e3a528d Fix chunk-load handler; make it refresh adjacent loaded chunks as well, to 
solve an edge case.
 2013-08-22 21:16:28 +01:00
Ben Spiers
67687cd579 I'm an idiot. 2013-08-22 21:16:27 +01:00
Aidan C. Brady
5e379f052a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/api/GasNetwork.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/TileEntityEnergyCube.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-22 14:07:28 -04:00
Aidan C. Brady
5072b20673 Updated IC2 API, modularized energy management 2013-08-22 11:36:31 -04:00
Ben Spiers
d9c94cc0c8 Add missing import 2013-08-21 20:31:54 +01:00
Ben Spiers
e598527656 Fix StackOverflowException on getNetwork. 2013-08-21 20:26:47 +01:00
Ben Spiers
19cea5b35c PowerReceiver can sometimes be null 2013-08-19 21:29:14 +01:00
Ben Spiers
18868398b4 Stop Object3D.getTileEntity() from loading unloaded chunks. 2013-08-19 18:37:36 +01:00
Aidan C. Brady
896daa10e8 Quick fix 2013-08-19 09:45:43 -04:00
Aidan C. Brady
de10fa2d58 Finished new changes, canTransferGas() functionality temporarily severed 2013-08-19 07:55:47 -04:00
Aidan Brady
30f7bfa126 Loads of work on modularization, BROKEN BUILD 2013-08-18 21:32:47 -04:00
Aidan Brady
046cab7880 Base transmitter TileEntity class 2013-08-18 17:04:20 -04:00
Aidan Brady
f64ea42e43 Even more modularization 2013-08-18 16:51:47 -04:00
Aidan Brady
b2f20185e4 Further modularized transmitter networks 2013-08-17 13:32:05 -04:00
Aidan C. Brady
20728eff4f Began work on a more modular approach to networks 2013-08-16 11:56:42 -04:00
Aidan C. Brady
98a436d2f7 Cleanup 2013-08-16 11:50:58 -04:00
Aidan C. Brady
38e772107c Merged NEI module, bumped version 2013-08-14 11:01:44 -04:00
Ben Spiers
2389d3d864 Re-add and update NEI plugin to work again 2013-08-10 20:52:59 +01:00
Aidan Brady
9fae571278 Remove dead code 2013-08-08 13:13:19 -04:00
Aidan Brady
6ce44658ad Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/ItemBlockEnergyCube.java
	common/mekanism/common/LinkedPowerProvider.java
	common/mekanism/common/TileEntityUniversalCable.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-08 13:11:25 -04:00
Aidan Brady
8996b499e3 Merging with other computer 2013-08-08 13:10:11 -04:00
Aidan Brady
7e167b753a Logistical Transporters now have complete network functionality. Actual item transport is the next step! 
Also fixed various network bugs. :)
 2013-08-06 01:40:41 -04:00
Aidan Brady
fe9cd85564 Work on Logistical Transporter 2013-08-05 23:58:44 -04:00
Aidan Brady
96b192efef General rendering improvements 
*Faster gas rendering in Pressurized Tube.
*Lava now glows when in Dynamic Tank.
*Mechanical Pipes won't visually connect to Dynamic Valves when not part of a multiblock structure.
*Fixed energy cube GUI "Inventory" text color, fixed energy cube GUI energy scale bar.
 2013-08-05 18:58:24 -04:00
Aidan Brady
2553bb40c1 Minor Electric Pump container fix, cleanup 2013-08-05 03:55:17 -04:00
Aidan Brady
7f45043dec Minor dynamic tank logic fix 2013-08-04 03:33:40 -04:00
Aidan Brady
aa69ba4bdf Fix cast 2013-08-03 23:59:24 -04:00
Aidan Brady
ffd2588a63 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-08-03 23:02:31 -04:00
Aidan Brady
3fd76dcacc Began work on Logistical Transporter - item transport :) 2013-08-03 23:02:06 -04:00
Ben Spiers
befd4ad4e2 I need to stop leaving those in. 2013-08-04 02:07:57 +01:00
Ben Spiers
472050e296 So apparently kilojoules are the base unit now. OK. 2013-08-04 01:58:56 +01:00
Ben Spiers
49fc056c8c My approach to Universal Cables rendering power. They render with 
transparency proportional to the base 10 log of power, to compensate
for the wide range of power that can be transmitted, and minimise client
update packets.
 2013-08-04 01:58:56 +01:00
Ben Spiers
8ee17b2a03 Bring other network types up to speed with EnergyNetwork 2013-08-04 01:58:56 +01:00
Ben Spiers
837689a061 Transmitter Network Interface 2013-08-04 01:58:56 +01:00
Aidan Brady
503c4eb0b5 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-08-02 03:16:56 -04:00
Aidan Brady
47c36f1f38 Added redstone control to machines, generators, Energy Cubes and Gas Tanks; fixed Heat Generator NBT bug 
Also - cleanup! Closes #214.
 2013-08-02 03:16:38 -04:00
Ben Spiers
534234abb2 Should fix robit crash when placed on non-chargepad tileEntities 2013-08-01 23:49:38 +01:00
Ben Spiers
f48997a793 Merge branch 'master' of github.com:aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/ModelRendererSelectiveFace.java
 2013-08-01 23:30:59 +01:00
Ben Spiers
0d99b90922 Add a nullcheck that was crashing someone. 2013-08-01 23:15:02 +01:00
Ben Spiers
04e7fdcf23 Make the transmitters' internal renders look a bit nicer (hopefully also a bit 
faster). Framework is in place to change transparency of energy in cables
but the client-side ones don't know what they're doing yet.
 2013-08-01 23:14:26 +01:00
Ben Spiers
c642792cb6 Use DisplayInteger to abstract away some GL11 calls 2013-08-01 23:03:43 +01:00
Aidan Brady
55bde8a4b9 There is now a configurable delay between state updates, closes #177 2013-08-01 12:07:03 -04:00
Aidan Brady
9e51cdd4bc Fixed Energy Cube/Generator UE energy outputting 2013-08-01 11:23:07 -04:00
Aidan Brady
773f40717c Minor Robit AI enhancements 2013-08-01 01:28:27 -04:00
Aidan Brady
768f76e364 Fixed Robit crashing, added EnergyMeter recipe to master 2013-08-01 01:01:39 -04:00
Aidan Brady
ec42d430df Fixed Forestry integration 2013-08-01 00:50:18 -04:00
Aidan Brady
333896bcac Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/ModelBoxSelectiveFace.java
	common/mekanism/client/ModelRendererSelectiveFace.java
 2013-08-01 00:08:45 -04:00
Aidan Brady
d56eed2204 Cleanups! 2013-07-31 23:54:08 -04:00
Ben Spiers
260b9ed62f Stop the new renderer from just creating infinite new displaylists. 2013-08-01 03:14:57 +01:00
Aidan Brady
7bbcc1c178 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-31 21:20:50 -04:00
Aidan Brady
4c50c442d1 Better BC item integration, javadocs, cleanup 2013-07-31 21:20:12 -04:00
Ben Spiers
415360a293 Fix factory guis 2013-08-01 00:04:00 +01:00
Ben Spiers
1b64d077e4 @Aidancbrady, why did osmium armour think it's made of diamond? I've 
changed it because it was messing with the textures.
 2013-07-31 23:34:39 +01:00
Ben Spiers
7c71adc9d2 Well, I don't know why the old way was broken but it's fixed now. 2013-07-31 23:34:39 +01:00