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

179 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Aidan Brady
0b5d188cd7 More ratio fixes, Electric Chest GUI now has energy tooltip 2013-07-31 17:00:30 -04:00
Aidan Brady
fc964ad8db Cleanups, fixed UE ratios 2013-07-31 16:44:53 -04:00
Ben Spiers
248a976593 Possible hotfix for optifine crash 2013-07-31 03:31:37 +01:00
Aidan Brady
5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
Aidan Brady
26e86c8eee Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/RenderMechanicalPipe.java
	common/mekanism/common/BlockBasic.java
 2013-07-20 12:15:34 -04:00
Aidan Brady
cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Ben Spiers
ec9d74fe1a Hopefully solve all the rendering-based memory leaks 2013-07-19 19:59:01 +01:00
Ben Spiers
92c3cb6811 Fix Mechanical Pipe non-vanilla liquid rendering. Closes #186 2013-07-17 20:01:16 +01:00
Aidan Brady
3f8deb946a Re-enabled face culling, re-fixed getPickBlock() 2013-07-08 18:52:03 -04:00
Aidan Brady
c27f4d06bc Git always finds a way to screw things up, re-added new transmitter renderer 2013-07-08 12:41:31 -04:00
Aidan Brady
b313f0f96e Slightly better transmitter rendering, better energy cube outputting 2013-07-08 12:06:39 -04:00
Aidan Brady
1468fc05bd Fixed Universal Cable render 2013-07-07 13:22:24 -04:00
Aidan Brady
37e442c17b Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs 2013-07-06 21:33:08 -04:00
Aidan Brady
17d4acf389 Fixed IC2 integration, minor cleanup 2013-07-02 13:25:56 -04:00
Aidan Brady
52ceee1259 Mechanical Pipe crash fix, Dynamic Tank GUI fix 2013-06-29 23:06:24 -04:00
Aidan Brady
a667f9a3b6 v5.5.6 Beta #24 
*Removed Mechanical Pipe & Universal Cable redstone toggle.
*Fixed render crash.
*Fixed version println.
 2013-06-29 17:24:54 -04:00
Aidan Brady
8f6ad2688e General cleanup 2013-06-28 19:43:45 -04:00
Aidan Brady
b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00