23 Commits

Include renames

Author	SHA1	Message	Date
bculkin2442	fa0644d4ae	Re-adding some stuff from 1.6.4	2014-02-21 09:25:00 -05:00
Alexander	5d4e38c0cb	Upload my Code Changes/Format/imports	2014-02-16 14:23:50 -05:00
Progwml6	20eafc2cd6	merge/ comment out some armor ticking code for now to prevent NPE's	2014-02-16 00:04:38 -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
Progwml6	689aeba09b	some more fixes from 1.6.x	2014-02-04 21:21:50 -05:00
Progwml6	d914004bde	fixed several tools	2014-01-16 03:57:21 -05:00
Progwml6	fa7a77a179	fixed most of the clientside rendering code	2014-01-16 01:36:18 -05:00
Progwml6	dfcc6e9d89	some fixes	2014-01-15 02:17:20 -05:00
Progwml6	fb04e8eb08	more fixes	2014-01-09 04:08:38 -05:00
Progwml6	eba66e0182	misc fixes	2014-01-08 23:46:45 -05:00
Progwml6	9814eadaea	bunch more random stuff fixed	2014-01-07 15:07:07 -05:00
Progwml6	c5426eb992	more fixes	2014-01-01 08:47:10 -05:00
Progwml6	4228b26a07	now at around 4700 errors	2013-12-31 20:24:06 -05:00
Progwml6	3c23d27cf7	more 1.7 work	2013-12-31 16:37:46 -05:00
Arthur Uzulin	f8450e4a31	Knapsack/extended slots tick updates ... - Fixed a null pointer exception - Clean up imports in GlassBlock(accidental) - Made the extended armor slots tick and armor tick items - Made the knapsack tick items	2013-12-14 14:11:41 +11:00
mDiyo	086cc97ddc	Rewrote ModAttack to accept multiple items	2013-12-12 03:08:05 -08:00
Progwml6	0c9c8100ad	manual merges of up to 9a578fc	2013-12-11 23:47:07 -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	b8bd6259ee	retire modElectric	2013-11-25 15:36:32 -05:00
Sunstrike	cb87c836c8	Initial test of Gradle (not working yet)	2013-11-21 16:13:51 +00:00