14 Commits

Include renames

Author	SHA1	Message	Date
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	721e30b641	Change how crafting tables are registered ... commit 4db51de	2013-11-25 20:02:35 -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	b8bd6259ee	retire modElectric	2013-11-25 15:36:32 -05:00
Progwml6	983c91c2c9	manual update of all master commits up to ca86fa8	2013-11-25 14:08:18 -05:00
Progwml6	14d357ccf6	manual merge of master branch changes up to commit 1387bc6	2013-11-23 09:31:19 -05:00
Progwml6	707f7996b5	method doesnt need override anymore	2013-11-22 22:44:02 -05:00
Progwml6	ac77676a85	maven based systems wont package api's storedd in this manner	2013-11-22 05:42:24 -05:00
Sunstrike	cb87c836c8	Initial test of Gradle (not working yet)	2013-11-21 16:13:51 +00:00