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

101 commits

Author SHA1 Message Date
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
Ben Spiers
423db88959 Transmitter rendering improvements. 
Now uses a new, slightly modified ModelRenderer and ModelBox I adapted
to be able to selectively render faces. Also we can now turn off back-face
culling without any xyz-fighting.
 2013-07-31 23:34:38 +01:00