102 Commits

Include renames

Author	SHA1	Message	Date
Alexander	46fe013ccc	Merge remote-tracking branch 'upstream/master'	2014-02-20 15:05:15 -05:00
Alexander	db764e4fa1	Fix Some of the rendering errors/Tree errors.	2014-02-19 21:44:45 -05:00
Progwml6	e5882901e1	part one of moving books over fully to new mantle interfaces	2014-02-17 21:34:34 -05:00
Alexander	544536401b	Fix some bugs with the way Gui's work.	2014-02-17 01:27:15 -05:00
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
Arthur Uzulin	ac5dcee2db	Fixed landmine behaviors ... - TODO: Fix sync issues in landmines	2014-02-16 18:58:37 +11:00
Progwml6	5cf4dad45f	use logger instead of sysout for skinloader errors	2014-02-15 06:19:33 -05:00
Arthur Uzulin	1f8d7693ef	Nothing significant	2014-02-15 22:12:54 +11:00
Alexander	6574e331fc	Fix Syncs	2014-02-15 00:29:24 -05:00
Alexander	06ec60d1ee	Push everything i did.	2014-02-14 23:05:41 -05:00
Alexander	56d348dcc7	Enable Capes/Format Code	2014-02-11 21:35:05 -05:00
Progwml6	86f8a2003f	pull in some armor stuff from 1.6	2014-02-08 13:30:19 -05:00
TheVikingWarrior	49be115db0	Update ToolStationGui.java	2014-02-08 18:48:09 +01:00
TheVikingWarrior	9abf220dba	Update StencilTableGui.java	2014-02-08 18:43:31 +01:00
TheVikingWarrior	1dd90b3417	Update GuiLandmine.java	2014-02-08 18:40:23 +01: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	5585d680a3	some fixes	2014-02-05 08:59:16 -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
Alexander	c1a92807cd	Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :)	2014-02-04 18:00:13 -05:00
Progwml6	57b6f72c2b	starting to port in 1.6.x fixes	2014-02-04 17:47:30 -05:00
Progwml6	0fe91c2d7a	35 errors left	2014-02-02 23:18:57 -05:00
Alexander	b70ed14631	Fix some bugs :).	2014-02-02 22:36:22 -05:00
Progwml6	f6ba851886	fix a few things	2014-02-02 12:14:42 -05:00
Progwml6	a8c1f32650	less than 100 to go	2014-02-02 12:06:48 -05:00
Progwml6	e3282b14db	time to take a break for a few hours	2014-02-01 16:14:23 -05:00
Progwml6	ffd383dc41	more fixes	2014-02-01 14:18:17 -05:00
Arthur Uzulin	8cd760ea06	Network stuffs -> 1.7	2014-02-01 17:28:41 +11:00
Progwml6	bb98f77de4	moar fixy thingies	2014-01-30 20:34:22 -05:00
Progwml6	4326ff3c64	fix moar things	2014-01-30 04:47:45 -05:00
Progwml6	5076fc074d	fix all the things!	2014-01-30 00:16:48 -05:00
Progwml6	2a932bc40a	yaay fluids	2014-01-29 22:58:29 -05:00
Progwml6	f3bcb13815	under 1k finally	2014-01-29 00:41:17 -05:00
Progwml6	9b78521c73	render liquid is error free	2014-01-29 00:18:26 -05:00
Progwml6	e57f2ab226	moar fixing	2014-01-29 00:09:45 -05:00
Progwml6	7d462321b5	moar fixes	2014-01-28 22:43:08 -05:00
Progwml6	692460d1ce	add in extra method to smelting interface in library	2014-01-28 02:22:47 -05:00
Progwml6	c029bd8eef	books will be fully translatable once someone does the .lang files	2014-01-26 18:36:46 -05:00
Progwml6	1f0ab2b74a	work on entites	2014-01-21 18:01:00 -05:00
Progwml6	af3f99a746	lots o fixes	2014-01-18 02:52:49 -05:00
Progwml6	d914004bde	fixed several tools	2014-01-16 03:57:21 -05:00
Progwml6	3d5cdf6ee6	under 2k errors :D	2014-01-16 01:46:21 -05:00
Progwml6	fa7a77a179	fixed most of the clientside rendering code	2014-01-16 01:36:18 -05:00
Progwml6	8931171979	got rid of a few hundred errors	2014-01-16 00:23:01 -05:00
Progwml6	f88464fdd6	more fixing	2014-01-11 02:59:17 -05:00
Progwml6	d911af378f	more 1.7 work, attempts at figuring out log4j2	2014-01-10 17:03:06 -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