Commit Graph
27 Commits
Author SHA1 Message Date
Alexander 3d866316a7 Doing some code cleanup. 2014-02-17 00:31:43 -05:00
Alexander 5d4e38c0cb Upload my Code Changes/Format/imports 2014-02-16 14:23:50 -05:00
Alexander 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -05:00
Progwml6 ffaea7d4b7 run repo through formatter 2014-02-05 09:11:06 -05:00
Progwml6 b8cf7cdc5e run through remap script 2014-02-05 08:28:53 -05:00
Alexander c1a92807cd Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :) 2014-02-04 18:00:13 -05:00
Progwml6 f6ba851886 fix a few things 2014-02-02 12:14:42 -05:00
Progwml6 fa7a77a179 fixed most of the clientside rendering code 2014-01-16 01:36:18 -05:00
Progwml6 f88464fdd6 more fixing 2014-01-11 02:59:17 -05:00
Progwml6 fb04e8eb08 more fixes 2014-01-09 04:08:38 -05:00
Progwml6 a5862aae20 fixed a whole bunch of client side stuff 2014-01-08 00:45:09 -05:00
Progwml6 0ee7ac1718 few hundred errors gone just like that 2014-01-01 09:16:34 -05:00
Progwml6 ad96fbfa61 more of project "FUN" 2013-12-31 14:11:05 -05:00
Progwml6 1bd860c52f start of the 1.7 update commits 2013-12-31 11:26:08 -05:00
Progwml6 7dade36215 more manual movement work 2013-12-14 21:27:37 -05:00
Progwml6 049f8f44a5 more cleanups of manual move 2013-12-14 01:21:21 -05:00
Progwml6 3e4302c586 Move part of book code to mantle 2013-12-13 23:14:46 -05:00
mDiyo 85aaa05d4b Crafting Station Prototype 2013-12-06 11:37:06 -08:00
Progwml6 1a74c0768f TContent refactor Part 1 2013-11-29 23:16:32 -05:00
Progwml6 07062a59d1 fix merge derps 2013-11-27 17:14:47 -05:00
Sunstrike 6ad0723020 Merge 1.7 prep into master.
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>
2013-11-27 17:46:07 +00:00
Progwml6 bb0db29ce8 update to Master commit bef5782
remove mod E from books
2013-11-26 07:08:06 -05:00
Progwml6 f693ee75e0 update to 1.5.1 RC2 c2cdb7 2013-11-25 19:40:43 -05:00
Progwml6 c429d8e6c5 swap flux into the electric modifiers old spots in the client proxy 2013-11-25 19:07:59 -05:00
Progwml6 f2da066da2 update to tcon 1.5.1RC1 commits 2013-11-25 18:57:54 -05:00
Progwml6 983c91c2c9 manual update of all master commits up to ca86fa8 2013-11-25 14:08:18 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00