Commit graph

28 commits

Author SHA1 Message Date
Aidan C. Brady 2241e7e7b9 A few fixes 2013-12-27 12:44:08 -05:00
Aidan C. Brady 4d64afb7d9 Made KeySync use keybinds instead of defaults 2013-12-26 12:02:17 -05:00
Aidan C. Brady d63628bebc Merge branch 'master' into development
Conflicts:
	common/mekanism/client/ClientProxy.java
	common/mekanism/client/HolidayManager.java
	common/mekanism/client/sound/SoundHandler.java
	common/mekanism/client/sound/TileSound.java
2013-12-24 14:44:17 -05:00
Aidan Brady 84f4eaee76 Christmas fun :) 2013-12-24 14:38:12 -05:00
Aidan C. Brady 9ed16f3006 A few fixes, please update! 2013-12-23 20:23:37 -05:00
Aidan C. Brady 52319ed31e A few fixes, please update! 2013-12-23 20:23:23 -05:00
Aidan C. Brady c44b63fa3a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 07:23:39 -05:00
Aidan C. Brady 3741488322 Hopefully fix CME 2013-12-16 07:23:33 -05:00
Aidan Brady 50b98674ed Fix crashes 2013-12-15 23:01:36 -05:00
Aidan Brady d21ef524a0 Work on jetpacks/scuba stuff 2013-12-15 16:07:30 -05:00
Aidan Brady ac31fc2b4e More work on networking system, unstable 2013-12-09 17:34:53 -05:00
Aidan Brady 26f0f83574 Work on initial data system for jetpacks/gasmasks 2013-12-09 17:08:47 -05:00
Aidan C. Brady 54a10af2d7 A few tiny fixes 2013-12-09 17:00:08 -05:00
Aidan C. Brady 5661b20b27 A few fixes 2013-12-09 11:56:48 -05:00
Aidan Brady 4ebf11ed5a Fix crash 2013-12-09 07:19:16 -05:00
Aidan Brady 0d830d6136 Attempt a few jetpack fixes 2013-12-08 20:35:45 -05:00
Aidan Brady 75cccf96a8 Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
Aidan Brady 00b4c6f3e3 Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
Aidan Brady 19feb2e602 Fixes by the dozen 2013-11-25 16:34:59 -05:00
Aidan Brady 64fe3a21ea Fix typo, start work on fancy Energy Cube rendering :) 2013-11-02 21:07:55 -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 1b717267f3 Moved client-sensitive info over to MekanismClient 2013-10-14 23:36:07 -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
Ben Spiers a4222a86f0 Update obf
Conflicts:
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
2013-09-28 03:06:41 +01:00
Aidan C. Brady 86b8499bb5 A bit more organizing, nothing API related 2013-08-26 18:57:08 -04:00
Aidan Brady cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Aidan Brady b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
Renamed from src/minecraft/mekanism/client/ClientTickHandler.java (Browse further)