14 Commits

Include renames

Author	SHA1	Message	Date
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